diff --git a/actions/ql/lib/change-notes/2025-06-09-bash-parsing-performance.md b/actions/ql/lib/change-notes/2025-06-09-bash-parsing-performance.md
new file mode 100644
index 00000000000..5ee29557c85
--- /dev/null
+++ b/actions/ql/lib/change-notes/2025-06-09-bash-parsing-performance.md
@@ -0,0 +1,6 @@
+---
+category: minorAnalysis
+---
+* Fixed performance issues in the parsing of Bash scripts in workflow files,
+  which led to out-of-disk errors when analysing certain workflow files with
+  complex interpolations of shell commands or quoted strings.
\ No newline at end of file
diff --git a/actions/ql/lib/codeql/actions/Bash.qll b/actions/ql/lib/codeql/actions/Bash.qll
index 4519a8949d7..4975ce6f4cc 100644
--- a/actions/ql/lib/codeql/actions/Bash.qll
+++ b/actions/ql/lib/codeql/actions/Bash.qll
@@ -8,35 +8,64 @@ class BashShellScript extends ShellScript {
     )
   }
 
-  private string lineProducer(int i) {
-    result = this.getRawScript().regexpReplaceAll("\\\\\\s*\n", "").splitAt("\n", i)
+  /**
+   * Gets the line at 0-based index `lineIndex` within this shell script,
+   * assuming newlines as separators.
+   */
+  private string lineProducer(int lineIndex) {
+    result = this.getRawScript().regexpReplaceAll("\\\\\\s*\n", "").splitAt("\n", lineIndex)
   }
 
-  private predicate cmdSubstitutionReplacement(string cmdSubs, string id, int k) {
-    exists(string line | line = this.lineProducer(k) |
-      exists(int i, int j |
-        cmdSubs =
-          // $() cmd substitution
-          line.regexpFind("\\$\\((?:[^()]+|\\((?:[^()]+|\\([^()]*\\))*\\))*\\)", i, j)
-              .regexpReplaceAll("^\\$\\(", "")
-              .regexpReplaceAll("\\)$", "") and
-        id = "cmdsubs:" + k + ":" + i + ":" + j
-      )
-      or
-      exists(int i, int j |
-        // `...` cmd substitution
-        cmdSubs =
-          line.regexpFind("\\`[^\\`]+\\`", i, j)
-              .regexpReplaceAll("^\\`", "")
-              .regexpReplaceAll("\\`$", "") and
-        id = "cmd:" + k + ":" + i + ":" + j
-      )
+  private predicate cmdSubstitutionReplacement(string command, string id, int lineIndex) {
+    this.commandInSubstitution(lineIndex, command, id)
+    or
+    this.commandInBackticks(lineIndex, command, id)
+  }
+
+  /**
+   * Holds if there is a command substitution `$(command)` in
+   * the line at `lineIndex` in the shell script,
+   * and `id` is a unique identifier for this command.
+   */
+  private predicate commandInSubstitution(int lineIndex, string command, string id) {
+    exists(int occurrenceIndex, int occurrenceOffset |
+      command =
+        // Look for the command inside a $(...) command substitution
+        this.lineProducer(lineIndex)
+            .regexpFind("\\$\\((?:[^()]+|\\((?:[^()]+|\\([^()]*\\))*\\))*\\)", occurrenceIndex,
+              occurrenceOffset)
+            // trim starting $( - TODO do this in first regex
+            .regexpReplaceAll("^\\$\\(", "")
+            // trim ending ) - TODO do this in first regex
+            .regexpReplaceAll("\\)$", "") and
+      id = "cmdsubs:" + lineIndex + ":" + occurrenceIndex + ":" + occurrenceOffset
     )
   }
 
-  private predicate rankedCmdSubstitutionReplacements(int i, string old, string new) {
-    old = rank[i](string old2 | this.cmdSubstitutionReplacement(old2, _, _) | old2) and
-    this.cmdSubstitutionReplacement(old, new, _)
+  /**
+   * Holds if `command` is a command in backticks `` `...` `` in
+   * the line at `lineIndex` in the shell script,
+   * and `id` is a unique identifier for this command.
+   */
+  private predicate commandInBackticks(int lineIndex, string command, string id) {
+    exists(int occurrenceIndex, int occurrenceOffset |
+      command =
+        this.lineProducer(lineIndex)
+            .regexpFind("\\`[^\\`]+\\`", occurrenceIndex, occurrenceOffset)
+            // trim leading backtick - TODO do this in first regex
+            .regexpReplaceAll("^\\`", "")
+            // trim trailing backtick - TODO do this in first regex
+            .regexpReplaceAll("\\`$", "") and
+      id = "cmd:" + lineIndex + ":" + occurrenceIndex + ":" + occurrenceOffset
+    )
+  }
+
+  private predicate rankedCmdSubstitutionReplacements(int i, string command, string commandId) {
+    // rank commands by their unique IDs
+    commandId = rank[i](string c, string id | this.cmdSubstitutionReplacement(c, id, _) | id) and
+    // since we cannot output (command, ID) tuples from the rank operation,
+    // we need to work out the specific command associated with the resulting ID
+    this.cmdSubstitutionReplacement(command, commandId, _)
   }
 
   private predicate doReplaceCmdSubstitutions(int line, int round, string old, string new) {
@@ -64,31 +93,56 @@ class BashShellScript extends ShellScript {
     this.cmdSubstitutionReplacement(result, _, i)
   }
 
+  /**
+   * Holds if `quotedStr` is a string in double quotes in
+   * the line at `lineIndex` in the shell script,
+   * and `id` is a unique identifier for this quoted string.
+   */
+  private predicate doubleQuotedString(int lineIndex, string quotedStr, string id) {
+    exists(int occurrenceIndex, int occurrenceOffset |
+      // double quoted string
+      quotedStr =
+        this.cmdSubstitutedLineProducer(lineIndex)
+            .regexpFind("\"((?:[^\"\\\\]|\\\\.)*)\"", occurrenceIndex, occurrenceOffset) and
+      id =
+        "qstr:" + lineIndex + ":" + occurrenceIndex + ":" + occurrenceOffset + ":" +
+          quotedStr.length() + ":" + quotedStr.regexpReplaceAll("[^a-zA-Z0-9]", "")
+    )
+  }
+
+  /**
+   * Holds if `quotedStr` is a string in single quotes in
+   * the line at `lineIndex` in the shell script,
+   * and `id` is a unique identifier for this quoted string.
+   */
+  private predicate singleQuotedString(int lineIndex, string quotedStr, string id) {
+    exists(int occurrenceIndex, int occurrenceOffset |
+      // single quoted string
+      quotedStr =
+        this.cmdSubstitutedLineProducer(lineIndex)
+            .regexpFind("'((?:\\\\.|[^'\\\\])*)'", occurrenceIndex, occurrenceOffset) and
+      id =
+        "qstr:" + lineIndex + ":" + occurrenceIndex + ":" + occurrenceOffset + ":" +
+          quotedStr.length() + ":" + quotedStr.regexpReplaceAll("[^a-zA-Z0-9]", "")
+    )
+  }
+
   private predicate quotedStringReplacement(string quotedStr, string id) {
-    exists(string line, int k | line = this.cmdSubstitutedLineProducer(k) |
-      exists(int i, int j |
-        // double quoted string
-        quotedStr = line.regexpFind("\"((?:[^\"\\\\]|\\\\.)*)\"", i, j) and
-        id =
-          "qstr:" + k + ":" + i + ":" + j + ":" + quotedStr.length() + ":" +
-            quotedStr.regexpReplaceAll("[^a-zA-Z0-9]", "")
-      )
+    exists(int lineIndex |
+      this.doubleQuotedString(lineIndex, quotedStr, id)
       or
-      exists(int i, int j |
-        // single quoted string
-        quotedStr = line.regexpFind("'((?:\\\\.|[^'\\\\])*)'", i, j) and
-        id =
-          "qstr:" + k + ":" + i + ":" + j + ":" + quotedStr.length() + ":" +
-            quotedStr.regexpReplaceAll("[^a-zA-Z0-9]", "")
-      )
+      this.singleQuotedString(lineIndex, quotedStr, id)
     ) and
     // Only do this for strings that might otherwise disrupt subsequent parsing
     quotedStr.regexpMatch("[\"'].*[$\n\r'\"" + Bash::separator() + "].*[\"']")
   }
 
-  private predicate rankedQuotedStringReplacements(int i, string old, string new) {
-    old = rank[i](string old2 | this.quotedStringReplacement(old2, _) | old2) and
-    this.quotedStringReplacement(old, new)
+  private predicate rankedQuotedStringReplacements(int i, string quotedString, string quotedStringId) {
+    // rank quoted strings by their nearly-unique IDs
+    quotedStringId = rank[i](string s, string id | this.quotedStringReplacement(s, id) | id) and
+    // since we cannot output (string, ID) tuples from the rank operation,
+    // we need to work out the specific string associated with the resulting ID
+    this.quotedStringReplacement(quotedString, quotedStringId)
   }
 
   private predicate doReplaceQuotedStrings(int line, int round, string old, string new) {
diff --git a/actions/ql/test/query-tests/Security/CWE-094/.github/workflows/interpolation.yml b/actions/ql/test/query-tests/Security/CWE-094/.github/workflows/interpolation.yml
new file mode 100644
index 00000000000..2b719a3a38a
--- /dev/null
+++ b/actions/ql/test/query-tests/Security/CWE-094/.github/workflows/interpolation.yml
@@ -0,0 +1,81 @@
+name: Workflow with complex interpolation
+on: 
+  workflow_dispatch:
+    inputs:
+      choice-a:
+        required: true
+        type: choice
+        description: choice-a
+        default: a1
+        options: 
+        - a1
+        - a2
+        - a3
+      string-b:
+        required: false
+        type: string
+        description: string-b
+      string-c:
+        required: false
+        type: string
+        description: string-c
+      list-d:
+        required: true
+        type: string
+        default: d1 d2
+        description: list-d whitespace separated
+      list-e:
+        required: false
+        type: string
+        description: list-e whitespace separated
+      choice-f:
+        required: true
+        type: choice
+        description: choice-f
+        options: 
+        - false
+        - true
+          
+env:
+  DRY_TEST: false
+  B: ${{ github.event.inputs.string-b }}
+
+jobs:
+  job:
+    runs-on: ubuntu-latest
+    steps:
+    - name: Produce values
+      id: produce-values
+      run: |
+        echo "region=region" >> $GITHUB_OUTPUT
+        echo "zone=zone" >> $GITHUB_OUTPUT
+
+    - name: Step with complex interpolation
+      id: complex
+      env:
+        CHOICE_A: ${{ github.event.inputs.choice-a }}
+        STRING_B: ${{ github.event.inputs.string-b }}
+        STRING_C: ${{ github.event.inputs.string-c }}
+        LIST_D: ${{ github.event.inputs.list-d }}
+        LIST_E: ${{ github.event.inputs.list-e }}
+        CHOICE_F: ${{ github.event.inputs.choice-f }}
+        REGION: ${{ steps.produce-values.outputs.region }}
+        ZONE: ${{ steps.produce-values.outputs.zone }}
+        DRY_TEST_JSON: ${{ fromJSON(env.DRY_TEST) }}
+        FUNCTION_NAME: my-function
+        USER_EMAIL: 'example@example.com'
+        TYPE: type
+        RANGE: '0-100'
+
+      run: |
+        comma_separated_list_d=$(echo "${LIST_D}" | sed "s/ /\",\"/g")
+        comma_separated_list_e=$(echo "${LIST_E}" | sed "s/ /\",\"/g")
+        c1=$(echo "${STRING_C}" | cut -d "-" -f 1)
+        c2=$(echo "${STRING_C}" | cut -d "-" -f 2)
+        # Similar commands that use JSON payloads with string interpolation.
+        response=$(aws lambda invoke --invocation-type RequestResponse --function-name "${FUNCTION_NAME}" --region "${REGION}" --cli-read-timeout 0 --cli-binary-format raw-in-base64-out --payload '{"appName":"my-app","chA":"'"${CHOICE_A}"'","c1":"'"${c1}"'","c2":"'"${c2}"'","a":"${CHOICE_A}","bValue":"${B}","zone":"${ZONE}","userEmail":"'"${USER_EMAIL}"'","region":"${REGION}","range":"${RANGE}","type":"${TYPE}","b":"${STRING_B}","listD":"","listE":"","dryTest":'"${DRY_TEST_JSON}"',"f":"${CHOICE_F}"}' ./config.json --log-type Tail)
+        response=$(aws lambda invoke --invocation-type RequestResponse --function-name "${FUNCTION_NAME}" --region "${REGION}" --cli-read-timeout 0 --cli-binary-format raw-in-base64-out --payload '{"appName":"my-app","chA":"'"${CHOICE_A}"'","c1":"'"${c1}"'","c2":"'"${c2}"'","a":"${CHOICE_A}","bValue":"${B}","zone":"${ZONE}","userEmail":"'"${USER_EMAIL}"'","region":"${REGION}","range":"${RANGE}","type":"${TYPE}","b":"${STRING_B}","listD":["'"${comma_separated_list_d}"'"],"listE":"","dryTest":'"${DRY_TEST_JSON}"',"f":"${CHOICE_F}"}' ./config.json --log-type Tail)
+        response=$(aws lambda invoke --invocation-type RequestResponse --function-name "${FUNCTION_NAME}" --region "${REGION}" --cli-read-timeout 0 --cli-binary-format raw-in-base64-out --payload '{"appName":"my-app","chA":"'"${CHOICE_A}"'","c1":"'"${c1}"'","c2":"'"${c2}"'","a":"${CHOICE_A}","bValue":"${B}","zone":"${ZONE}","userEmail":"'"${USER_EMAIL}"'","region":"${REGION}","range":"${RANGE}","type":"${TYPE}","b":"${STRING_B}","listD":["'"${comma_separated_list_d}"'"],"listE":"","dryTest":'"${DRY_TEST_JSON}"',"f":"${CHOICE_F}"}' ./config.json --log-type Tail)
+        response=$(aws lambda invoke --invocation-type RequestResponse --function-name "${FUNCTION_NAME}" --region "${REGION}" --cli-read-timeout 0 --cli-binary-format raw-in-base64-out --payload '{"appName":"my-app","chA":"'"${CHOICE_A}"'","c1":"'"${c1}"'","c2":"'"${c2}"'","a":"${CHOICE_A}","bValue":"${B}","zone":"${ZONE}","userEmail":"'"${USER_EMAIL}"'","region":"${REGION}","range":"${RANGE}","type":"${TYPE}","b":"${STRING_B}","listD":["'"${comma_separated_list_d}"'"],"listE":"","dryTest":'"${DRY_TEST_JSON}"',"f":"${CHOICE_F}"}' ./config.json --log-type Tail)
+        response=$(aws lambda invoke --invocation-type RequestResponse --function-name "${FUNCTION_NAME}" --region "${REGION}" --cli-read-timeout 0 --cli-binary-format raw-in-base64-out --payload '{"appName":"my-app","chA":"'"${CHOICE_A}"'","c1":"'"${c1}"'","c2":"'"${c2}"'","a":"${CHOICE_A}","bValue":"${B}","zone":"${ZONE}","userEmail":"'"${USER_EMAIL}"'","region":"${REGION}","range":"${RANGE}","type":"${TYPE}","b":"${STRING_B}","listD":"","listE":["'"${comma_separated_list_e}"'"],"dryTest":'"${DRY_TEST_JSON}"',"f":"${CHOICE_F}"}' ./config.json --log-type Tail)
+      shell: bash
diff --git a/cpp/bulk_generation_targets.yml b/cpp/bulk_generation_targets.yml
new file mode 100644
index 00000000000..0e42eac3765
--- /dev/null
+++ b/cpp/bulk_generation_targets.yml
@@ -0,0 +1,10 @@
+language: cpp
+strategy: dca
+destination: cpp/ql/lib/ext/generated
+targets:
+- name: openssl
+  with-sinks: false
+  with-sources: false
+- name: sqlite
+  with-sinks: false
+  with-sources: false
diff --git a/cpp/downgrades/3c45f8b9e71ec723bf50c40581e1f18f4f25e290/lambdas.ql b/cpp/downgrades/3c45f8b9e71ec723bf50c40581e1f18f4f25e290/lambdas.ql
new file mode 100644
index 00000000000..cb35a2cc532
--- /dev/null
+++ b/cpp/downgrades/3c45f8b9e71ec723bf50c40581e1f18f4f25e290/lambdas.ql
@@ -0,0 +1,7 @@
+class LambdaExpr extends @lambdaexpr {
+  string toString() { none() }
+}
+
+from LambdaExpr lambda, string default_capture, boolean has_explicit_return_type
+where lambdas(lambda, default_capture, has_explicit_return_type, _)
+select lambda, default_capture, has_explicit_return_type
diff --git a/cpp/downgrades/3c45f8b9e71ec723bf50c40581e1f18f4f25e290/old.dbscheme b/cpp/downgrades/3c45f8b9e71ec723bf50c40581e1f18f4f25e290/old.dbscheme
new file mode 100644
index 00000000000..3c45f8b9e71
--- /dev/null
+++ b/cpp/downgrades/3c45f8b9e71ec723bf50c40581e1f18f4f25e290/old.dbscheme
@@ -0,0 +1,2493 @@
+
+/**
+ * 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
+);
+
+/**
+ * Optionally, record the build mode for each compilation.
+ */
+compilation_build_mode(
+    unique int id : @compilation ref,
+    int mode : int ref
+);
+
+/*
+case @compilation_build_mode.mode of
+  0 = @build_mode_none
+| 1 = @build_mode_manual
+| 2 = @build_mode_auto
+;
+*/
+
+/**
+ * The source files that are compiled by a compiler invocation.
+ * If `id` is for the compiler invocation
+ *
+ *   gcc -c f1.c f2.c f3.c
+ *
+ * then there will be rows for
+ *
+ * num | arg
+ * --- | ---
+ * 0   | f1.c
+ * 1   | f2.c
+ * 2   | f3.c
+ *
+ * Note that even if those files `#include` headers, those headers
+ * do not appear as rows.
+ */
+#keyset[id, num]
+compilation_compiling_files(
+    int id : @compilation ref,
+    int num : int ref,
+    int file : @file ref
+);
+
+/**
+ * The time taken by the extractor for a compiler invocation.
+ *
+ * For each file `num`, there will be rows for
+ *
+ * kind | seconds
+ * ---- | ---
+ * 1    | CPU seconds used by the extractor frontend
+ * 2    | Elapsed seconds during the extractor frontend
+ * 3    | CPU seconds used by the extractor backend
+ * 4    | Elapsed seconds during the extractor backend
+ */
+#keyset[id, num, kind]
+compilation_time(
+    int id : @compilation ref,
+    int num : int ref,
+    /* kind:
+       1 = frontend_cpu_seconds
+       2 = frontend_elapsed_seconds
+       3 = extractor_cpu_seconds
+       4 = extractor_elapsed_seconds
+    */
+    int kind : int ref,
+    float seconds : float ref
+);
+
+/**
+ * An error or warning generated by the extractor.
+ * The diagnostic message `diagnostic` was generated during compiler
+ * invocation `compilation`, and is the `file_number_diagnostic_number`th
+ * message generated while extracting the `file_number`th file of that
+ * invocation.
+ */
+#keyset[compilation, file_number, file_number_diagnostic_number]
+diagnostic_for(
+    int diagnostic : @diagnostic ref,
+    int compilation : @compilation ref,
+    int file_number : int ref,
+    int file_number_diagnostic_number : int ref
+);
+
+/**
+ * If extraction was successful, then `cpu_seconds` and
+ * `elapsed_seconds` are the CPU time and elapsed time (respectively)
+ * that extraction took for compiler invocation `id`.
+ */
+compilation_finished(
+    unique int id : @compilation ref,
+    float cpu_seconds : float ref,
+    float elapsed_seconds : float ref
+);
+
+
+/**
+ * External data, 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
+ */
+
+extractor_version(
+    string codeql_version: string ref,
+    string frontend_version: string ref
+)
+
+@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
+| 7 = @user_defined_literal
+| 8 = @deduction_guide
+;
+*/
+
+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
+);
+
+/*
+case @coroutine_placeholder_variable.kind of
+  1 = @handle
+| 2 = @promise
+| 3 = @init_await_resume
+;
+*/
+
+coroutine_placeholder_variable(
+  unique int placeholder_variable: @variable ref,
+  int kind: int ref,
+  int function: @function ref
+)
+
+/** The `new` function used for allocating the coroutine state, if any. */
+coroutine_new(
+  unique int function: @function ref,
+  int new: @function ref
+);
+
+/** The `delete` function used for deallocating the coroutine state, if any. */
+coroutine_delete(
+  unique int function: @function ref,
+  int delete: @function ref
+);
+
+purefunctions(unique int id: @function ref);
+
+function_deleted(unique int id: @function ref);
+
+function_defaulted(unique int id: @function ref);
+
+function_prototyped(unique int id: @function ref)
+
+deduction_guide_for_class(
+    int id: @function ref,
+    int class_template: @usertype ref
+)
+
+member_function_this_type(
+    unique int id: @function ref,
+    int this_type: @type ref
+);
+
+#keyset[id, type_id]
+fun_decls(
+    int id: @fun_decl,
+    int function: @function ref,
+    int type_id: @type ref,
+    string name: string ref,
+    int location: @location_default ref
+);
+fun_def(unique int id: @fun_decl ref);
+fun_specialized(unique int id: @fun_decl ref);
+fun_implicit(unique int id: @fun_decl ref);
+fun_decl_specifiers(
+    int id: @fun_decl ref,
+    string name: string ref
+)
+#keyset[fun_decl, index]
+fun_decl_throws(
+    int fun_decl: @fun_decl ref,
+    int index: int ref,
+    int type_id: @type ref
+);
+/* an empty throw specification is different from none */
+fun_decl_empty_throws(unique int fun_decl: @fun_decl ref);
+fun_decl_noexcept(
+    int fun_decl: @fun_decl ref,
+    int constant: @expr ref
+);
+fun_decl_empty_noexcept(int fun_decl: @fun_decl ref);
+fun_decl_typedef_type(
+    unique int fun_decl: @fun_decl ref,
+    int typedeftype_id: @usertype ref
+);
+
+/*
+case @fun_requires.kind of
+  1 = @template_attached
+| 2 = @function_attached
+;
+*/
+
+fun_requires(
+    int id: @fun_decl ref,
+    int kind: int ref,
+    int constraint: @expr ref
+);
+
+param_decl_bind(
+    unique int id: @var_decl ref,
+    int index: int ref,
+    int fun_decl: @fun_decl ref
+);
+
+#keyset[id, type_id]
+var_decls(
+    int id: @var_decl,
+    int variable: @variable ref,
+    int type_id: @type ref,
+    string name: string ref,
+    int location: @location_default ref
+);
+var_def(unique int id: @var_decl ref);
+var_specialized(int id: @var_decl ref);
+var_decl_specifiers(
+    int id: @var_decl ref,
+    string name: string ref
+)
+is_structured_binding(unique int id: @variable ref);
+var_requires(
+    int id: @var_decl ref,
+    int constraint: @expr ref
+);
+
+type_decls(
+    unique int id: @type_decl,
+    int type_id: @type ref,
+    int location: @location_default ref
+);
+type_def(unique int id: @type_decl ref);
+type_decl_top(
+    unique int type_decl: @type_decl ref
+);
+type_requires(
+    int id: @type_decl ref,
+    int constraint: @expr ref
+);
+
+namespace_decls(
+    unique int id: @namespace_decl,
+    int namespace_id: @namespace ref,
+    int location: @location_default ref,
+    int bodylocation: @location_default ref
+);
+
+case @using.kind of
+  1 = @using_declaration
+| 2 = @using_directive
+| 3 = @using_enum_declaration
+;
+
+usings(
+    unique int id: @using,
+    int element_id: @element ref,
+    int location: @location_default ref,
+    int kind: int ref
+);
+
+/** The element which contains the `using` declaration. */
+using_container(
+    int parent: @element ref,
+    int child: @using ref
+);
+
+static_asserts(
+    unique int id: @static_assert,
+    int condition : @expr ref,
+    string message : string ref,
+    int location: @location_default ref,
+    int enclosing : @element ref
+);
+
+// each function has an ordered list of parameters
+#keyset[id, type_id]
+#keyset[function, index, type_id]
+params(
+    int id: @parameter,
+    int function: @parameterized_element ref,
+    int index: int ref,
+    int type_id: @type ref
+);
+
+overrides(
+    int new: @function ref,
+    int old: @function ref
+);
+
+#keyset[id, type_id]
+membervariables(
+    int id: @membervariable,
+    int type_id: @type ref,
+    string name: string ref
+);
+
+#keyset[id, type_id]
+globalvariables(
+    int id: @globalvariable,
+    int type_id: @type ref,
+    string name: string ref
+);
+
+#keyset[id, type_id]
+localvariables(
+    int id: @localvariable,
+    int type_id: @type ref,
+    string name: string ref
+);
+
+autoderivation(
+    unique int var: @variable ref,
+    int derivation_type: @type ref
+);
+
+orphaned_variables(
+    int var: @localvariable ref,
+    int function: @function ref
+)
+
+enumconstants(
+    unique int id: @enumconstant,
+    int parent: @usertype ref,
+    int index: int ref,
+    int type_id: @type ref,
+    string name: string ref,
+    int location: @location_default ref
+);
+
+@variable = @localscopevariable | @globalvariable | @membervariable;
+
+@localscopevariable = @localvariable | @parameter;
+
+/**
+ * Built-in types are the fundamental types, e.g., integral, floating, and void.
+ */
+case @builtintype.kind of
+   1 = @errortype
+|  2 = @unknowntype
+|  3 = @void
+|  4 = @boolean
+|  5 = @char
+|  6 = @unsigned_char
+|  7 = @signed_char
+|  8 = @short
+|  9 = @unsigned_short
+| 10 = @signed_short
+| 11 = @int
+| 12 = @unsigned_int
+| 13 = @signed_int
+| 14 = @long
+| 15 = @unsigned_long
+| 16 = @signed_long
+| 17 = @long_long
+| 18 = @unsigned_long_long
+| 19 = @signed_long_long
+// ... 20 Microsoft-specific __int8
+// ... 21 Microsoft-specific __int16
+// ... 22 Microsoft-specific __int32
+// ... 23 Microsoft-specific __int64
+| 24 = @float
+| 25 = @double
+| 26 = @long_double
+| 27 = @complex_float         // C99-specific _Complex float
+| 28 = @complex_double        // C99-specific _Complex double
+| 29 = @complex_long_double   // C99-specific _Complex long double
+| 30 = @imaginary_float       // C99-specific _Imaginary float
+| 31 = @imaginary_double      // C99-specific _Imaginary double
+| 32 = @imaginary_long_double // C99-specific _Imaginary long double
+| 33 = @wchar_t               // Microsoft-specific
+| 34 = @decltype_nullptr      // C++11
+| 35 = @int128                // __int128
+| 36 = @unsigned_int128       // unsigned __int128
+| 37 = @signed_int128         // signed __int128
+| 38 = @float128              // __float128
+| 39 = @complex_float128      // _Complex __float128
+| 40 = @decimal32             // _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
+| 62 = @mfp8                  // __mfp8
+;
+
+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 or C23 `typeof`/`typeof_unqual`
+ * operator taking an expression as its argument.  For example:
+ * ```
+ * int a;
+ * decltype(1+a) b;
+ * typeof(1+a) c;
+ * ```
+ * Here `expr` is `1+a`.
+ *
+ * Sometimes an additional pair of parentheses around the expression
+ * changes the semantics of the decltype, e.g.
+ * ```
+ * struct A { double x; };
+ * const A* a = new A();
+ * decltype( a->x ); // type is double
+ * decltype((a->x)); // type is const double&
+ * ```
+ * (Please consult the C++11 standard for more details).
+ * `parentheses_would_change_meaning` is `true` iff that is the case.
+ */
+
+/*
+case @decltype.kind of
+|  0 = @decltype
+|  1 = @typeof // The frontend does not differentiate between typeof and typeof_unqual
+;
+*/
+
+#keyset[id, expr]
+decltypes(
+    int id: @decltype,
+    int expr: @expr ref,
+    int kind: int ref,
+    int base_type: @type ref,
+    boolean parentheses_would_change_meaning: boolean ref
+);
+
+/*
+case @type_operator.kind of
+|  0 = @typeof // The frontend does not differentiate between typeof and typeof_unqual
+|  1 = @underlying_type
+|  2 = @bases
+|  3 = @direct_bases
+|  4 = @add_lvalue_reference
+|  5 = @add_pointer
+|  6 = @add_rvalue_reference
+|  7 = @decay
+|  8 = @make_signed
+|  9 = @make_unsigned
+| 10 = @remove_all_extents
+| 11 = @remove_const
+| 12 = @remove_cv
+| 13 = @remove_cvref
+| 14 = @remove_extent
+| 15 = @remove_pointer
+| 16 = @remove_reference_t
+| 17 = @remove_restrict
+| 18 = @remove_volatile
+| 19 = @remove_reference
+;
+*/
+
+type_operators(
+    unique int id: @type_operator,
+    int arg_type: @type ref,
+    int kind: int ref,
+    int base_type: @type ref
+)
+
+/*
+case @usertype.kind of
+|  0 = @unknown_usertype
+|  1 = @struct
+|  2 = @class
+|  3 = @union
+|  4 = @enum
+// ... 5 = @typedef deprecated        // classic C: typedef typedef type name
+// ... 6 = @template deprecated
+|  7 = @template_parameter
+|  8 = @template_template_parameter
+|  9 = @proxy_class                   // a proxy class associated with a template parameter
+// ... 10 objc_class deprecated
+// ... 11 objc_protocol deprecated
+// ... 12 objc_category deprecated
+| 13 = @scoped_enum
+// ... 14 = @using_alias deprecated   // a using name = type style typedef
+| 15 = @template_struct
+| 16 = @template_class
+| 17 = @template_union
+| 18 = @alias
+;
+*/
+
+usertypes(
+    unique int id: @usertype,
+    string name: string ref,
+    int kind: int ref
+);
+
+usertypesize(
+    unique int id: @usertype ref,
+    int size: int ref,
+    int alignment: int ref
+);
+
+usertype_final(unique int id: @usertype ref);
+
+usertype_uuid(
+    unique int id: @usertype ref,
+    string uuid: string ref
+);
+
+/*
+case @usertype.alias_kind of
+| 0 = @typedef
+| 1 = @alias
+*/
+
+usertype_alias_kind(
+    int id: @usertype ref,
+    int alias_kind: int ref
+)
+
+nontype_template_parameters(
+    int id: @expr ref
+);
+
+type_template_type_constraint(
+    int id: @usertype ref,
+    int constraint: @expr ref
+);
+
+mangled_name(
+    unique int id: @declaration ref,
+    int mangled_name : @mangledname,
+    boolean is_complete: boolean ref
+);
+
+is_pod_class(unique int id: @usertype ref);
+is_standard_layout_class(unique int id: @usertype ref);
+
+is_complete(unique int id: @usertype ref);
+
+is_class_template(unique int id: @usertype ref);
+class_instantiation(
+    int to: @usertype ref,
+    int from: @usertype ref
+);
+class_template_argument(
+    int type_id: @usertype ref,
+    int index: int ref,
+    int arg_type: @type ref
+);
+class_template_argument_value(
+    int type_id: @usertype ref,
+    int index: int ref,
+    int arg_value: @expr ref
+);
+
+@user_or_decltype = @usertype | @decltype;
+
+is_proxy_class_for(
+    unique int id: @usertype ref,
+    int templ_param_id: @user_or_decltype ref
+);
+
+type_mentions(
+    unique int id: @type_mention,
+    int type_id: @type ref,
+    int location: @location 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
+);
+
+template_template_instantiation(
+    int to: @usertype ref,
+    int from: @usertype ref
+);
+template_template_argument(
+    int type_id: @usertype ref,
+    int index: int ref,
+    int arg_type: @type ref
+);
+template_template_argument_value(
+    int type_id: @usertype ref,
+    int index: int ref,
+    int arg_value: @expr ref
+);
+
+@concept = @concept_template | @concept_id;
+
+concept_templates(
+    unique int concept_id: @concept_template,
+    string name: string ref,
+    int location: @location_default ref
+);
+concept_instantiation(
+    unique int to: @concept_id ref,
+    int from: @concept_template ref
+);
+is_type_constraint(int concept_id: @concept_id ref);
+concept_template_argument(
+    int concept_id: @concept ref,
+    int index: int ref,
+    int arg_type: @type ref
+);
+concept_template_argument_value(
+    int concept_id: @concept ref,
+    int index: int ref,
+    int arg_value: @expr ref
+);
+
+routinetypes(
+    unique int id: @routinetype,
+    int return_type: @type ref
+);
+
+routinetypeargs(
+    int routine: @routinetype ref,
+    int index: int ref,
+    int type_id: @type ref
+);
+
+ptrtomembers(
+    unique int id: @ptrtomember,
+    int type_id: @type ref,
+    int class_id: @type ref
+);
+
+/*
+ specifiers for types, functions, and variables
+
+    "public",
+    "protected",
+    "private",
+
+    "const",
+    "volatile",
+    "static",
+
+    "pure",
+    "virtual",
+    "sealed", // Microsoft
+    "__interface", // Microsoft
+    "inline",
+    "explicit",
+
+    "near", // near far extension
+    "far", // near far extension
+    "__ptr32", // Microsoft
+    "__ptr64", // Microsoft
+    "__sptr", // Microsoft
+    "__uptr", // Microsoft
+    "dllimport", // Microsoft
+    "dllexport", // Microsoft
+    "thread", // Microsoft
+    "naked", // Microsoft
+    "microsoft_inline", // Microsoft
+    "forceinline", // Microsoft
+    "selectany", // Microsoft
+    "nothrow", // Microsoft
+    "novtable", // Microsoft
+    "noreturn", // Microsoft
+    "noinline", // Microsoft
+    "noalias", // Microsoft
+    "restrict", // Microsoft
+*/
+
+specifiers(
+    unique int id: @specifier,
+    unique string str: string ref
+);
+
+typespecifiers(
+    int type_id: @type ref,
+    int spec_id: @specifier ref
+);
+
+funspecifiers(
+    int func_id: @function ref,
+    int spec_id: @specifier ref
+);
+
+varspecifiers(
+    int var_id: @accessible ref,
+    int spec_id: @specifier ref
+);
+
+explicit_specifier_exprs(
+    unique int func_id: @function ref,
+    int constant: @expr ref
+)
+
+attributes(
+    unique int id: @attribute,
+    int kind: int ref,
+    string name: string ref,
+    string name_space: string ref,
+    int location: @location_default ref
+);
+
+case @attribute.kind of
+  0 = @gnuattribute
+| 1 = @stdattribute
+| 2 = @declspec
+| 3 = @msattribute
+| 4 = @alignas
+// ... 5 @objc_propertyattribute deprecated
+;
+
+attribute_args(
+    unique int id: @attribute_arg,
+    int kind: int ref,
+    int attribute: @attribute ref,
+    int index: int ref,
+    int location: @location_default ref
+);
+
+case @attribute_arg.kind of
+  0 = @attribute_arg_empty
+| 1 = @attribute_arg_token
+| 2 = @attribute_arg_constant
+| 3 = @attribute_arg_type
+| 4 = @attribute_arg_constant_expr
+| 5 = @attribute_arg_expr
+;
+
+attribute_arg_value(
+    unique int arg: @attribute_arg ref,
+    string value: string ref
+);
+attribute_arg_type(
+    unique int arg: @attribute_arg ref,
+    int type_id: @type ref
+);
+attribute_arg_constant(
+    unique int arg: @attribute_arg ref,
+    int constant: @expr ref
+)
+attribute_arg_expr(
+    unique int arg: @attribute_arg ref,
+    int expr: @expr ref
+)
+attribute_arg_name(
+    unique int arg: @attribute_arg ref,
+    string name: string ref
+);
+
+typeattributes(
+    int type_id: @type ref,
+    int spec_id: @attribute ref
+);
+
+funcattributes(
+    int func_id: @function ref,
+    int spec_id: @attribute ref
+);
+
+varattributes(
+    int var_id: @accessible ref,
+    int spec_id: @attribute ref
+);
+
+stmtattributes(
+    int stmt_id: @stmt ref,
+    int spec_id: @attribute ref
+);
+
+@type = @builtintype
+      | @derivedtype
+      | @usertype
+      | @routinetype
+      | @ptrtomember
+      | @decltype
+      | @type_operator;
+
+unspecifiedtype(
+    unique int type_id: @type ref,
+    int unspecified_type_id: @type ref
+);
+
+member(
+    int parent: @type ref,
+    int index: int ref,
+    int child: @member ref
+);
+
+@enclosingfunction_child = @usertype | @variable | @namespace
+
+enclosingfunction(
+    unique int child: @enclosingfunction_child ref,
+    int parent: @function ref
+);
+
+derivations(
+    unique int derivation: @derivation,
+    int sub: @type ref,
+    int index: int ref,
+    int super: @type ref,
+    int location: @location_default ref
+);
+
+derspecifiers(
+    int der_id: @derivation ref,
+    int spec_id: @specifier ref
+);
+
+/**
+ * Contains the byte offset of the base class subobject within the derived
+ * class. Only holds for non-virtual base classes, but see table
+ * `virtual_base_offsets` for offsets of virtual base class subobjects.
+ */
+direct_base_offsets(
+    unique int der_id: @derivation ref,
+    int offset: int ref
+);
+
+/**
+ * Contains the byte offset of the virtual base class subobject for class
+ * `super` within a most-derived object of class `sub`. `super` can be either a
+ * direct or indirect base class.
+ */
+#keyset[sub, super]
+virtual_base_offsets(
+    int sub: @usertype ref,
+    int super: @usertype ref,
+    int offset: int ref
+);
+
+frienddecls(
+    unique int id: @frienddecl,
+    int type_id: @type ref,
+    int decl_id: @declaration ref,
+    int location: @location_default ref
+);
+
+@declaredtype = @usertype ;
+
+@declaration = @function
+             | @declaredtype
+             | @variable
+             | @enumconstant
+             | @frienddecl
+             | @concept_template;
+
+@member = @membervariable
+        | @function
+        | @declaredtype
+        | @enumconstant;
+
+@locatable = @diagnostic
+           | @declaration
+           | @ppd_include
+           | @ppd_define
+           | @macroinvocation
+           /*| @funcall*/
+           | @xmllocatable
+           | @attribute
+           | @attribute_arg;
+
+@namedscope = @namespace | @usertype;
+
+@element = @locatable
+         | @file
+         | @folder
+         | @specifier
+         | @type
+         | @expr
+         | @namespace
+         | @initialiser
+         | @stmt
+         | @derivation
+         | @comment
+         | @preprocdirect
+         | @fun_decl
+         | @var_decl
+         | @type_decl
+         | @namespace_decl
+         | @using
+         | @namequalifier
+         | @specialnamequalifyingelement
+         | @static_assert
+         | @type_mention
+         | @lambdacapture;
+
+@exprparent = @element;
+
+comments(
+    unique int id: @comment,
+    string contents: string ref,
+    int location: @location_default ref
+);
+
+commentbinding(
+    int id: @comment ref,
+    int element: @element ref
+);
+
+exprconv(
+    int converted: @expr ref,
+    unique int conversion: @expr ref
+);
+
+compgenerated(unique int id: @element ref);
+
+/**
+ * `destructor_call` destructs the `i`'th entity that should be
+ * destructed following `element`. Note that entities should be
+ * destructed in reverse construction order, so for a given `element`
+ * these should be called from highest to lowest `i`.
+ */
+#keyset[element, destructor_call]
+#keyset[element, i]
+synthetic_destructor_call(
+    int element: @element ref,
+    int i: int ref,
+    int destructor_call: @routineexpr ref
+);
+
+namespaces(
+    unique int id: @namespace,
+    string name: string ref
+);
+
+namespace_inline(
+    unique int id: @namespace ref
+);
+
+namespacembrs(
+    int parentid: @namespace ref,
+    unique int memberid: @namespacembr ref
+);
+
+@namespacembr = @declaration | @namespace;
+
+exprparents(
+    int expr_id: @expr ref,
+    int child_index: int ref,
+    int parent_id: @exprparent ref
+);
+
+expr_isload(unique int expr_id: @expr ref);
+
+@cast = @c_style_cast
+      | @const_cast
+      | @dynamic_cast
+      | @reinterpret_cast
+      | @static_cast
+      ;
+
+/*
+case @conversion.kind of
+  0 = @simple_conversion           // a numeric conversion, qualification conversion, or a reinterpret_cast
+| 1 = @bool_conversion             // conversion to 'bool'
+| 2 = @base_class_conversion       // a derived-to-base conversion
+| 3 = @derived_class_conversion    // a base-to-derived conversion
+| 4 = @pm_base_class_conversion    // a derived-to-base conversion of a pointer to member
+| 5 = @pm_derived_class_conversion // a base-to-derived conversion of a pointer to member
+| 6 = @glvalue_adjust              // an adjustment of the type of a glvalue
+| 7 = @prvalue_adjust              // an adjustment of the type of a prvalue
+;
+*/
+/**
+ * Describes the semantics represented by a cast expression. This is largely
+ * independent of the source syntax of the cast, so it is separate from the
+ * regular expression kind.
+ */
+conversionkinds(
+    unique int expr_id: @cast ref,
+    int kind: int ref
+);
+
+@conversion = @cast
+            | @array_to_pointer
+            | @parexpr
+            | @reference_to
+            | @ref_indirect
+            | @temp_init
+            | @c11_generic
+            ;
+
+/*
+case @funbindexpr.kind of
+  0 = @normal_call  // a normal call
+| 1 = @virtual_call // a virtual call
+| 2 = @adl_call     // a call whose target is only found by ADL
+;
+*/
+iscall(
+    unique int caller: @funbindexpr ref,
+    int kind: int ref
+);
+
+numtemplatearguments(
+    unique int expr_id: @expr ref,
+    int num: int ref
+);
+
+specialnamequalifyingelements(
+    unique int id: @specialnamequalifyingelement,
+    unique string name: string ref
+);
+
+@namequalifiableelement = @expr | @namequalifier;
+@namequalifyingelement = @namespace
+                       | @specialnamequalifyingelement
+                       | @usertype;
+
+namequalifiers(
+    unique int id: @namequalifier,
+    unique int qualifiableelement: @namequalifiableelement ref,
+    int qualifyingelement: @namequalifyingelement ref,
+    int location: @location_default ref
+);
+
+varbind(
+    int expr: @varbindexpr ref,
+    int var: @accessible ref
+);
+
+funbind(
+    int expr: @funbindexpr ref,
+    int fun: @function ref
+);
+
+@any_new_expr = @new_expr
+              | @new_array_expr;
+
+@new_or_delete_expr = @any_new_expr
+                    | @delete_expr
+                    | @delete_array_expr;
+
+@prefix_crement_expr = @preincrexpr | @predecrexpr;
+
+@postfix_crement_expr = @postincrexpr | @postdecrexpr;
+
+@increment_expr = @preincrexpr | @postincrexpr;
+
+@decrement_expr = @predecrexpr | @postdecrexpr;
+
+@crement_expr = @increment_expr | @decrement_expr;
+
+@un_arith_op_expr = @arithnegexpr
+                  | @unaryplusexpr
+                  | @conjugation
+                  | @realpartexpr
+                  | @imagpartexpr
+                  | @crement_expr
+                  ;
+
+@un_bitwise_op_expr = @complementexpr;
+
+@un_log_op_expr = @notexpr;
+
+@un_op_expr = @address_of
+            | @indirect
+            | @un_arith_op_expr
+            | @un_bitwise_op_expr
+            | @builtinaddressof
+            | @vec_fill
+            | @un_log_op_expr
+            | @co_await
+            | @co_yield
+            ;
+
+@bin_log_op_expr = @andlogicalexpr | @orlogicalexpr;
+
+@cmp_op_expr = @eq_op_expr | @rel_op_expr;
+
+@eq_op_expr = @eqexpr | @neexpr;
+
+@rel_op_expr = @gtexpr
+             | @ltexpr
+             | @geexpr
+             | @leexpr
+             | @spaceshipexpr
+             ;
+
+@bin_bitwise_op_expr = @lshiftexpr
+                     | @rshiftexpr
+                     | @andexpr
+                     | @orexpr
+                     | @xorexpr
+                     ;
+
+@p_arith_op_expr = @paddexpr
+                 | @psubexpr
+                 | @pdiffexpr
+                 ;
+
+@bin_arith_op_expr = @addexpr
+                   | @subexpr
+                   | @mulexpr
+                   | @divexpr
+                   | @remexpr
+                   | @jmulexpr
+                   | @jdivexpr
+                   | @fjaddexpr
+                   | @jfaddexpr
+                   | @fjsubexpr
+                   | @jfsubexpr
+                   | @minexpr
+                   | @maxexpr
+                   | @p_arith_op_expr
+                   ;
+
+@bin_op_expr = @bin_arith_op_expr
+             | @bin_bitwise_op_expr
+             | @cmp_op_expr
+             | @bin_log_op_expr
+             ;
+
+@op_expr = @un_op_expr
+         | @bin_op_expr
+         | @assign_expr
+         | @conditionalexpr
+         ;
+
+@assign_arith_expr = @assignaddexpr
+                   | @assignsubexpr
+                   | @assignmulexpr
+                   | @assigndivexpr
+                   | @assignremexpr
+                   ;
+
+@assign_bitwise_expr = @assignandexpr
+                     | @assignorexpr
+                     | @assignxorexpr
+                     | @assignlshiftexpr
+                     | @assignrshiftexpr
+                     ;
+
+@assign_pointer_expr = @assignpaddexpr
+                     | @assignpsubexpr
+                     ;
+
+@assign_op_expr = @assign_arith_expr
+                | @assign_bitwise_expr
+                | @assign_pointer_expr
+                ;
+
+@assign_expr = @assignexpr | @assign_op_expr | @blockassignexpr
+
+/*
+  Binary encoding of the allocator form.
+
+  case @allocator.form of
+    0 = plain
+  | 1 = alignment
+  ;
+*/
+
+/**
+ * The allocator function associated with a `new` or `new[]` expression.
+ * The `form` column specified whether the allocation call contains an alignment
+ * argument.
+ */
+expr_allocator(
+    unique int expr: @any_new_expr ref,
+    int func: @function ref,
+    int form: int ref
+);
+
+/*
+  Binary encoding of the deallocator form.
+
+  case @deallocator.form of
+    0 = plain
+  | 1 = size
+  | 2 = alignment
+  | 4 = destroying_delete
+  ;
+*/
+
+/**
+ * The deallocator function associated with a `delete`, `delete[]`, `new`, or
+ * `new[]` expression. For a `new` or `new[]` expression, the deallocator is the
+ * one used to free memory if the initialization throws an exception.
+ * The `form` column specifies whether the deallocation call contains a size
+ * argument, and alignment argument, or both.
+ */
+expr_deallocator(
+    unique int expr: @new_or_delete_expr ref,
+    int func: @function ref,
+    int form: int ref
+);
+
+/**
+ * Holds if the `@conditionalexpr` is of the two operand form
+ * `guard ? : false`.
+ */
+expr_cond_two_operand(
+    unique int cond: @conditionalexpr ref
+);
+
+/**
+ * The guard of `@conditionalexpr` `guard ? true : false`
+ */
+expr_cond_guard(
+    unique int cond: @conditionalexpr ref,
+    int guard: @expr ref
+);
+
+/**
+ * The expression used when the guard of `@conditionalexpr`
+ * `guard ? true : false` holds. For the two operand form
+ * `guard ?: false` consider using `expr_cond_guard` instead.
+ */
+expr_cond_true(
+    unique int cond: @conditionalexpr ref,
+    int true: @expr ref
+);
+
+/**
+ * The expression used when the guard of `@conditionalexpr`
+ * `guard ? true : false` does not hold.
+ */
+expr_cond_false(
+    unique int cond: @conditionalexpr ref,
+    int false: @expr ref
+);
+
+/** A string representation of the value. */
+values(
+    unique int id: @value,
+    string str: string ref
+);
+
+/** The actual text in the source code for the value, if any. */
+valuetext(
+    unique int id: @value ref,
+    string text: string ref
+);
+
+valuebind(
+    int val: @value ref,
+    unique int expr: @expr ref
+);
+
+fieldoffsets(
+    unique int id: @variable ref,
+    int byteoffset: int ref,
+    int bitoffset: int ref
+);
+
+bitfield(
+    unique int id: @variable ref,
+    int bits: int ref,
+    int declared_bits: int ref
+);
+
+/* TODO
+memberprefix(
+    int member: @expr ref,
+    int prefix: @expr ref
+);
+*/
+
+/*
+   kind(1) = mbrcallexpr
+   kind(2) = mbrptrcallexpr
+   kind(3) = mbrptrmbrcallexpr
+   kind(4) = ptrmbrptrmbrcallexpr
+   kind(5) = mbrreadexpr // x.y
+   kind(6) = mbrptrreadexpr // p->y
+   kind(7) = mbrptrmbrreadexpr // x.*pm
+   kind(8) = mbrptrmbrptrreadexpr // x->*pm
+   kind(9) = staticmbrreadexpr // static x.y
+   kind(10) = staticmbrptrreadexpr // static p->y
+*/
+/* TODO
+memberaccess(
+    int member: @expr ref,
+    int kind: int ref
+);
+*/
+
+initialisers(
+    unique int init: @initialiser,
+    int var: @accessible ref,
+    unique int expr: @expr ref,
+    int location: @location_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
+);
+
+expr_reuse(
+    int reuse: @expr ref,
+    int original: @expr ref,
+    int value_category: int ref
+)
+
+/*
+  case @value.category of
+    1 = prval
+  | 2 = xval
+  | 3 = lval
+  ;
+*/
+expr_types(
+    int id: @expr ref,
+    int typeid: @type ref,
+    int value_category: int ref
+);
+
+case @expr.kind of
+    1 = @errorexpr
+|   2 = @address_of // & AddressOfExpr
+|   3 = @reference_to // ReferenceToExpr (implicit?)
+|   4 = @indirect // * PointerDereferenceExpr
+|   5 = @ref_indirect // ReferenceDereferenceExpr (implicit?)
+// ...
+|   8 = @array_to_pointer // (???)
+|   9 = @vacuous_destructor_call // VacuousDestructorCall
+// ...
+|  11 = @assume // Microsoft
+|  12 = @parexpr
+|  13 = @arithnegexpr
+|  14 = @unaryplusexpr
+|  15 = @complementexpr
+|  16 = @notexpr
+|  17 = @conjugation // GNU ~ operator
+|  18 = @realpartexpr // GNU __real
+|  19 = @imagpartexpr // GNU __imag
+|  20 = @postincrexpr
+|  21 = @postdecrexpr
+|  22 = @preincrexpr
+|  23 = @predecrexpr
+|  24 = @conditionalexpr
+|  25 = @addexpr
+|  26 = @subexpr
+|  27 = @mulexpr
+|  28 = @divexpr
+|  29 = @remexpr
+|  30 = @jmulexpr // C99 mul imaginary
+|  31 = @jdivexpr // C99 div imaginary
+|  32 = @fjaddexpr // C99 add real + imaginary
+|  33 = @jfaddexpr // C99 add imaginary + real
+|  34 = @fjsubexpr // C99 sub real - imaginary
+|  35 = @jfsubexpr // C99 sub imaginary - real
+|  36 = @paddexpr // pointer add (pointer + int or int + pointer)
+|  37 = @psubexpr // pointer sub (pointer - integer)
+|  38 = @pdiffexpr // difference between two pointers
+|  39 = @lshiftexpr
+|  40 = @rshiftexpr
+|  41 = @andexpr
+|  42 = @orexpr
+|  43 = @xorexpr
+|  44 = @eqexpr
+|  45 = @neexpr
+|  46 = @gtexpr
+|  47 = @ltexpr
+|  48 = @geexpr
+|  49 = @leexpr
+|  50 = @minexpr // GNU minimum
+|  51 = @maxexpr // GNU maximum
+|  52 = @assignexpr
+|  53 = @assignaddexpr
+|  54 = @assignsubexpr
+|  55 = @assignmulexpr
+|  56 = @assigndivexpr
+|  57 = @assignremexpr
+|  58 = @assignlshiftexpr
+|  59 = @assignrshiftexpr
+|  60 = @assignandexpr
+|  61 = @assignorexpr
+|  62 = @assignxorexpr
+|  63 = @assignpaddexpr // assign pointer add
+|  64 = @assignpsubexpr // assign pointer sub
+|  65 = @andlogicalexpr
+|  66 = @orlogicalexpr
+|  67 = @commaexpr
+|  68 = @subscriptexpr // access to member of an array, e.g., a[5]
+// ...  69 @objc_subscriptexpr deprecated
+// ...  70 @cmdaccess deprecated
+// ...
+|  73 = @virtfunptrexpr
+|  74 = @callexpr
+// ...  75 @msgexpr_normal deprecated
+// ...  76 @msgexpr_super deprecated
+// ...  77 @atselectorexpr deprecated
+// ...  78 @atprotocolexpr deprecated
+|  79 = @vastartexpr
+|  80 = @vaargexpr
+|  81 = @vaendexpr
+|  82 = @vacopyexpr
+// ...  83 @atencodeexpr deprecated
+|  84 = @varaccess
+|  85 = @thisaccess
+// ...  86 @objc_box_expr deprecated
+|  87 = @new_expr
+|  88 = @delete_expr
+|  89 = @throw_expr
+|  90 = @condition_decl // a variable declared in a condition, e.g., if(int x = y > 2)
+|  91 = @braced_init_list
+|  92 = @type_id
+|  93 = @runtime_sizeof
+|  94 = @runtime_alignof
+|  95 = @sizeof_pack
+|  96 = @expr_stmt // GNU extension
+|  97 = @routineexpr
+|  98 = @type_operand // used to access a type in certain contexts (haven't found any examples yet....)
+|  99 = @offsetofexpr // offsetof ::= type and field
+| 100 = @hasassignexpr // __has_assign ::= type
+| 101 = @hascopyexpr // __has_copy ::= type
+| 102 = @hasnothrowassign // __has_nothrow_assign ::= type
+| 103 = @hasnothrowconstr // __has_nothrow_constructor ::= type
+| 104 = @hasnothrowcopy // __has_nothrow_copy ::= type
+| 105 = @hastrivialassign // __has_trivial_assign ::= type
+| 106 = @hastrivialconstr // __has_trivial_constructor ::= type
+| 107 = @hastrivialcopy // __has_trivial_copy ::= type
+| 108 = @hasuserdestr // __has_user_destructor ::= type
+| 109 = @hasvirtualdestr // __has_virtual_destructor ::= type
+| 110 = @isabstractexpr // __is_abstract ::= type
+| 111 = @isbaseofexpr // __is_base_of ::= type type
+| 112 = @isclassexpr // __is_class ::= type
+| 113 = @isconvtoexpr // __is_convertible_to ::= type type
+| 114 = @isemptyexpr // __is_empty ::= type
+| 115 = @isenumexpr // __is_enum ::= type
+| 116 = @ispodexpr // __is_pod ::= type
+| 117 = @ispolyexpr // __is_polymorphic ::= type
+| 118 = @isunionexpr // __is_union ::= type
+| 119 = @typescompexpr // GNU __builtin_types_compatible ::= type type
+| 120 = @intaddrexpr // frontend internal builtin, used to implement offsetof
+// ...
+| 122 = @hastrivialdestructor // __has_trivial_destructor ::= type
+| 123 = @literal
+| 124 = @uuidof
+| 127 = @aggregateliteral
+| 128 = @delete_array_expr
+| 129 = @new_array_expr
+// ... 130 @objc_array_literal deprecated
+// ... 131 @objc_dictionary_literal deprecated
+| 132 = @foldexpr
+// ...
+| 200 = @ctordirectinit
+| 201 = @ctorvirtualinit
+| 202 = @ctorfieldinit
+| 203 = @ctordelegatinginit
+| 204 = @dtordirectdestruct
+| 205 = @dtorvirtualdestruct
+| 206 = @dtorfielddestruct
+// ...
+| 210 = @static_cast
+| 211 = @reinterpret_cast
+| 212 = @const_cast
+| 213 = @dynamic_cast
+| 214 = @c_style_cast
+| 215 = @lambdaexpr
+| 216 = @param_ref
+| 217 = @noopexpr
+// ...
+| 294 = @istriviallyconstructibleexpr
+| 295 = @isdestructibleexpr
+| 296 = @isnothrowdestructibleexpr
+| 297 = @istriviallydestructibleexpr
+| 298 = @istriviallyassignableexpr
+| 299 = @isnothrowassignableexpr
+| 300 = @istrivialexpr
+| 301 = @isstandardlayoutexpr
+| 302 = @istriviallycopyableexpr
+| 303 = @isliteraltypeexpr
+| 304 = @hastrivialmoveconstructorexpr
+| 305 = @hastrivialmoveassignexpr
+| 306 = @hasnothrowmoveassignexpr
+| 307 = @isconstructibleexpr
+| 308 = @isnothrowconstructibleexpr
+| 309 = @hasfinalizerexpr
+| 310 = @isdelegateexpr
+| 311 = @isinterfaceclassexpr
+| 312 = @isrefarrayexpr
+| 313 = @isrefclassexpr
+| 314 = @issealedexpr
+| 315 = @issimplevalueclassexpr
+| 316 = @isvalueclassexpr
+| 317 = @isfinalexpr
+| 319 = @noexceptexpr
+| 320 = @builtinshufflevector
+| 321 = @builtinchooseexpr
+| 322 = @builtinaddressof
+| 323 = @vec_fill
+| 324 = @builtinconvertvector
+| 325 = @builtincomplex
+| 326 = @spaceshipexpr
+| 327 = @co_await
+| 328 = @co_yield
+| 329 = @temp_init
+| 330 = @isassignable
+| 331 = @isaggregate
+| 332 = @hasuniqueobjectrepresentations
+| 333 = @builtinbitcast
+| 334 = @builtinshuffle
+| 335 = @blockassignexpr
+| 336 = @issame
+| 337 = @isfunction
+| 338 = @islayoutcompatible
+| 339 = @ispointerinterconvertiblebaseof
+| 340 = @isarray
+| 341 = @arrayrank
+| 342 = @arrayextent
+| 343 = @isarithmetic
+| 344 = @iscompletetype
+| 345 = @iscompound
+| 346 = @isconst
+| 347 = @isfloatingpoint
+| 348 = @isfundamental
+| 349 = @isintegral
+| 350 = @islvaluereference
+| 351 = @ismemberfunctionpointer
+| 352 = @ismemberobjectpointer
+| 353 = @ismemberpointer
+| 354 = @isobject
+| 355 = @ispointer
+| 356 = @isreference
+| 357 = @isrvaluereference
+| 358 = @isscalar
+| 359 = @issigned
+| 360 = @isunsigned
+| 361 = @isvoid
+| 362 = @isvolatile
+| 363 = @reuseexpr
+| 364 = @istriviallycopyassignable
+| 365 = @isassignablenopreconditioncheck
+| 366 = @referencebindstotemporary
+| 367 = @issameas
+| 368 = @builtinhasattribute
+| 369 = @ispointerinterconvertiblewithclass
+| 370 = @builtinispointerinterconvertiblewithclass
+| 371 = @iscorrespondingmember
+| 372 = @builtiniscorrespondingmember
+| 373 = @isboundedarray
+| 374 = @isunboundedarray
+| 375 = @isreferenceable
+| 378 = @isnothrowconvertible
+| 379 = @referenceconstructsfromtemporary
+| 380 = @referenceconvertsfromtemporary
+| 381 = @isconvertible
+| 382 = @isvalidwinrttype
+| 383 = @iswinclass
+| 384 = @iswininterface
+| 385 = @istriviallyequalitycomparable
+| 386 = @isscopedenum
+| 387 = @istriviallyrelocatable
+| 388 = @datasizeof
+| 389 = @c11_generic
+| 390 = @requires_expr
+| 391 = @nested_requirement
+| 392 = @compound_requirement
+| 393 = @concept_id
+;
+
+@var_args_expr = @vastartexpr
+               | @vaendexpr
+               | @vaargexpr
+               | @vacopyexpr
+               ;
+
+@builtin_op = @var_args_expr
+            | @noopexpr
+            | @offsetofexpr
+            | @intaddrexpr
+            | @hasassignexpr
+            | @hascopyexpr
+            | @hasnothrowassign
+            | @hasnothrowconstr
+            | @hasnothrowcopy
+            | @hastrivialassign
+            | @hastrivialconstr
+            | @hastrivialcopy
+            | @hastrivialdestructor
+            | @hasuserdestr
+            | @hasvirtualdestr
+            | @isabstractexpr
+            | @isbaseofexpr
+            | @isclassexpr
+            | @isconvtoexpr
+            | @isemptyexpr
+            | @isenumexpr
+            | @ispodexpr
+            | @ispolyexpr
+            | @isunionexpr
+            | @typescompexpr
+            | @builtinshufflevector
+            | @builtinconvertvector
+            | @builtinaddressof
+            | @istriviallyconstructibleexpr
+            | @isdestructibleexpr
+            | @isnothrowdestructibleexpr
+            | @istriviallydestructibleexpr
+            | @istriviallyassignableexpr
+            | @isnothrowassignableexpr
+            | @istrivialexpr
+            | @isstandardlayoutexpr
+            | @istriviallycopyableexpr
+            | @isliteraltypeexpr
+            | @hastrivialmoveconstructorexpr
+            | @hastrivialmoveassignexpr
+            | @hasnothrowmoveassignexpr
+            | @isconstructibleexpr
+            | @isnothrowconstructibleexpr
+            | @hasfinalizerexpr
+            | @isdelegateexpr
+            | @isinterfaceclassexpr
+            | @isrefarrayexpr
+            | @isrefclassexpr
+            | @issealedexpr
+            | @issimplevalueclassexpr
+            | @isvalueclassexpr
+            | @isfinalexpr
+            | @builtinchooseexpr
+            | @builtincomplex
+            | @isassignable
+            | @isaggregate
+            | @hasuniqueobjectrepresentations
+            | @builtinbitcast
+            | @builtinshuffle
+            | @issame
+            | @isfunction
+            | @islayoutcompatible
+            | @ispointerinterconvertiblebaseof
+            | @isarray
+            | @arrayrank
+            | @arrayextent
+            | @isarithmetic
+            | @iscompletetype
+            | @iscompound
+            | @isconst
+            | @isfloatingpoint
+            | @isfundamental
+            | @isintegral
+            | @islvaluereference
+            | @ismemberfunctionpointer
+            | @ismemberobjectpointer
+            | @ismemberpointer
+            | @isobject
+            | @ispointer
+            | @isreference
+            | @isrvaluereference
+            | @isscalar
+            | @issigned
+            | @isunsigned
+            | @isvoid
+            | @isvolatile
+            | @istriviallycopyassignable
+            | @isassignablenopreconditioncheck
+            | @referencebindstotemporary
+            | @issameas
+            | @builtinhasattribute
+            | @ispointerinterconvertiblewithclass
+            | @builtinispointerinterconvertiblewithclass
+            | @iscorrespondingmember
+            | @builtiniscorrespondingmember
+            | @isboundedarray
+            | @isunboundedarray
+            | @isreferenceable
+            | @isnothrowconvertible
+            | @referenceconstructsfromtemporary
+            | @referenceconvertsfromtemporary
+            | @isconvertible
+            | @isvalidwinrttype
+            | @iswinclass
+            | @iswininterface
+            | @istriviallyequalitycomparable
+            | @isscopedenum
+            | @istriviallyrelocatable
+            ;
+
+compound_requirement_is_noexcept(
+    int expr: @compound_requirement ref
+);
+
+new_allocated_type(
+    unique int expr: @new_expr ref,
+    int type_id: @type ref
+);
+
+new_array_allocated_type(
+    unique int expr: @new_array_expr ref,
+    int type_id: @type ref
+);
+
+/**
+ * The field being initialized by an initializer expression within an aggregate
+ * initializer for a class/struct/union. Position is used to sort repeated initializers.
+ */
+#keyset[aggregate, position]
+aggregate_field_init(
+    int aggregate: @aggregateliteral ref,
+    int initializer: @expr ref,
+    int field: @membervariable ref,
+    int position: int ref,
+    boolean is_designated: boolean ref
+);
+
+/**
+ * The index of the element being initialized by an initializer expression
+ * within an aggregate initializer for an array. Position is used to sort repeated initializers.
+ */
+#keyset[aggregate, position]
+aggregate_array_init(
+    int aggregate: @aggregateliteral ref,
+    int initializer: @expr ref,
+    int element_index: int ref,
+    int position: int ref,
+    boolean is_designated: boolean ref
+);
+
+@ctorinit = @ctordirectinit
+          | @ctorvirtualinit
+          | @ctorfieldinit
+          | @ctordelegatinginit;
+@dtordestruct = @dtordirectdestruct
+              | @dtorvirtualdestruct
+              | @dtorfielddestruct;
+
+
+condition_decl_bind(
+    unique int expr: @condition_decl ref,
+    unique int decl: @declaration ref
+);
+
+typeid_bind(
+    unique int expr: @type_id ref,
+    int type_id: @type ref
+);
+
+uuidof_bind(
+    unique int expr: @uuidof ref,
+    int type_id: @type ref
+);
+
+@sizeof_or_alignof = @runtime_sizeof | @runtime_alignof | @datasizeof | @sizeof_pack;
+
+sizeof_bind(
+    unique int expr: @sizeof_or_alignof ref,
+    int type_id: @type ref
+);
+
+code_block(
+    unique int block: @literal ref,
+    unique int routine: @function ref
+);
+
+lambdas(
+    unique int expr: @lambdaexpr ref,
+    string default_capture: string ref,
+    boolean has_explicit_return_type: boolean ref,
+    boolean has_explicit_parameter_list: boolean ref
+);
+
+lambda_capture(
+    unique int id: @lambdacapture,
+    int lambda: @lambdaexpr ref,
+    int index: int ref,
+    int field: @membervariable ref,
+    boolean captured_by_reference: boolean ref,
+    boolean is_implicit: boolean ref,
+    int location: @location_default ref
+);
+
+@funbindexpr = @routineexpr
+             | @new_expr
+             | @delete_expr
+             | @delete_array_expr
+             | @ctordirectinit
+             | @ctorvirtualinit
+             | @ctordelegatinginit
+             | @dtordirectdestruct
+             | @dtorvirtualdestruct;
+
+@varbindexpr = @varaccess | @ctorfieldinit | @dtorfielddestruct;
+@addressable = @function | @variable ;
+@accessible = @addressable | @enumconstant ;
+
+@access = @varaccess | @routineexpr ;
+
+fold(
+    int expr: @foldexpr ref,
+    string operator: string ref,
+    boolean is_left_fold: boolean ref
+);
+
+stmts(
+    unique int id: @stmt,
+    int kind: int ref,
+    int location: @location_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
+|  38 = @stmt_consteval_if
+|  39 = @stmt_not_consteval_if
+;
+
+type_vla(
+    int type_id: @type ref,
+    int decl: @stmt_vla_decl ref
+);
+
+variable_vla(
+    int var: @variable ref,
+    int decl: @stmt_vla_decl ref
+);
+
+type_is_vla(unique int type_id: @derivedtype ref)
+
+if_initialization(
+    unique int if_stmt: @stmt_if ref,
+    int init_id: @stmt ref
+);
+
+if_then(
+    unique int if_stmt: @stmt_if ref,
+    int then_id: @stmt ref
+);
+
+if_else(
+    unique int if_stmt: @stmt_if ref,
+    int else_id: @stmt ref
+);
+
+constexpr_if_initialization(
+    unique int constexpr_if_stmt: @stmt_constexpr_if ref,
+    int init_id: @stmt ref
+);
+
+constexpr_if_then(
+    unique int constexpr_if_stmt: @stmt_constexpr_if ref,
+    int then_id: @stmt ref
+);
+
+constexpr_if_else(
+    unique int constexpr_if_stmt: @stmt_constexpr_if ref,
+    int else_id: @stmt ref
+);
+
+@stmt_consteval_or_not_consteval_if = @stmt_consteval_if | @stmt_not_consteval_if;
+
+consteval_if_then(
+    unique int constexpr_if_stmt: @stmt_consteval_or_not_consteval_if ref,
+    int then_id: @stmt ref
+);
+
+consteval_if_else(
+    unique int constexpr_if_stmt: @stmt_consteval_or_not_consteval_if ref,
+    int else_id: @stmt ref
+);
+
+while_body(
+    unique int while_stmt: @stmt_while ref,
+    int body_id: @stmt ref
+);
+
+do_body(
+    unique int do_stmt: @stmt_end_test_while ref,
+    int body_id: @stmt ref
+);
+
+switch_initialization(
+    unique int switch_stmt: @stmt_switch ref,
+    int init_id: @stmt ref
+);
+
+#keyset[switch_stmt, index]
+switch_case(
+    int switch_stmt: @stmt_switch ref,
+    int index: int ref,
+    int case_id: @stmt_switch_case ref
+);
+
+switch_body(
+    unique int switch_stmt: @stmt_switch ref,
+    int body_id: @stmt ref
+);
+
+@stmt_for_or_range_based_for = @stmt_for
+                             | @stmt_range_based_for;
+
+for_initialization(
+    unique int for_stmt: @stmt_for_or_range_based_for ref,
+    int init_id: @stmt ref
+);
+
+for_condition(
+    unique int for_stmt: @stmt_for ref,
+    int condition_id: @expr ref
+);
+
+for_update(
+    unique int for_stmt: @stmt_for ref,
+    int update_id: @expr ref
+);
+
+for_body(
+    unique int for_stmt: @stmt_for ref,
+    int body_id: @stmt ref
+);
+
+@stmtparent = @stmt | @expr_stmt ;
+stmtparents(
+    unique int id: @stmt ref,
+    int index: int ref,
+    int parent: @stmtparent ref
+);
+
+ishandler(unique int block: @stmt_block ref);
+
+@cfgnode = @stmt | @expr | @function | @initialiser ;
+
+stmt_decl_bind(
+    int stmt: @stmt_decl ref,
+    int num: int ref,
+    int decl: @declaration ref
+);
+
+stmt_decl_entry_bind(
+    int stmt: @stmt_decl ref,
+    int num: int ref,
+    int decl_entry: @element ref
+);
+
+@parameterized_element = @function | @stmt_block | @requires_expr;
+
+blockscope(
+    unique int block: @stmt_block ref,
+    int enclosing: @parameterized_element ref
+);
+
+@jump = @stmt_goto | @stmt_break | @stmt_continue;
+
+@jumporlabel = @jump | @stmt_label | @literal;
+
+jumpinfo(
+    unique int id: @jumporlabel ref,
+    string str: string ref,
+    int target: @stmt ref
+);
+
+preprocdirects(
+    unique int id: @preprocdirect,
+    int kind: int ref,
+    int location: @location_default ref
+);
+case @preprocdirect.kind of
+   0 = @ppd_if
+|  1 = @ppd_ifdef
+|  2 = @ppd_ifndef
+|  3 = @ppd_elif
+|  4 = @ppd_else
+|  5 = @ppd_endif
+|  6 = @ppd_plain_include
+|  7 = @ppd_define
+|  8 = @ppd_undef
+|  9 = @ppd_line
+| 10 = @ppd_error
+| 11 = @ppd_pragma
+| 12 = @ppd_objc_import
+| 13 = @ppd_include_next
+| 14 = @ppd_ms_import
+| 15 = @ppd_elifdef
+| 16 = @ppd_elifndef
+| 18 = @ppd_warning
+;
+
+@ppd_include = @ppd_plain_include | @ppd_objc_import | @ppd_include_next | @ppd_ms_import;
+
+@ppd_branch = @ppd_if | @ppd_ifdef | @ppd_ifndef | @ppd_elif | @ppd_elifdef | @ppd_elifndef;
+
+preprocpair(
+    int begin : @ppd_branch ref,
+    int elseelifend : @preprocdirect ref
+);
+
+preproctrue(int branch : @ppd_branch ref);
+preprocfalse(int branch : @ppd_branch ref);
+
+preproctext(
+    unique int id: @preprocdirect ref,
+    string head: string ref,
+    string body: string ref
+);
+
+includes(
+    unique int id: @ppd_include ref,
+    int included: @file ref
+);
+
+link_targets(
+    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/3c45f8b9e71ec723bf50c40581e1f18f4f25e290/semmlecode.cpp.dbscheme b/cpp/downgrades/3c45f8b9e71ec723bf50c40581e1f18f4f25e290/semmlecode.cpp.dbscheme
new file mode 100644
index 00000000000..af887e83a81
--- /dev/null
+++ b/cpp/downgrades/3c45f8b9e71ec723bf50c40581e1f18f4f25e290/semmlecode.cpp.dbscheme
@@ -0,0 +1,2492 @@
+
+/**
+ * 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
+);
+
+/**
+ * Optionally, record the build mode for each compilation.
+ */
+compilation_build_mode(
+    unique int id : @compilation ref,
+    int mode : int ref
+);
+
+/*
+case @compilation_build_mode.mode of
+  0 = @build_mode_none
+| 1 = @build_mode_manual
+| 2 = @build_mode_auto
+;
+*/
+
+/**
+ * The source files that are compiled by a compiler invocation.
+ * If `id` is for the compiler invocation
+ *
+ *   gcc -c f1.c f2.c f3.c
+ *
+ * then there will be rows for
+ *
+ * num | arg
+ * --- | ---
+ * 0   | f1.c
+ * 1   | f2.c
+ * 2   | f3.c
+ *
+ * Note that even if those files `#include` headers, those headers
+ * do not appear as rows.
+ */
+#keyset[id, num]
+compilation_compiling_files(
+    int id : @compilation ref,
+    int num : int ref,
+    int file : @file ref
+);
+
+/**
+ * The time taken by the extractor for a compiler invocation.
+ *
+ * For each file `num`, there will be rows for
+ *
+ * kind | seconds
+ * ---- | ---
+ * 1    | CPU seconds used by the extractor frontend
+ * 2    | Elapsed seconds during the extractor frontend
+ * 3    | CPU seconds used by the extractor backend
+ * 4    | Elapsed seconds during the extractor backend
+ */
+#keyset[id, num, kind]
+compilation_time(
+    int id : @compilation ref,
+    int num : int ref,
+    /* kind:
+       1 = frontend_cpu_seconds
+       2 = frontend_elapsed_seconds
+       3 = extractor_cpu_seconds
+       4 = extractor_elapsed_seconds
+    */
+    int kind : int ref,
+    float seconds : float ref
+);
+
+/**
+ * An error or warning generated by the extractor.
+ * The diagnostic message `diagnostic` was generated during compiler
+ * invocation `compilation`, and is the `file_number_diagnostic_number`th
+ * message generated while extracting the `file_number`th file of that
+ * invocation.
+ */
+#keyset[compilation, file_number, file_number_diagnostic_number]
+diagnostic_for(
+    int diagnostic : @diagnostic ref,
+    int compilation : @compilation ref,
+    int file_number : int ref,
+    int file_number_diagnostic_number : int ref
+);
+
+/**
+ * If extraction was successful, then `cpu_seconds` and
+ * `elapsed_seconds` are the CPU time and elapsed time (respectively)
+ * that extraction took for compiler invocation `id`.
+ */
+compilation_finished(
+    unique int id : @compilation ref,
+    float cpu_seconds : float ref,
+    float elapsed_seconds : float ref
+);
+
+
+/**
+ * External data, 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
+ */
+
+extractor_version(
+    string codeql_version: string ref,
+    string frontend_version: string ref
+)
+
+@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
+| 7 = @user_defined_literal
+| 8 = @deduction_guide
+;
+*/
+
+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
+);
+
+/*
+case @coroutine_placeholder_variable.kind of
+  1 = @handle
+| 2 = @promise
+| 3 = @init_await_resume
+;
+*/
+
+coroutine_placeholder_variable(
+  unique int placeholder_variable: @variable ref,
+  int kind: int ref,
+  int function: @function ref
+)
+
+/** The `new` function used for allocating the coroutine state, if any. */
+coroutine_new(
+  unique int function: @function ref,
+  int new: @function ref
+);
+
+/** The `delete` function used for deallocating the coroutine state, if any. */
+coroutine_delete(
+  unique int function: @function ref,
+  int delete: @function ref
+);
+
+purefunctions(unique int id: @function ref);
+
+function_deleted(unique int id: @function ref);
+
+function_defaulted(unique int id: @function ref);
+
+function_prototyped(unique int id: @function ref)
+
+deduction_guide_for_class(
+    int id: @function ref,
+    int class_template: @usertype ref
+)
+
+member_function_this_type(
+    unique int id: @function ref,
+    int this_type: @type ref
+);
+
+#keyset[id, type_id]
+fun_decls(
+    int id: @fun_decl,
+    int function: @function ref,
+    int type_id: @type ref,
+    string name: string ref,
+    int location: @location_default ref
+);
+fun_def(unique int id: @fun_decl ref);
+fun_specialized(unique int id: @fun_decl ref);
+fun_implicit(unique int id: @fun_decl ref);
+fun_decl_specifiers(
+    int id: @fun_decl ref,
+    string name: string ref
+)
+#keyset[fun_decl, index]
+fun_decl_throws(
+    int fun_decl: @fun_decl ref,
+    int index: int ref,
+    int type_id: @type ref
+);
+/* an empty throw specification is different from none */
+fun_decl_empty_throws(unique int fun_decl: @fun_decl ref);
+fun_decl_noexcept(
+    int fun_decl: @fun_decl ref,
+    int constant: @expr ref
+);
+fun_decl_empty_noexcept(int fun_decl: @fun_decl ref);
+fun_decl_typedef_type(
+    unique int fun_decl: @fun_decl ref,
+    int typedeftype_id: @usertype ref
+);
+
+/*
+case @fun_requires.kind of
+  1 = @template_attached
+| 2 = @function_attached
+;
+*/
+
+fun_requires(
+    int id: @fun_decl ref,
+    int kind: int ref,
+    int constraint: @expr ref
+);
+
+param_decl_bind(
+    unique int id: @var_decl ref,
+    int index: int ref,
+    int fun_decl: @fun_decl ref
+);
+
+#keyset[id, type_id]
+var_decls(
+    int id: @var_decl,
+    int variable: @variable ref,
+    int type_id: @type ref,
+    string name: string ref,
+    int location: @location_default ref
+);
+var_def(unique int id: @var_decl ref);
+var_specialized(int id: @var_decl ref);
+var_decl_specifiers(
+    int id: @var_decl ref,
+    string name: string ref
+)
+is_structured_binding(unique int id: @variable ref);
+var_requires(
+    int id: @var_decl ref,
+    int constraint: @expr ref
+);
+
+type_decls(
+    unique int id: @type_decl,
+    int type_id: @type ref,
+    int location: @location_default ref
+);
+type_def(unique int id: @type_decl ref);
+type_decl_top(
+    unique int type_decl: @type_decl ref
+);
+type_requires(
+    int id: @type_decl ref,
+    int constraint: @expr ref
+);
+
+namespace_decls(
+    unique int id: @namespace_decl,
+    int namespace_id: @namespace ref,
+    int location: @location_default ref,
+    int bodylocation: @location_default ref
+);
+
+case @using.kind of
+  1 = @using_declaration
+| 2 = @using_directive
+| 3 = @using_enum_declaration
+;
+
+usings(
+    unique int id: @using,
+    int element_id: @element ref,
+    int location: @location_default ref,
+    int kind: int ref
+);
+
+/** The element which contains the `using` declaration. */
+using_container(
+    int parent: @element ref,
+    int child: @using ref
+);
+
+static_asserts(
+    unique int id: @static_assert,
+    int condition : @expr ref,
+    string message : string ref,
+    int location: @location_default ref,
+    int enclosing : @element ref
+);
+
+// each function has an ordered list of parameters
+#keyset[id, type_id]
+#keyset[function, index, type_id]
+params(
+    int id: @parameter,
+    int function: @parameterized_element ref,
+    int index: int ref,
+    int type_id: @type ref
+);
+
+overrides(
+    int new: @function ref,
+    int old: @function ref
+);
+
+#keyset[id, type_id]
+membervariables(
+    int id: @membervariable,
+    int type_id: @type ref,
+    string name: string ref
+);
+
+#keyset[id, type_id]
+globalvariables(
+    int id: @globalvariable,
+    int type_id: @type ref,
+    string name: string ref
+);
+
+#keyset[id, type_id]
+localvariables(
+    int id: @localvariable,
+    int type_id: @type ref,
+    string name: string ref
+);
+
+autoderivation(
+    unique int var: @variable ref,
+    int derivation_type: @type ref
+);
+
+orphaned_variables(
+    int var: @localvariable ref,
+    int function: @function ref
+)
+
+enumconstants(
+    unique int id: @enumconstant,
+    int parent: @usertype ref,
+    int index: int ref,
+    int type_id: @type ref,
+    string name: string ref,
+    int location: @location_default ref
+);
+
+@variable = @localscopevariable | @globalvariable | @membervariable;
+
+@localscopevariable = @localvariable | @parameter;
+
+/**
+ * Built-in types are the fundamental types, e.g., integral, floating, and void.
+ */
+case @builtintype.kind of
+   1 = @errortype
+|  2 = @unknowntype
+|  3 = @void
+|  4 = @boolean
+|  5 = @char
+|  6 = @unsigned_char
+|  7 = @signed_char
+|  8 = @short
+|  9 = @unsigned_short
+| 10 = @signed_short
+| 11 = @int
+| 12 = @unsigned_int
+| 13 = @signed_int
+| 14 = @long
+| 15 = @unsigned_long
+| 16 = @signed_long
+| 17 = @long_long
+| 18 = @unsigned_long_long
+| 19 = @signed_long_long
+// ... 20 Microsoft-specific __int8
+// ... 21 Microsoft-specific __int16
+// ... 22 Microsoft-specific __int32
+// ... 23 Microsoft-specific __int64
+| 24 = @float
+| 25 = @double
+| 26 = @long_double
+| 27 = @complex_float         // C99-specific _Complex float
+| 28 = @complex_double        // C99-specific _Complex double
+| 29 = @complex_long_double   // C99-specific _Complex long double
+| 30 = @imaginary_float       // C99-specific _Imaginary float
+| 31 = @imaginary_double      // C99-specific _Imaginary double
+| 32 = @imaginary_long_double // C99-specific _Imaginary long double
+| 33 = @wchar_t               // Microsoft-specific
+| 34 = @decltype_nullptr      // C++11
+| 35 = @int128                // __int128
+| 36 = @unsigned_int128       // unsigned __int128
+| 37 = @signed_int128         // signed __int128
+| 38 = @float128              // __float128
+| 39 = @complex_float128      // _Complex __float128
+| 40 = @decimal32             // _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
+| 62 = @mfp8                  // __mfp8
+;
+
+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 or C23 `typeof`/`typeof_unqual`
+ * operator taking an expression as its argument.  For example:
+ * ```
+ * int a;
+ * decltype(1+a) b;
+ * typeof(1+a) c;
+ * ```
+ * Here `expr` is `1+a`.
+ *
+ * Sometimes an additional pair of parentheses around the expression
+ * changes the semantics of the decltype, e.g.
+ * ```
+ * struct A { double x; };
+ * const A* a = new A();
+ * decltype( a->x ); // type is double
+ * decltype((a->x)); // type is const double&
+ * ```
+ * (Please consult the C++11 standard for more details).
+ * `parentheses_would_change_meaning` is `true` iff that is the case.
+ */
+
+/*
+case @decltype.kind of
+|  0 = @decltype
+|  1 = @typeof // The frontend does not differentiate between typeof and typeof_unqual
+;
+*/
+
+#keyset[id, expr]
+decltypes(
+    int id: @decltype,
+    int expr: @expr ref,
+    int kind: int ref,
+    int base_type: @type ref,
+    boolean parentheses_would_change_meaning: boolean ref
+);
+
+/*
+case @type_operator.kind of
+|  0 = @typeof // The frontend does not differentiate between typeof and typeof_unqual
+|  1 = @underlying_type
+|  2 = @bases
+|  3 = @direct_bases
+|  4 = @add_lvalue_reference
+|  5 = @add_pointer
+|  6 = @add_rvalue_reference
+|  7 = @decay
+|  8 = @make_signed
+|  9 = @make_unsigned
+| 10 = @remove_all_extents
+| 11 = @remove_const
+| 12 = @remove_cv
+| 13 = @remove_cvref
+| 14 = @remove_extent
+| 15 = @remove_pointer
+| 16 = @remove_reference_t
+| 17 = @remove_restrict
+| 18 = @remove_volatile
+| 19 = @remove_reference
+;
+*/
+
+type_operators(
+    unique int id: @type_operator,
+    int arg_type: @type ref,
+    int kind: int ref,
+    int base_type: @type ref
+)
+
+/*
+case @usertype.kind of
+|  0 = @unknown_usertype
+|  1 = @struct
+|  2 = @class
+|  3 = @union
+|  4 = @enum
+// ... 5 = @typedef deprecated        // classic C: typedef typedef type name
+// ... 6 = @template deprecated
+|  7 = @template_parameter
+|  8 = @template_template_parameter
+|  9 = @proxy_class                   // a proxy class associated with a template parameter
+// ... 10 objc_class deprecated
+// ... 11 objc_protocol deprecated
+// ... 12 objc_category deprecated
+| 13 = @scoped_enum
+// ... 14 = @using_alias deprecated   // a using name = type style typedef
+| 15 = @template_struct
+| 16 = @template_class
+| 17 = @template_union
+| 18 = @alias
+;
+*/
+
+usertypes(
+    unique int id: @usertype,
+    string name: string ref,
+    int kind: int ref
+);
+
+usertypesize(
+    unique int id: @usertype ref,
+    int size: int ref,
+    int alignment: int ref
+);
+
+usertype_final(unique int id: @usertype ref);
+
+usertype_uuid(
+    unique int id: @usertype ref,
+    string uuid: string ref
+);
+
+/*
+case @usertype.alias_kind of
+| 0 = @typedef
+| 1 = @alias
+*/
+
+usertype_alias_kind(
+    int id: @usertype ref,
+    int alias_kind: int ref
+)
+
+nontype_template_parameters(
+    int id: @expr ref
+);
+
+type_template_type_constraint(
+    int id: @usertype ref,
+    int constraint: @expr ref
+);
+
+mangled_name(
+    unique int id: @declaration ref,
+    int mangled_name : @mangledname,
+    boolean is_complete: boolean ref
+);
+
+is_pod_class(unique int id: @usertype ref);
+is_standard_layout_class(unique int id: @usertype ref);
+
+is_complete(unique int id: @usertype ref);
+
+is_class_template(unique int id: @usertype ref);
+class_instantiation(
+    int to: @usertype ref,
+    int from: @usertype ref
+);
+class_template_argument(
+    int type_id: @usertype ref,
+    int index: int ref,
+    int arg_type: @type ref
+);
+class_template_argument_value(
+    int type_id: @usertype ref,
+    int index: int ref,
+    int arg_value: @expr ref
+);
+
+@user_or_decltype = @usertype | @decltype;
+
+is_proxy_class_for(
+    unique int id: @usertype ref,
+    int templ_param_id: @user_or_decltype ref
+);
+
+type_mentions(
+    unique int id: @type_mention,
+    int type_id: @type ref,
+    int location: @location 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
+);
+
+template_template_instantiation(
+    int to: @usertype ref,
+    int from: @usertype ref
+);
+template_template_argument(
+    int type_id: @usertype ref,
+    int index: int ref,
+    int arg_type: @type ref
+);
+template_template_argument_value(
+    int type_id: @usertype ref,
+    int index: int ref,
+    int arg_value: @expr ref
+);
+
+@concept = @concept_template | @concept_id;
+
+concept_templates(
+    unique int concept_id: @concept_template,
+    string name: string ref,
+    int location: @location_default ref
+);
+concept_instantiation(
+    unique int to: @concept_id ref,
+    int from: @concept_template ref
+);
+is_type_constraint(int concept_id: @concept_id ref);
+concept_template_argument(
+    int concept_id: @concept ref,
+    int index: int ref,
+    int arg_type: @type ref
+);
+concept_template_argument_value(
+    int concept_id: @concept ref,
+    int index: int ref,
+    int arg_value: @expr ref
+);
+
+routinetypes(
+    unique int id: @routinetype,
+    int return_type: @type ref
+);
+
+routinetypeargs(
+    int routine: @routinetype ref,
+    int index: int ref,
+    int type_id: @type ref
+);
+
+ptrtomembers(
+    unique int id: @ptrtomember,
+    int type_id: @type ref,
+    int class_id: @type ref
+);
+
+/*
+ specifiers for types, functions, and variables
+
+    "public",
+    "protected",
+    "private",
+
+    "const",
+    "volatile",
+    "static",
+
+    "pure",
+    "virtual",
+    "sealed", // Microsoft
+    "__interface", // Microsoft
+    "inline",
+    "explicit",
+
+    "near", // near far extension
+    "far", // near far extension
+    "__ptr32", // Microsoft
+    "__ptr64", // Microsoft
+    "__sptr", // Microsoft
+    "__uptr", // Microsoft
+    "dllimport", // Microsoft
+    "dllexport", // Microsoft
+    "thread", // Microsoft
+    "naked", // Microsoft
+    "microsoft_inline", // Microsoft
+    "forceinline", // Microsoft
+    "selectany", // Microsoft
+    "nothrow", // Microsoft
+    "novtable", // Microsoft
+    "noreturn", // Microsoft
+    "noinline", // Microsoft
+    "noalias", // Microsoft
+    "restrict", // Microsoft
+*/
+
+specifiers(
+    unique int id: @specifier,
+    unique string str: string ref
+);
+
+typespecifiers(
+    int type_id: @type ref,
+    int spec_id: @specifier ref
+);
+
+funspecifiers(
+    int func_id: @function ref,
+    int spec_id: @specifier ref
+);
+
+varspecifiers(
+    int var_id: @accessible ref,
+    int spec_id: @specifier ref
+);
+
+explicit_specifier_exprs(
+    unique int func_id: @function ref,
+    int constant: @expr ref
+)
+
+attributes(
+    unique int id: @attribute,
+    int kind: int ref,
+    string name: string ref,
+    string name_space: string ref,
+    int location: @location_default ref
+);
+
+case @attribute.kind of
+  0 = @gnuattribute
+| 1 = @stdattribute
+| 2 = @declspec
+| 3 = @msattribute
+| 4 = @alignas
+// ... 5 @objc_propertyattribute deprecated
+;
+
+attribute_args(
+    unique int id: @attribute_arg,
+    int kind: int ref,
+    int attribute: @attribute ref,
+    int index: int ref,
+    int location: @location_default ref
+);
+
+case @attribute_arg.kind of
+  0 = @attribute_arg_empty
+| 1 = @attribute_arg_token
+| 2 = @attribute_arg_constant
+| 3 = @attribute_arg_type
+| 4 = @attribute_arg_constant_expr
+| 5 = @attribute_arg_expr
+;
+
+attribute_arg_value(
+    unique int arg: @attribute_arg ref,
+    string value: string ref
+);
+attribute_arg_type(
+    unique int arg: @attribute_arg ref,
+    int type_id: @type ref
+);
+attribute_arg_constant(
+    unique int arg: @attribute_arg ref,
+    int constant: @expr ref
+)
+attribute_arg_expr(
+    unique int arg: @attribute_arg ref,
+    int expr: @expr ref
+)
+attribute_arg_name(
+    unique int arg: @attribute_arg ref,
+    string name: string ref
+);
+
+typeattributes(
+    int type_id: @type ref,
+    int spec_id: @attribute ref
+);
+
+funcattributes(
+    int func_id: @function ref,
+    int spec_id: @attribute ref
+);
+
+varattributes(
+    int var_id: @accessible ref,
+    int spec_id: @attribute ref
+);
+
+stmtattributes(
+    int stmt_id: @stmt ref,
+    int spec_id: @attribute ref
+);
+
+@type = @builtintype
+      | @derivedtype
+      | @usertype
+      | @routinetype
+      | @ptrtomember
+      | @decltype
+      | @type_operator;
+
+unspecifiedtype(
+    unique int type_id: @type ref,
+    int unspecified_type_id: @type ref
+);
+
+member(
+    int parent: @type ref,
+    int index: int ref,
+    int child: @member ref
+);
+
+@enclosingfunction_child = @usertype | @variable | @namespace
+
+enclosingfunction(
+    unique int child: @enclosingfunction_child ref,
+    int parent: @function ref
+);
+
+derivations(
+    unique int derivation: @derivation,
+    int sub: @type ref,
+    int index: int ref,
+    int super: @type ref,
+    int location: @location_default ref
+);
+
+derspecifiers(
+    int der_id: @derivation ref,
+    int spec_id: @specifier ref
+);
+
+/**
+ * Contains the byte offset of the base class subobject within the derived
+ * class. Only holds for non-virtual base classes, but see table
+ * `virtual_base_offsets` for offsets of virtual base class subobjects.
+ */
+direct_base_offsets(
+    unique int der_id: @derivation ref,
+    int offset: int ref
+);
+
+/**
+ * Contains the byte offset of the virtual base class subobject for class
+ * `super` within a most-derived object of class `sub`. `super` can be either a
+ * direct or indirect base class.
+ */
+#keyset[sub, super]
+virtual_base_offsets(
+    int sub: @usertype ref,
+    int super: @usertype ref,
+    int offset: int ref
+);
+
+frienddecls(
+    unique int id: @frienddecl,
+    int type_id: @type ref,
+    int decl_id: @declaration ref,
+    int location: @location_default ref
+);
+
+@declaredtype = @usertype ;
+
+@declaration = @function
+             | @declaredtype
+             | @variable
+             | @enumconstant
+             | @frienddecl
+             | @concept_template;
+
+@member = @membervariable
+        | @function
+        | @declaredtype
+        | @enumconstant;
+
+@locatable = @diagnostic
+           | @declaration
+           | @ppd_include
+           | @ppd_define
+           | @macroinvocation
+           /*| @funcall*/
+           | @xmllocatable
+           | @attribute
+           | @attribute_arg;
+
+@namedscope = @namespace | @usertype;
+
+@element = @locatable
+         | @file
+         | @folder
+         | @specifier
+         | @type
+         | @expr
+         | @namespace
+         | @initialiser
+         | @stmt
+         | @derivation
+         | @comment
+         | @preprocdirect
+         | @fun_decl
+         | @var_decl
+         | @type_decl
+         | @namespace_decl
+         | @using
+         | @namequalifier
+         | @specialnamequalifyingelement
+         | @static_assert
+         | @type_mention
+         | @lambdacapture;
+
+@exprparent = @element;
+
+comments(
+    unique int id: @comment,
+    string contents: string ref,
+    int location: @location_default ref
+);
+
+commentbinding(
+    int id: @comment ref,
+    int element: @element ref
+);
+
+exprconv(
+    int converted: @expr ref,
+    unique int conversion: @expr ref
+);
+
+compgenerated(unique int id: @element ref);
+
+/**
+ * `destructor_call` destructs the `i`'th entity that should be
+ * destructed following `element`. Note that entities should be
+ * destructed in reverse construction order, so for a given `element`
+ * these should be called from highest to lowest `i`.
+ */
+#keyset[element, destructor_call]
+#keyset[element, i]
+synthetic_destructor_call(
+    int element: @element ref,
+    int i: int ref,
+    int destructor_call: @routineexpr ref
+);
+
+namespaces(
+    unique int id: @namespace,
+    string name: string ref
+);
+
+namespace_inline(
+    unique int id: @namespace ref
+);
+
+namespacembrs(
+    int parentid: @namespace ref,
+    unique int memberid: @namespacembr ref
+);
+
+@namespacembr = @declaration | @namespace;
+
+exprparents(
+    int expr_id: @expr ref,
+    int child_index: int ref,
+    int parent_id: @exprparent ref
+);
+
+expr_isload(unique int expr_id: @expr ref);
+
+@cast = @c_style_cast
+      | @const_cast
+      | @dynamic_cast
+      | @reinterpret_cast
+      | @static_cast
+      ;
+
+/*
+case @conversion.kind of
+  0 = @simple_conversion           // a numeric conversion, qualification conversion, or a reinterpret_cast
+| 1 = @bool_conversion             // conversion to 'bool'
+| 2 = @base_class_conversion       // a derived-to-base conversion
+| 3 = @derived_class_conversion    // a base-to-derived conversion
+| 4 = @pm_base_class_conversion    // a derived-to-base conversion of a pointer to member
+| 5 = @pm_derived_class_conversion // a base-to-derived conversion of a pointer to member
+| 6 = @glvalue_adjust              // an adjustment of the type of a glvalue
+| 7 = @prvalue_adjust              // an adjustment of the type of a prvalue
+;
+*/
+/**
+ * Describes the semantics represented by a cast expression. This is largely
+ * independent of the source syntax of the cast, so it is separate from the
+ * regular expression kind.
+ */
+conversionkinds(
+    unique int expr_id: @cast ref,
+    int kind: int ref
+);
+
+@conversion = @cast
+            | @array_to_pointer
+            | @parexpr
+            | @reference_to
+            | @ref_indirect
+            | @temp_init
+            | @c11_generic
+            ;
+
+/*
+case @funbindexpr.kind of
+  0 = @normal_call  // a normal call
+| 1 = @virtual_call // a virtual call
+| 2 = @adl_call     // a call whose target is only found by ADL
+;
+*/
+iscall(
+    unique int caller: @funbindexpr ref,
+    int kind: int ref
+);
+
+numtemplatearguments(
+    unique int expr_id: @expr ref,
+    int num: int ref
+);
+
+specialnamequalifyingelements(
+    unique int id: @specialnamequalifyingelement,
+    unique string name: string ref
+);
+
+@namequalifiableelement = @expr | @namequalifier;
+@namequalifyingelement = @namespace
+                       | @specialnamequalifyingelement
+                       | @usertype;
+
+namequalifiers(
+    unique int id: @namequalifier,
+    unique int qualifiableelement: @namequalifiableelement ref,
+    int qualifyingelement: @namequalifyingelement ref,
+    int location: @location_default ref
+);
+
+varbind(
+    int expr: @varbindexpr ref,
+    int var: @accessible ref
+);
+
+funbind(
+    int expr: @funbindexpr ref,
+    int fun: @function ref
+);
+
+@any_new_expr = @new_expr
+              | @new_array_expr;
+
+@new_or_delete_expr = @any_new_expr
+                    | @delete_expr
+                    | @delete_array_expr;
+
+@prefix_crement_expr = @preincrexpr | @predecrexpr;
+
+@postfix_crement_expr = @postincrexpr | @postdecrexpr;
+
+@increment_expr = @preincrexpr | @postincrexpr;
+
+@decrement_expr = @predecrexpr | @postdecrexpr;
+
+@crement_expr = @increment_expr | @decrement_expr;
+
+@un_arith_op_expr = @arithnegexpr
+                  | @unaryplusexpr
+                  | @conjugation
+                  | @realpartexpr
+                  | @imagpartexpr
+                  | @crement_expr
+                  ;
+
+@un_bitwise_op_expr = @complementexpr;
+
+@un_log_op_expr = @notexpr;
+
+@un_op_expr = @address_of
+            | @indirect
+            | @un_arith_op_expr
+            | @un_bitwise_op_expr
+            | @builtinaddressof
+            | @vec_fill
+            | @un_log_op_expr
+            | @co_await
+            | @co_yield
+            ;
+
+@bin_log_op_expr = @andlogicalexpr | @orlogicalexpr;
+
+@cmp_op_expr = @eq_op_expr | @rel_op_expr;
+
+@eq_op_expr = @eqexpr | @neexpr;
+
+@rel_op_expr = @gtexpr
+             | @ltexpr
+             | @geexpr
+             | @leexpr
+             | @spaceshipexpr
+             ;
+
+@bin_bitwise_op_expr = @lshiftexpr
+                     | @rshiftexpr
+                     | @andexpr
+                     | @orexpr
+                     | @xorexpr
+                     ;
+
+@p_arith_op_expr = @paddexpr
+                 | @psubexpr
+                 | @pdiffexpr
+                 ;
+
+@bin_arith_op_expr = @addexpr
+                   | @subexpr
+                   | @mulexpr
+                   | @divexpr
+                   | @remexpr
+                   | @jmulexpr
+                   | @jdivexpr
+                   | @fjaddexpr
+                   | @jfaddexpr
+                   | @fjsubexpr
+                   | @jfsubexpr
+                   | @minexpr
+                   | @maxexpr
+                   | @p_arith_op_expr
+                   ;
+
+@bin_op_expr = @bin_arith_op_expr
+             | @bin_bitwise_op_expr
+             | @cmp_op_expr
+             | @bin_log_op_expr
+             ;
+
+@op_expr = @un_op_expr
+         | @bin_op_expr
+         | @assign_expr
+         | @conditionalexpr
+         ;
+
+@assign_arith_expr = @assignaddexpr
+                   | @assignsubexpr
+                   | @assignmulexpr
+                   | @assigndivexpr
+                   | @assignremexpr
+                   ;
+
+@assign_bitwise_expr = @assignandexpr
+                     | @assignorexpr
+                     | @assignxorexpr
+                     | @assignlshiftexpr
+                     | @assignrshiftexpr
+                     ;
+
+@assign_pointer_expr = @assignpaddexpr
+                     | @assignpsubexpr
+                     ;
+
+@assign_op_expr = @assign_arith_expr
+                | @assign_bitwise_expr
+                | @assign_pointer_expr
+                ;
+
+@assign_expr = @assignexpr | @assign_op_expr | @blockassignexpr
+
+/*
+  Binary encoding of the allocator form.
+
+  case @allocator.form of
+    0 = plain
+  | 1 = alignment
+  ;
+*/
+
+/**
+ * The allocator function associated with a `new` or `new[]` expression.
+ * The `form` column specified whether the allocation call contains an alignment
+ * argument.
+ */
+expr_allocator(
+    unique int expr: @any_new_expr ref,
+    int func: @function ref,
+    int form: int ref
+);
+
+/*
+  Binary encoding of the deallocator form.
+
+  case @deallocator.form of
+    0 = plain
+  | 1 = size
+  | 2 = alignment
+  | 4 = destroying_delete
+  ;
+*/
+
+/**
+ * The deallocator function associated with a `delete`, `delete[]`, `new`, or
+ * `new[]` expression. For a `new` or `new[]` expression, the deallocator is the
+ * one used to free memory if the initialization throws an exception.
+ * The `form` column specifies whether the deallocation call contains a size
+ * argument, and alignment argument, or both.
+ */
+expr_deallocator(
+    unique int expr: @new_or_delete_expr ref,
+    int func: @function ref,
+    int form: int ref
+);
+
+/**
+ * Holds if the `@conditionalexpr` is of the two operand form
+ * `guard ? : false`.
+ */
+expr_cond_two_operand(
+    unique int cond: @conditionalexpr ref
+);
+
+/**
+ * The guard of `@conditionalexpr` `guard ? true : false`
+ */
+expr_cond_guard(
+    unique int cond: @conditionalexpr ref,
+    int guard: @expr ref
+);
+
+/**
+ * The expression used when the guard of `@conditionalexpr`
+ * `guard ? true : false` holds. For the two operand form
+ * `guard ?: false` consider using `expr_cond_guard` instead.
+ */
+expr_cond_true(
+    unique int cond: @conditionalexpr ref,
+    int true: @expr ref
+);
+
+/**
+ * The expression used when the guard of `@conditionalexpr`
+ * `guard ? true : false` does not hold.
+ */
+expr_cond_false(
+    unique int cond: @conditionalexpr ref,
+    int false: @expr ref
+);
+
+/** A string representation of the value. */
+values(
+    unique int id: @value,
+    string str: string ref
+);
+
+/** The actual text in the source code for the value, if any. */
+valuetext(
+    unique int id: @value ref,
+    string text: string ref
+);
+
+valuebind(
+    int val: @value ref,
+    unique int expr: @expr ref
+);
+
+fieldoffsets(
+    unique int id: @variable ref,
+    int byteoffset: int ref,
+    int bitoffset: int ref
+);
+
+bitfield(
+    unique int id: @variable ref,
+    int bits: int ref,
+    int declared_bits: int ref
+);
+
+/* TODO
+memberprefix(
+    int member: @expr ref,
+    int prefix: @expr ref
+);
+*/
+
+/*
+   kind(1) = mbrcallexpr
+   kind(2) = mbrptrcallexpr
+   kind(3) = mbrptrmbrcallexpr
+   kind(4) = ptrmbrptrmbrcallexpr
+   kind(5) = mbrreadexpr // x.y
+   kind(6) = mbrptrreadexpr // p->y
+   kind(7) = mbrptrmbrreadexpr // x.*pm
+   kind(8) = mbrptrmbrptrreadexpr // x->*pm
+   kind(9) = staticmbrreadexpr // static x.y
+   kind(10) = staticmbrptrreadexpr // static p->y
+*/
+/* TODO
+memberaccess(
+    int member: @expr ref,
+    int kind: int ref
+);
+*/
+
+initialisers(
+    unique int init: @initialiser,
+    int var: @accessible ref,
+    unique int expr: @expr ref,
+    int location: @location_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
+);
+
+expr_reuse(
+    int reuse: @expr ref,
+    int original: @expr ref,
+    int value_category: int ref
+)
+
+/*
+  case @value.category of
+    1 = prval
+  | 2 = xval
+  | 3 = lval
+  ;
+*/
+expr_types(
+    int id: @expr ref,
+    int typeid: @type ref,
+    int value_category: int ref
+);
+
+case @expr.kind of
+    1 = @errorexpr
+|   2 = @address_of // & AddressOfExpr
+|   3 = @reference_to // ReferenceToExpr (implicit?)
+|   4 = @indirect // * PointerDereferenceExpr
+|   5 = @ref_indirect // ReferenceDereferenceExpr (implicit?)
+// ...
+|   8 = @array_to_pointer // (???)
+|   9 = @vacuous_destructor_call // VacuousDestructorCall
+// ...
+|  11 = @assume // Microsoft
+|  12 = @parexpr
+|  13 = @arithnegexpr
+|  14 = @unaryplusexpr
+|  15 = @complementexpr
+|  16 = @notexpr
+|  17 = @conjugation // GNU ~ operator
+|  18 = @realpartexpr // GNU __real
+|  19 = @imagpartexpr // GNU __imag
+|  20 = @postincrexpr
+|  21 = @postdecrexpr
+|  22 = @preincrexpr
+|  23 = @predecrexpr
+|  24 = @conditionalexpr
+|  25 = @addexpr
+|  26 = @subexpr
+|  27 = @mulexpr
+|  28 = @divexpr
+|  29 = @remexpr
+|  30 = @jmulexpr // C99 mul imaginary
+|  31 = @jdivexpr // C99 div imaginary
+|  32 = @fjaddexpr // C99 add real + imaginary
+|  33 = @jfaddexpr // C99 add imaginary + real
+|  34 = @fjsubexpr // C99 sub real - imaginary
+|  35 = @jfsubexpr // C99 sub imaginary - real
+|  36 = @paddexpr // pointer add (pointer + int or int + pointer)
+|  37 = @psubexpr // pointer sub (pointer - integer)
+|  38 = @pdiffexpr // difference between two pointers
+|  39 = @lshiftexpr
+|  40 = @rshiftexpr
+|  41 = @andexpr
+|  42 = @orexpr
+|  43 = @xorexpr
+|  44 = @eqexpr
+|  45 = @neexpr
+|  46 = @gtexpr
+|  47 = @ltexpr
+|  48 = @geexpr
+|  49 = @leexpr
+|  50 = @minexpr // GNU minimum
+|  51 = @maxexpr // GNU maximum
+|  52 = @assignexpr
+|  53 = @assignaddexpr
+|  54 = @assignsubexpr
+|  55 = @assignmulexpr
+|  56 = @assigndivexpr
+|  57 = @assignremexpr
+|  58 = @assignlshiftexpr
+|  59 = @assignrshiftexpr
+|  60 = @assignandexpr
+|  61 = @assignorexpr
+|  62 = @assignxorexpr
+|  63 = @assignpaddexpr // assign pointer add
+|  64 = @assignpsubexpr // assign pointer sub
+|  65 = @andlogicalexpr
+|  66 = @orlogicalexpr
+|  67 = @commaexpr
+|  68 = @subscriptexpr // access to member of an array, e.g., a[5]
+// ...  69 @objc_subscriptexpr deprecated
+// ...  70 @cmdaccess deprecated
+// ...
+|  73 = @virtfunptrexpr
+|  74 = @callexpr
+// ...  75 @msgexpr_normal deprecated
+// ...  76 @msgexpr_super deprecated
+// ...  77 @atselectorexpr deprecated
+// ...  78 @atprotocolexpr deprecated
+|  79 = @vastartexpr
+|  80 = @vaargexpr
+|  81 = @vaendexpr
+|  82 = @vacopyexpr
+// ...  83 @atencodeexpr deprecated
+|  84 = @varaccess
+|  85 = @thisaccess
+// ...  86 @objc_box_expr deprecated
+|  87 = @new_expr
+|  88 = @delete_expr
+|  89 = @throw_expr
+|  90 = @condition_decl // a variable declared in a condition, e.g., if(int x = y > 2)
+|  91 = @braced_init_list
+|  92 = @type_id
+|  93 = @runtime_sizeof
+|  94 = @runtime_alignof
+|  95 = @sizeof_pack
+|  96 = @expr_stmt // GNU extension
+|  97 = @routineexpr
+|  98 = @type_operand // used to access a type in certain contexts (haven't found any examples yet....)
+|  99 = @offsetofexpr // offsetof ::= type and field
+| 100 = @hasassignexpr // __has_assign ::= type
+| 101 = @hascopyexpr // __has_copy ::= type
+| 102 = @hasnothrowassign // __has_nothrow_assign ::= type
+| 103 = @hasnothrowconstr // __has_nothrow_constructor ::= type
+| 104 = @hasnothrowcopy // __has_nothrow_copy ::= type
+| 105 = @hastrivialassign // __has_trivial_assign ::= type
+| 106 = @hastrivialconstr // __has_trivial_constructor ::= type
+| 107 = @hastrivialcopy // __has_trivial_copy ::= type
+| 108 = @hasuserdestr // __has_user_destructor ::= type
+| 109 = @hasvirtualdestr // __has_virtual_destructor ::= type
+| 110 = @isabstractexpr // __is_abstract ::= type
+| 111 = @isbaseofexpr // __is_base_of ::= type type
+| 112 = @isclassexpr // __is_class ::= type
+| 113 = @isconvtoexpr // __is_convertible_to ::= type type
+| 114 = @isemptyexpr // __is_empty ::= type
+| 115 = @isenumexpr // __is_enum ::= type
+| 116 = @ispodexpr // __is_pod ::= type
+| 117 = @ispolyexpr // __is_polymorphic ::= type
+| 118 = @isunionexpr // __is_union ::= type
+| 119 = @typescompexpr // GNU __builtin_types_compatible ::= type type
+| 120 = @intaddrexpr // frontend internal builtin, used to implement offsetof
+// ...
+| 122 = @hastrivialdestructor // __has_trivial_destructor ::= type
+| 123 = @literal
+| 124 = @uuidof
+| 127 = @aggregateliteral
+| 128 = @delete_array_expr
+| 129 = @new_array_expr
+// ... 130 @objc_array_literal deprecated
+// ... 131 @objc_dictionary_literal deprecated
+| 132 = @foldexpr
+// ...
+| 200 = @ctordirectinit
+| 201 = @ctorvirtualinit
+| 202 = @ctorfieldinit
+| 203 = @ctordelegatinginit
+| 204 = @dtordirectdestruct
+| 205 = @dtorvirtualdestruct
+| 206 = @dtorfielddestruct
+// ...
+| 210 = @static_cast
+| 211 = @reinterpret_cast
+| 212 = @const_cast
+| 213 = @dynamic_cast
+| 214 = @c_style_cast
+| 215 = @lambdaexpr
+| 216 = @param_ref
+| 217 = @noopexpr
+// ...
+| 294 = @istriviallyconstructibleexpr
+| 295 = @isdestructibleexpr
+| 296 = @isnothrowdestructibleexpr
+| 297 = @istriviallydestructibleexpr
+| 298 = @istriviallyassignableexpr
+| 299 = @isnothrowassignableexpr
+| 300 = @istrivialexpr
+| 301 = @isstandardlayoutexpr
+| 302 = @istriviallycopyableexpr
+| 303 = @isliteraltypeexpr
+| 304 = @hastrivialmoveconstructorexpr
+| 305 = @hastrivialmoveassignexpr
+| 306 = @hasnothrowmoveassignexpr
+| 307 = @isconstructibleexpr
+| 308 = @isnothrowconstructibleexpr
+| 309 = @hasfinalizerexpr
+| 310 = @isdelegateexpr
+| 311 = @isinterfaceclassexpr
+| 312 = @isrefarrayexpr
+| 313 = @isrefclassexpr
+| 314 = @issealedexpr
+| 315 = @issimplevalueclassexpr
+| 316 = @isvalueclassexpr
+| 317 = @isfinalexpr
+| 319 = @noexceptexpr
+| 320 = @builtinshufflevector
+| 321 = @builtinchooseexpr
+| 322 = @builtinaddressof
+| 323 = @vec_fill
+| 324 = @builtinconvertvector
+| 325 = @builtincomplex
+| 326 = @spaceshipexpr
+| 327 = @co_await
+| 328 = @co_yield
+| 329 = @temp_init
+| 330 = @isassignable
+| 331 = @isaggregate
+| 332 = @hasuniqueobjectrepresentations
+| 333 = @builtinbitcast
+| 334 = @builtinshuffle
+| 335 = @blockassignexpr
+| 336 = @issame
+| 337 = @isfunction
+| 338 = @islayoutcompatible
+| 339 = @ispointerinterconvertiblebaseof
+| 340 = @isarray
+| 341 = @arrayrank
+| 342 = @arrayextent
+| 343 = @isarithmetic
+| 344 = @iscompletetype
+| 345 = @iscompound
+| 346 = @isconst
+| 347 = @isfloatingpoint
+| 348 = @isfundamental
+| 349 = @isintegral
+| 350 = @islvaluereference
+| 351 = @ismemberfunctionpointer
+| 352 = @ismemberobjectpointer
+| 353 = @ismemberpointer
+| 354 = @isobject
+| 355 = @ispointer
+| 356 = @isreference
+| 357 = @isrvaluereference
+| 358 = @isscalar
+| 359 = @issigned
+| 360 = @isunsigned
+| 361 = @isvoid
+| 362 = @isvolatile
+| 363 = @reuseexpr
+| 364 = @istriviallycopyassignable
+| 365 = @isassignablenopreconditioncheck
+| 366 = @referencebindstotemporary
+| 367 = @issameas
+| 368 = @builtinhasattribute
+| 369 = @ispointerinterconvertiblewithclass
+| 370 = @builtinispointerinterconvertiblewithclass
+| 371 = @iscorrespondingmember
+| 372 = @builtiniscorrespondingmember
+| 373 = @isboundedarray
+| 374 = @isunboundedarray
+| 375 = @isreferenceable
+| 378 = @isnothrowconvertible
+| 379 = @referenceconstructsfromtemporary
+| 380 = @referenceconvertsfromtemporary
+| 381 = @isconvertible
+| 382 = @isvalidwinrttype
+| 383 = @iswinclass
+| 384 = @iswininterface
+| 385 = @istriviallyequalitycomparable
+| 386 = @isscopedenum
+| 387 = @istriviallyrelocatable
+| 388 = @datasizeof
+| 389 = @c11_generic
+| 390 = @requires_expr
+| 391 = @nested_requirement
+| 392 = @compound_requirement
+| 393 = @concept_id
+;
+
+@var_args_expr = @vastartexpr
+               | @vaendexpr
+               | @vaargexpr
+               | @vacopyexpr
+               ;
+
+@builtin_op = @var_args_expr
+            | @noopexpr
+            | @offsetofexpr
+            | @intaddrexpr
+            | @hasassignexpr
+            | @hascopyexpr
+            | @hasnothrowassign
+            | @hasnothrowconstr
+            | @hasnothrowcopy
+            | @hastrivialassign
+            | @hastrivialconstr
+            | @hastrivialcopy
+            | @hastrivialdestructor
+            | @hasuserdestr
+            | @hasvirtualdestr
+            | @isabstractexpr
+            | @isbaseofexpr
+            | @isclassexpr
+            | @isconvtoexpr
+            | @isemptyexpr
+            | @isenumexpr
+            | @ispodexpr
+            | @ispolyexpr
+            | @isunionexpr
+            | @typescompexpr
+            | @builtinshufflevector
+            | @builtinconvertvector
+            | @builtinaddressof
+            | @istriviallyconstructibleexpr
+            | @isdestructibleexpr
+            | @isnothrowdestructibleexpr
+            | @istriviallydestructibleexpr
+            | @istriviallyassignableexpr
+            | @isnothrowassignableexpr
+            | @istrivialexpr
+            | @isstandardlayoutexpr
+            | @istriviallycopyableexpr
+            | @isliteraltypeexpr
+            | @hastrivialmoveconstructorexpr
+            | @hastrivialmoveassignexpr
+            | @hasnothrowmoveassignexpr
+            | @isconstructibleexpr
+            | @isnothrowconstructibleexpr
+            | @hasfinalizerexpr
+            | @isdelegateexpr
+            | @isinterfaceclassexpr
+            | @isrefarrayexpr
+            | @isrefclassexpr
+            | @issealedexpr
+            | @issimplevalueclassexpr
+            | @isvalueclassexpr
+            | @isfinalexpr
+            | @builtinchooseexpr
+            | @builtincomplex
+            | @isassignable
+            | @isaggregate
+            | @hasuniqueobjectrepresentations
+            | @builtinbitcast
+            | @builtinshuffle
+            | @issame
+            | @isfunction
+            | @islayoutcompatible
+            | @ispointerinterconvertiblebaseof
+            | @isarray
+            | @arrayrank
+            | @arrayextent
+            | @isarithmetic
+            | @iscompletetype
+            | @iscompound
+            | @isconst
+            | @isfloatingpoint
+            | @isfundamental
+            | @isintegral
+            | @islvaluereference
+            | @ismemberfunctionpointer
+            | @ismemberobjectpointer
+            | @ismemberpointer
+            | @isobject
+            | @ispointer
+            | @isreference
+            | @isrvaluereference
+            | @isscalar
+            | @issigned
+            | @isunsigned
+            | @isvoid
+            | @isvolatile
+            | @istriviallycopyassignable
+            | @isassignablenopreconditioncheck
+            | @referencebindstotemporary
+            | @issameas
+            | @builtinhasattribute
+            | @ispointerinterconvertiblewithclass
+            | @builtinispointerinterconvertiblewithclass
+            | @iscorrespondingmember
+            | @builtiniscorrespondingmember
+            | @isboundedarray
+            | @isunboundedarray
+            | @isreferenceable
+            | @isnothrowconvertible
+            | @referenceconstructsfromtemporary
+            | @referenceconvertsfromtemporary
+            | @isconvertible
+            | @isvalidwinrttype
+            | @iswinclass
+            | @iswininterface
+            | @istriviallyequalitycomparable
+            | @isscopedenum
+            | @istriviallyrelocatable
+            ;
+
+compound_requirement_is_noexcept(
+    int expr: @compound_requirement ref
+);
+
+new_allocated_type(
+    unique int expr: @new_expr ref,
+    int type_id: @type ref
+);
+
+new_array_allocated_type(
+    unique int expr: @new_array_expr ref,
+    int type_id: @type ref
+);
+
+/**
+ * The field being initialized by an initializer expression within an aggregate
+ * initializer for a class/struct/union. Position is used to sort repeated initializers.
+ */
+#keyset[aggregate, position]
+aggregate_field_init(
+    int aggregate: @aggregateliteral ref,
+    int initializer: @expr ref,
+    int field: @membervariable ref,
+    int position: int ref,
+    boolean is_designated: boolean ref
+);
+
+/**
+ * The index of the element being initialized by an initializer expression
+ * within an aggregate initializer for an array. Position is used to sort repeated initializers.
+ */
+#keyset[aggregate, position]
+aggregate_array_init(
+    int aggregate: @aggregateliteral ref,
+    int initializer: @expr ref,
+    int element_index: int ref,
+    int position: int ref,
+    boolean is_designated: boolean ref
+);
+
+@ctorinit = @ctordirectinit
+          | @ctorvirtualinit
+          | @ctorfieldinit
+          | @ctordelegatinginit;
+@dtordestruct = @dtordirectdestruct
+              | @dtorvirtualdestruct
+              | @dtorfielddestruct;
+
+
+condition_decl_bind(
+    unique int expr: @condition_decl ref,
+    unique int decl: @declaration ref
+);
+
+typeid_bind(
+    unique int expr: @type_id ref,
+    int type_id: @type ref
+);
+
+uuidof_bind(
+    unique int expr: @uuidof ref,
+    int type_id: @type ref
+);
+
+@sizeof_or_alignof = @runtime_sizeof | @runtime_alignof | @datasizeof | @sizeof_pack;
+
+sizeof_bind(
+    unique int expr: @sizeof_or_alignof ref,
+    int type_id: @type ref
+);
+
+code_block(
+    unique int block: @literal ref,
+    unique int routine: @function ref
+);
+
+lambdas(
+    unique int expr: @lambdaexpr ref,
+    string default_capture: string ref,
+    boolean has_explicit_return_type: boolean ref
+);
+
+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
+|  38 = @stmt_consteval_if
+|  39 = @stmt_not_consteval_if
+;
+
+type_vla(
+    int type_id: @type ref,
+    int decl: @stmt_vla_decl ref
+);
+
+variable_vla(
+    int var: @variable ref,
+    int decl: @stmt_vla_decl ref
+);
+
+type_is_vla(unique int type_id: @derivedtype ref)
+
+if_initialization(
+    unique int if_stmt: @stmt_if ref,
+    int init_id: @stmt ref
+);
+
+if_then(
+    unique int if_stmt: @stmt_if ref,
+    int then_id: @stmt ref
+);
+
+if_else(
+    unique int if_stmt: @stmt_if ref,
+    int else_id: @stmt ref
+);
+
+constexpr_if_initialization(
+    unique int constexpr_if_stmt: @stmt_constexpr_if ref,
+    int init_id: @stmt ref
+);
+
+constexpr_if_then(
+    unique int constexpr_if_stmt: @stmt_constexpr_if ref,
+    int then_id: @stmt ref
+);
+
+constexpr_if_else(
+    unique int constexpr_if_stmt: @stmt_constexpr_if ref,
+    int else_id: @stmt ref
+);
+
+@stmt_consteval_or_not_consteval_if = @stmt_consteval_if | @stmt_not_consteval_if;
+
+consteval_if_then(
+    unique int constexpr_if_stmt: @stmt_consteval_or_not_consteval_if ref,
+    int then_id: @stmt ref
+);
+
+consteval_if_else(
+    unique int constexpr_if_stmt: @stmt_consteval_or_not_consteval_if ref,
+    int else_id: @stmt ref
+);
+
+while_body(
+    unique int while_stmt: @stmt_while ref,
+    int body_id: @stmt ref
+);
+
+do_body(
+    unique int do_stmt: @stmt_end_test_while ref,
+    int body_id: @stmt ref
+);
+
+switch_initialization(
+    unique int switch_stmt: @stmt_switch ref,
+    int init_id: @stmt ref
+);
+
+#keyset[switch_stmt, index]
+switch_case(
+    int switch_stmt: @stmt_switch ref,
+    int index: int ref,
+    int case_id: @stmt_switch_case ref
+);
+
+switch_body(
+    unique int switch_stmt: @stmt_switch ref,
+    int body_id: @stmt ref
+);
+
+@stmt_for_or_range_based_for = @stmt_for
+                             | @stmt_range_based_for;
+
+for_initialization(
+    unique int for_stmt: @stmt_for_or_range_based_for ref,
+    int init_id: @stmt ref
+);
+
+for_condition(
+    unique int for_stmt: @stmt_for ref,
+    int condition_id: @expr ref
+);
+
+for_update(
+    unique int for_stmt: @stmt_for ref,
+    int update_id: @expr ref
+);
+
+for_body(
+    unique int for_stmt: @stmt_for ref,
+    int body_id: @stmt ref
+);
+
+@stmtparent = @stmt | @expr_stmt ;
+stmtparents(
+    unique int id: @stmt ref,
+    int index: int ref,
+    int parent: @stmtparent ref
+);
+
+ishandler(unique int block: @stmt_block ref);
+
+@cfgnode = @stmt | @expr | @function | @initialiser ;
+
+stmt_decl_bind(
+    int stmt: @stmt_decl ref,
+    int num: int ref,
+    int decl: @declaration ref
+);
+
+stmt_decl_entry_bind(
+    int stmt: @stmt_decl ref,
+    int num: int ref,
+    int decl_entry: @element ref
+);
+
+@parameterized_element = @function | @stmt_block | @requires_expr;
+
+blockscope(
+    unique int block: @stmt_block ref,
+    int enclosing: @parameterized_element ref
+);
+
+@jump = @stmt_goto | @stmt_break | @stmt_continue;
+
+@jumporlabel = @jump | @stmt_label | @literal;
+
+jumpinfo(
+    unique int id: @jumporlabel ref,
+    string str: string ref,
+    int target: @stmt ref
+);
+
+preprocdirects(
+    unique int id: @preprocdirect,
+    int kind: int ref,
+    int location: @location_default ref
+);
+case @preprocdirect.kind of
+   0 = @ppd_if
+|  1 = @ppd_ifdef
+|  2 = @ppd_ifndef
+|  3 = @ppd_elif
+|  4 = @ppd_else
+|  5 = @ppd_endif
+|  6 = @ppd_plain_include
+|  7 = @ppd_define
+|  8 = @ppd_undef
+|  9 = @ppd_line
+| 10 = @ppd_error
+| 11 = @ppd_pragma
+| 12 = @ppd_objc_import
+| 13 = @ppd_include_next
+| 14 = @ppd_ms_import
+| 15 = @ppd_elifdef
+| 16 = @ppd_elifndef
+| 18 = @ppd_warning
+;
+
+@ppd_include = @ppd_plain_include | @ppd_objc_import | @ppd_include_next | @ppd_ms_import;
+
+@ppd_branch = @ppd_if | @ppd_ifdef | @ppd_ifndef | @ppd_elif | @ppd_elifdef | @ppd_elifndef;
+
+preprocpair(
+    int begin : @ppd_branch ref,
+    int elseelifend : @preprocdirect ref
+);
+
+preproctrue(int branch : @ppd_branch ref);
+preprocfalse(int branch : @ppd_branch ref);
+
+preproctext(
+    unique int id: @preprocdirect ref,
+    string head: string ref,
+    string body: string ref
+);
+
+includes(
+    unique int id: @ppd_include ref,
+    int included: @file ref
+);
+
+link_targets(
+    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/3c45f8b9e71ec723bf50c40581e1f18f4f25e290/upgrade.properties b/cpp/downgrades/3c45f8b9e71ec723bf50c40581e1f18f4f25e290/upgrade.properties
new file mode 100644
index 00000000000..9299dcb085a
--- /dev/null
+++ b/cpp/downgrades/3c45f8b9e71ec723bf50c40581e1f18f4f25e290/upgrade.properties
@@ -0,0 +1,3 @@
+description: capture whether a lambda has an explicitly specified parameter list.
+compatibility: full
+lambdas.rel: run lambdas.qlo
diff --git a/cpp/downgrades/af887e83a815a9cefe774ffa80e2493a1365b9e2/builtintypes.ql b/cpp/downgrades/af887e83a815a9cefe774ffa80e2493a1365b9e2/builtintypes.ql
new file mode 100644
index 00000000000..73b715fd71f
--- /dev/null
+++ b/cpp/downgrades/af887e83a815a9cefe774ffa80e2493a1365b9e2/builtintypes.ql
@@ -0,0 +1,9 @@
+class BuiltinType extends @builtintype {
+  string toString() { none() }
+}
+
+from BuiltinType id, string name, int kind, int new_kind, int size, int sign, int alignment
+where
+  builtintypes(id, name, kind, size, sign, alignment) and
+  if kind = 62 then new_kind = 1 else new_kind = kind
+select id, name, new_kind, size, sign, alignment
diff --git a/cpp/downgrades/af887e83a815a9cefe774ffa80e2493a1365b9e2/old.dbscheme b/cpp/downgrades/af887e83a815a9cefe774ffa80e2493a1365b9e2/old.dbscheme
new file mode 100644
index 00000000000..af887e83a81
--- /dev/null
+++ b/cpp/downgrades/af887e83a815a9cefe774ffa80e2493a1365b9e2/old.dbscheme
@@ -0,0 +1,2492 @@
+
+/**
+ * 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
+);
+
+/**
+ * Optionally, record the build mode for each compilation.
+ */
+compilation_build_mode(
+    unique int id : @compilation ref,
+    int mode : int ref
+);
+
+/*
+case @compilation_build_mode.mode of
+  0 = @build_mode_none
+| 1 = @build_mode_manual
+| 2 = @build_mode_auto
+;
+*/
+
+/**
+ * The source files that are compiled by a compiler invocation.
+ * If `id` is for the compiler invocation
+ *
+ *   gcc -c f1.c f2.c f3.c
+ *
+ * then there will be rows for
+ *
+ * num | arg
+ * --- | ---
+ * 0   | f1.c
+ * 1   | f2.c
+ * 2   | f3.c
+ *
+ * Note that even if those files `#include` headers, those headers
+ * do not appear as rows.
+ */
+#keyset[id, num]
+compilation_compiling_files(
+    int id : @compilation ref,
+    int num : int ref,
+    int file : @file ref
+);
+
+/**
+ * The time taken by the extractor for a compiler invocation.
+ *
+ * For each file `num`, there will be rows for
+ *
+ * kind | seconds
+ * ---- | ---
+ * 1    | CPU seconds used by the extractor frontend
+ * 2    | Elapsed seconds during the extractor frontend
+ * 3    | CPU seconds used by the extractor backend
+ * 4    | Elapsed seconds during the extractor backend
+ */
+#keyset[id, num, kind]
+compilation_time(
+    int id : @compilation ref,
+    int num : int ref,
+    /* kind:
+       1 = frontend_cpu_seconds
+       2 = frontend_elapsed_seconds
+       3 = extractor_cpu_seconds
+       4 = extractor_elapsed_seconds
+    */
+    int kind : int ref,
+    float seconds : float ref
+);
+
+/**
+ * An error or warning generated by the extractor.
+ * The diagnostic message `diagnostic` was generated during compiler
+ * invocation `compilation`, and is the `file_number_diagnostic_number`th
+ * message generated while extracting the `file_number`th file of that
+ * invocation.
+ */
+#keyset[compilation, file_number, file_number_diagnostic_number]
+diagnostic_for(
+    int diagnostic : @diagnostic ref,
+    int compilation : @compilation ref,
+    int file_number : int ref,
+    int file_number_diagnostic_number : int ref
+);
+
+/**
+ * If extraction was successful, then `cpu_seconds` and
+ * `elapsed_seconds` are the CPU time and elapsed time (respectively)
+ * that extraction took for compiler invocation `id`.
+ */
+compilation_finished(
+    unique int id : @compilation ref,
+    float cpu_seconds : float ref,
+    float elapsed_seconds : float ref
+);
+
+
+/**
+ * External data, 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
+ */
+
+extractor_version(
+    string codeql_version: string ref,
+    string frontend_version: string ref
+)
+
+@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
+| 7 = @user_defined_literal
+| 8 = @deduction_guide
+;
+*/
+
+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
+);
+
+/*
+case @coroutine_placeholder_variable.kind of
+  1 = @handle
+| 2 = @promise
+| 3 = @init_await_resume
+;
+*/
+
+coroutine_placeholder_variable(
+  unique int placeholder_variable: @variable ref,
+  int kind: int ref,
+  int function: @function ref
+)
+
+/** The `new` function used for allocating the coroutine state, if any. */
+coroutine_new(
+  unique int function: @function ref,
+  int new: @function ref
+);
+
+/** The `delete` function used for deallocating the coroutine state, if any. */
+coroutine_delete(
+  unique int function: @function ref,
+  int delete: @function ref
+);
+
+purefunctions(unique int id: @function ref);
+
+function_deleted(unique int id: @function ref);
+
+function_defaulted(unique int id: @function ref);
+
+function_prototyped(unique int id: @function ref)
+
+deduction_guide_for_class(
+    int id: @function ref,
+    int class_template: @usertype ref
+)
+
+member_function_this_type(
+    unique int id: @function ref,
+    int this_type: @type ref
+);
+
+#keyset[id, type_id]
+fun_decls(
+    int id: @fun_decl,
+    int function: @function ref,
+    int type_id: @type ref,
+    string name: string ref,
+    int location: @location_default ref
+);
+fun_def(unique int id: @fun_decl ref);
+fun_specialized(unique int id: @fun_decl ref);
+fun_implicit(unique int id: @fun_decl ref);
+fun_decl_specifiers(
+    int id: @fun_decl ref,
+    string name: string ref
+)
+#keyset[fun_decl, index]
+fun_decl_throws(
+    int fun_decl: @fun_decl ref,
+    int index: int ref,
+    int type_id: @type ref
+);
+/* an empty throw specification is different from none */
+fun_decl_empty_throws(unique int fun_decl: @fun_decl ref);
+fun_decl_noexcept(
+    int fun_decl: @fun_decl ref,
+    int constant: @expr ref
+);
+fun_decl_empty_noexcept(int fun_decl: @fun_decl ref);
+fun_decl_typedef_type(
+    unique int fun_decl: @fun_decl ref,
+    int typedeftype_id: @usertype ref
+);
+
+/*
+case @fun_requires.kind of
+  1 = @template_attached
+| 2 = @function_attached
+;
+*/
+
+fun_requires(
+    int id: @fun_decl ref,
+    int kind: int ref,
+    int constraint: @expr ref
+);
+
+param_decl_bind(
+    unique int id: @var_decl ref,
+    int index: int ref,
+    int fun_decl: @fun_decl ref
+);
+
+#keyset[id, type_id]
+var_decls(
+    int id: @var_decl,
+    int variable: @variable ref,
+    int type_id: @type ref,
+    string name: string ref,
+    int location: @location_default ref
+);
+var_def(unique int id: @var_decl ref);
+var_specialized(int id: @var_decl ref);
+var_decl_specifiers(
+    int id: @var_decl ref,
+    string name: string ref
+)
+is_structured_binding(unique int id: @variable ref);
+var_requires(
+    int id: @var_decl ref,
+    int constraint: @expr ref
+);
+
+type_decls(
+    unique int id: @type_decl,
+    int type_id: @type ref,
+    int location: @location_default ref
+);
+type_def(unique int id: @type_decl ref);
+type_decl_top(
+    unique int type_decl: @type_decl ref
+);
+type_requires(
+    int id: @type_decl ref,
+    int constraint: @expr ref
+);
+
+namespace_decls(
+    unique int id: @namespace_decl,
+    int namespace_id: @namespace ref,
+    int location: @location_default ref,
+    int bodylocation: @location_default ref
+);
+
+case @using.kind of
+  1 = @using_declaration
+| 2 = @using_directive
+| 3 = @using_enum_declaration
+;
+
+usings(
+    unique int id: @using,
+    int element_id: @element ref,
+    int location: @location_default ref,
+    int kind: int ref
+);
+
+/** The element which contains the `using` declaration. */
+using_container(
+    int parent: @element ref,
+    int child: @using ref
+);
+
+static_asserts(
+    unique int id: @static_assert,
+    int condition : @expr ref,
+    string message : string ref,
+    int location: @location_default ref,
+    int enclosing : @element ref
+);
+
+// each function has an ordered list of parameters
+#keyset[id, type_id]
+#keyset[function, index, type_id]
+params(
+    int id: @parameter,
+    int function: @parameterized_element ref,
+    int index: int ref,
+    int type_id: @type ref
+);
+
+overrides(
+    int new: @function ref,
+    int old: @function ref
+);
+
+#keyset[id, type_id]
+membervariables(
+    int id: @membervariable,
+    int type_id: @type ref,
+    string name: string ref
+);
+
+#keyset[id, type_id]
+globalvariables(
+    int id: @globalvariable,
+    int type_id: @type ref,
+    string name: string ref
+);
+
+#keyset[id, type_id]
+localvariables(
+    int id: @localvariable,
+    int type_id: @type ref,
+    string name: string ref
+);
+
+autoderivation(
+    unique int var: @variable ref,
+    int derivation_type: @type ref
+);
+
+orphaned_variables(
+    int var: @localvariable ref,
+    int function: @function ref
+)
+
+enumconstants(
+    unique int id: @enumconstant,
+    int parent: @usertype ref,
+    int index: int ref,
+    int type_id: @type ref,
+    string name: string ref,
+    int location: @location_default ref
+);
+
+@variable = @localscopevariable | @globalvariable | @membervariable;
+
+@localscopevariable = @localvariable | @parameter;
+
+/**
+ * Built-in types are the fundamental types, e.g., integral, floating, and void.
+ */
+case @builtintype.kind of
+   1 = @errortype
+|  2 = @unknowntype
+|  3 = @void
+|  4 = @boolean
+|  5 = @char
+|  6 = @unsigned_char
+|  7 = @signed_char
+|  8 = @short
+|  9 = @unsigned_short
+| 10 = @signed_short
+| 11 = @int
+| 12 = @unsigned_int
+| 13 = @signed_int
+| 14 = @long
+| 15 = @unsigned_long
+| 16 = @signed_long
+| 17 = @long_long
+| 18 = @unsigned_long_long
+| 19 = @signed_long_long
+// ... 20 Microsoft-specific __int8
+// ... 21 Microsoft-specific __int16
+// ... 22 Microsoft-specific __int32
+// ... 23 Microsoft-specific __int64
+| 24 = @float
+| 25 = @double
+| 26 = @long_double
+| 27 = @complex_float         // C99-specific _Complex float
+| 28 = @complex_double        // C99-specific _Complex double
+| 29 = @complex_long_double   // C99-specific _Complex long double
+| 30 = @imaginary_float       // C99-specific _Imaginary float
+| 31 = @imaginary_double      // C99-specific _Imaginary double
+| 32 = @imaginary_long_double // C99-specific _Imaginary long double
+| 33 = @wchar_t               // Microsoft-specific
+| 34 = @decltype_nullptr      // C++11
+| 35 = @int128                // __int128
+| 36 = @unsigned_int128       // unsigned __int128
+| 37 = @signed_int128         // signed __int128
+| 38 = @float128              // __float128
+| 39 = @complex_float128      // _Complex __float128
+| 40 = @decimal32             // _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
+| 62 = @mfp8                  // __mfp8
+;
+
+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 or C23 `typeof`/`typeof_unqual`
+ * operator taking an expression as its argument.  For example:
+ * ```
+ * int a;
+ * decltype(1+a) b;
+ * typeof(1+a) c;
+ * ```
+ * Here `expr` is `1+a`.
+ *
+ * Sometimes an additional pair of parentheses around the expression
+ * changes the semantics of the decltype, e.g.
+ * ```
+ * struct A { double x; };
+ * const A* a = new A();
+ * decltype( a->x ); // type is double
+ * decltype((a->x)); // type is const double&
+ * ```
+ * (Please consult the C++11 standard for more details).
+ * `parentheses_would_change_meaning` is `true` iff that is the case.
+ */
+
+/*
+case @decltype.kind of
+|  0 = @decltype
+|  1 = @typeof // The frontend does not differentiate between typeof and typeof_unqual
+;
+*/
+
+#keyset[id, expr]
+decltypes(
+    int id: @decltype,
+    int expr: @expr ref,
+    int kind: int ref,
+    int base_type: @type ref,
+    boolean parentheses_would_change_meaning: boolean ref
+);
+
+/*
+case @type_operator.kind of
+|  0 = @typeof // The frontend does not differentiate between typeof and typeof_unqual
+|  1 = @underlying_type
+|  2 = @bases
+|  3 = @direct_bases
+|  4 = @add_lvalue_reference
+|  5 = @add_pointer
+|  6 = @add_rvalue_reference
+|  7 = @decay
+|  8 = @make_signed
+|  9 = @make_unsigned
+| 10 = @remove_all_extents
+| 11 = @remove_const
+| 12 = @remove_cv
+| 13 = @remove_cvref
+| 14 = @remove_extent
+| 15 = @remove_pointer
+| 16 = @remove_reference_t
+| 17 = @remove_restrict
+| 18 = @remove_volatile
+| 19 = @remove_reference
+;
+*/
+
+type_operators(
+    unique int id: @type_operator,
+    int arg_type: @type ref,
+    int kind: int ref,
+    int base_type: @type ref
+)
+
+/*
+case @usertype.kind of
+|  0 = @unknown_usertype
+|  1 = @struct
+|  2 = @class
+|  3 = @union
+|  4 = @enum
+// ... 5 = @typedef deprecated        // classic C: typedef typedef type name
+// ... 6 = @template deprecated
+|  7 = @template_parameter
+|  8 = @template_template_parameter
+|  9 = @proxy_class                   // a proxy class associated with a template parameter
+// ... 10 objc_class deprecated
+// ... 11 objc_protocol deprecated
+// ... 12 objc_category deprecated
+| 13 = @scoped_enum
+// ... 14 = @using_alias deprecated   // a using name = type style typedef
+| 15 = @template_struct
+| 16 = @template_class
+| 17 = @template_union
+| 18 = @alias
+;
+*/
+
+usertypes(
+    unique int id: @usertype,
+    string name: string ref,
+    int kind: int ref
+);
+
+usertypesize(
+    unique int id: @usertype ref,
+    int size: int ref,
+    int alignment: int ref
+);
+
+usertype_final(unique int id: @usertype ref);
+
+usertype_uuid(
+    unique int id: @usertype ref,
+    string uuid: string ref
+);
+
+/*
+case @usertype.alias_kind of
+| 0 = @typedef
+| 1 = @alias
+*/
+
+usertype_alias_kind(
+    int id: @usertype ref,
+    int alias_kind: int ref
+)
+
+nontype_template_parameters(
+    int id: @expr ref
+);
+
+type_template_type_constraint(
+    int id: @usertype ref,
+    int constraint: @expr ref
+);
+
+mangled_name(
+    unique int id: @declaration ref,
+    int mangled_name : @mangledname,
+    boolean is_complete: boolean ref
+);
+
+is_pod_class(unique int id: @usertype ref);
+is_standard_layout_class(unique int id: @usertype ref);
+
+is_complete(unique int id: @usertype ref);
+
+is_class_template(unique int id: @usertype ref);
+class_instantiation(
+    int to: @usertype ref,
+    int from: @usertype ref
+);
+class_template_argument(
+    int type_id: @usertype ref,
+    int index: int ref,
+    int arg_type: @type ref
+);
+class_template_argument_value(
+    int type_id: @usertype ref,
+    int index: int ref,
+    int arg_value: @expr ref
+);
+
+@user_or_decltype = @usertype | @decltype;
+
+is_proxy_class_for(
+    unique int id: @usertype ref,
+    int templ_param_id: @user_or_decltype ref
+);
+
+type_mentions(
+    unique int id: @type_mention,
+    int type_id: @type ref,
+    int location: @location 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
+);
+
+template_template_instantiation(
+    int to: @usertype ref,
+    int from: @usertype ref
+);
+template_template_argument(
+    int type_id: @usertype ref,
+    int index: int ref,
+    int arg_type: @type ref
+);
+template_template_argument_value(
+    int type_id: @usertype ref,
+    int index: int ref,
+    int arg_value: @expr ref
+);
+
+@concept = @concept_template | @concept_id;
+
+concept_templates(
+    unique int concept_id: @concept_template,
+    string name: string ref,
+    int location: @location_default ref
+);
+concept_instantiation(
+    unique int to: @concept_id ref,
+    int from: @concept_template ref
+);
+is_type_constraint(int concept_id: @concept_id ref);
+concept_template_argument(
+    int concept_id: @concept ref,
+    int index: int ref,
+    int arg_type: @type ref
+);
+concept_template_argument_value(
+    int concept_id: @concept ref,
+    int index: int ref,
+    int arg_value: @expr ref
+);
+
+routinetypes(
+    unique int id: @routinetype,
+    int return_type: @type ref
+);
+
+routinetypeargs(
+    int routine: @routinetype ref,
+    int index: int ref,
+    int type_id: @type ref
+);
+
+ptrtomembers(
+    unique int id: @ptrtomember,
+    int type_id: @type ref,
+    int class_id: @type ref
+);
+
+/*
+ specifiers for types, functions, and variables
+
+    "public",
+    "protected",
+    "private",
+
+    "const",
+    "volatile",
+    "static",
+
+    "pure",
+    "virtual",
+    "sealed", // Microsoft
+    "__interface", // Microsoft
+    "inline",
+    "explicit",
+
+    "near", // near far extension
+    "far", // near far extension
+    "__ptr32", // Microsoft
+    "__ptr64", // Microsoft
+    "__sptr", // Microsoft
+    "__uptr", // Microsoft
+    "dllimport", // Microsoft
+    "dllexport", // Microsoft
+    "thread", // Microsoft
+    "naked", // Microsoft
+    "microsoft_inline", // Microsoft
+    "forceinline", // Microsoft
+    "selectany", // Microsoft
+    "nothrow", // Microsoft
+    "novtable", // Microsoft
+    "noreturn", // Microsoft
+    "noinline", // Microsoft
+    "noalias", // Microsoft
+    "restrict", // Microsoft
+*/
+
+specifiers(
+    unique int id: @specifier,
+    unique string str: string ref
+);
+
+typespecifiers(
+    int type_id: @type ref,
+    int spec_id: @specifier ref
+);
+
+funspecifiers(
+    int func_id: @function ref,
+    int spec_id: @specifier ref
+);
+
+varspecifiers(
+    int var_id: @accessible ref,
+    int spec_id: @specifier ref
+);
+
+explicit_specifier_exprs(
+    unique int func_id: @function ref,
+    int constant: @expr ref
+)
+
+attributes(
+    unique int id: @attribute,
+    int kind: int ref,
+    string name: string ref,
+    string name_space: string ref,
+    int location: @location_default ref
+);
+
+case @attribute.kind of
+  0 = @gnuattribute
+| 1 = @stdattribute
+| 2 = @declspec
+| 3 = @msattribute
+| 4 = @alignas
+// ... 5 @objc_propertyattribute deprecated
+;
+
+attribute_args(
+    unique int id: @attribute_arg,
+    int kind: int ref,
+    int attribute: @attribute ref,
+    int index: int ref,
+    int location: @location_default ref
+);
+
+case @attribute_arg.kind of
+  0 = @attribute_arg_empty
+| 1 = @attribute_arg_token
+| 2 = @attribute_arg_constant
+| 3 = @attribute_arg_type
+| 4 = @attribute_arg_constant_expr
+| 5 = @attribute_arg_expr
+;
+
+attribute_arg_value(
+    unique int arg: @attribute_arg ref,
+    string value: string ref
+);
+attribute_arg_type(
+    unique int arg: @attribute_arg ref,
+    int type_id: @type ref
+);
+attribute_arg_constant(
+    unique int arg: @attribute_arg ref,
+    int constant: @expr ref
+)
+attribute_arg_expr(
+    unique int arg: @attribute_arg ref,
+    int expr: @expr ref
+)
+attribute_arg_name(
+    unique int arg: @attribute_arg ref,
+    string name: string ref
+);
+
+typeattributes(
+    int type_id: @type ref,
+    int spec_id: @attribute ref
+);
+
+funcattributes(
+    int func_id: @function ref,
+    int spec_id: @attribute ref
+);
+
+varattributes(
+    int var_id: @accessible ref,
+    int spec_id: @attribute ref
+);
+
+stmtattributes(
+    int stmt_id: @stmt ref,
+    int spec_id: @attribute ref
+);
+
+@type = @builtintype
+      | @derivedtype
+      | @usertype
+      | @routinetype
+      | @ptrtomember
+      | @decltype
+      | @type_operator;
+
+unspecifiedtype(
+    unique int type_id: @type ref,
+    int unspecified_type_id: @type ref
+);
+
+member(
+    int parent: @type ref,
+    int index: int ref,
+    int child: @member ref
+);
+
+@enclosingfunction_child = @usertype | @variable | @namespace
+
+enclosingfunction(
+    unique int child: @enclosingfunction_child ref,
+    int parent: @function ref
+);
+
+derivations(
+    unique int derivation: @derivation,
+    int sub: @type ref,
+    int index: int ref,
+    int super: @type ref,
+    int location: @location_default ref
+);
+
+derspecifiers(
+    int der_id: @derivation ref,
+    int spec_id: @specifier ref
+);
+
+/**
+ * Contains the byte offset of the base class subobject within the derived
+ * class. Only holds for non-virtual base classes, but see table
+ * `virtual_base_offsets` for offsets of virtual base class subobjects.
+ */
+direct_base_offsets(
+    unique int der_id: @derivation ref,
+    int offset: int ref
+);
+
+/**
+ * Contains the byte offset of the virtual base class subobject for class
+ * `super` within a most-derived object of class `sub`. `super` can be either a
+ * direct or indirect base class.
+ */
+#keyset[sub, super]
+virtual_base_offsets(
+    int sub: @usertype ref,
+    int super: @usertype ref,
+    int offset: int ref
+);
+
+frienddecls(
+    unique int id: @frienddecl,
+    int type_id: @type ref,
+    int decl_id: @declaration ref,
+    int location: @location_default ref
+);
+
+@declaredtype = @usertype ;
+
+@declaration = @function
+             | @declaredtype
+             | @variable
+             | @enumconstant
+             | @frienddecl
+             | @concept_template;
+
+@member = @membervariable
+        | @function
+        | @declaredtype
+        | @enumconstant;
+
+@locatable = @diagnostic
+           | @declaration
+           | @ppd_include
+           | @ppd_define
+           | @macroinvocation
+           /*| @funcall*/
+           | @xmllocatable
+           | @attribute
+           | @attribute_arg;
+
+@namedscope = @namespace | @usertype;
+
+@element = @locatable
+         | @file
+         | @folder
+         | @specifier
+         | @type
+         | @expr
+         | @namespace
+         | @initialiser
+         | @stmt
+         | @derivation
+         | @comment
+         | @preprocdirect
+         | @fun_decl
+         | @var_decl
+         | @type_decl
+         | @namespace_decl
+         | @using
+         | @namequalifier
+         | @specialnamequalifyingelement
+         | @static_assert
+         | @type_mention
+         | @lambdacapture;
+
+@exprparent = @element;
+
+comments(
+    unique int id: @comment,
+    string contents: string ref,
+    int location: @location_default ref
+);
+
+commentbinding(
+    int id: @comment ref,
+    int element: @element ref
+);
+
+exprconv(
+    int converted: @expr ref,
+    unique int conversion: @expr ref
+);
+
+compgenerated(unique int id: @element ref);
+
+/**
+ * `destructor_call` destructs the `i`'th entity that should be
+ * destructed following `element`. Note that entities should be
+ * destructed in reverse construction order, so for a given `element`
+ * these should be called from highest to lowest `i`.
+ */
+#keyset[element, destructor_call]
+#keyset[element, i]
+synthetic_destructor_call(
+    int element: @element ref,
+    int i: int ref,
+    int destructor_call: @routineexpr ref
+);
+
+namespaces(
+    unique int id: @namespace,
+    string name: string ref
+);
+
+namespace_inline(
+    unique int id: @namespace ref
+);
+
+namespacembrs(
+    int parentid: @namespace ref,
+    unique int memberid: @namespacembr ref
+);
+
+@namespacembr = @declaration | @namespace;
+
+exprparents(
+    int expr_id: @expr ref,
+    int child_index: int ref,
+    int parent_id: @exprparent ref
+);
+
+expr_isload(unique int expr_id: @expr ref);
+
+@cast = @c_style_cast
+      | @const_cast
+      | @dynamic_cast
+      | @reinterpret_cast
+      | @static_cast
+      ;
+
+/*
+case @conversion.kind of
+  0 = @simple_conversion           // a numeric conversion, qualification conversion, or a reinterpret_cast
+| 1 = @bool_conversion             // conversion to 'bool'
+| 2 = @base_class_conversion       // a derived-to-base conversion
+| 3 = @derived_class_conversion    // a base-to-derived conversion
+| 4 = @pm_base_class_conversion    // a derived-to-base conversion of a pointer to member
+| 5 = @pm_derived_class_conversion // a base-to-derived conversion of a pointer to member
+| 6 = @glvalue_adjust              // an adjustment of the type of a glvalue
+| 7 = @prvalue_adjust              // an adjustment of the type of a prvalue
+;
+*/
+/**
+ * Describes the semantics represented by a cast expression. This is largely
+ * independent of the source syntax of the cast, so it is separate from the
+ * regular expression kind.
+ */
+conversionkinds(
+    unique int expr_id: @cast ref,
+    int kind: int ref
+);
+
+@conversion = @cast
+            | @array_to_pointer
+            | @parexpr
+            | @reference_to
+            | @ref_indirect
+            | @temp_init
+            | @c11_generic
+            ;
+
+/*
+case @funbindexpr.kind of
+  0 = @normal_call  // a normal call
+| 1 = @virtual_call // a virtual call
+| 2 = @adl_call     // a call whose target is only found by ADL
+;
+*/
+iscall(
+    unique int caller: @funbindexpr ref,
+    int kind: int ref
+);
+
+numtemplatearguments(
+    unique int expr_id: @expr ref,
+    int num: int ref
+);
+
+specialnamequalifyingelements(
+    unique int id: @specialnamequalifyingelement,
+    unique string name: string ref
+);
+
+@namequalifiableelement = @expr | @namequalifier;
+@namequalifyingelement = @namespace
+                       | @specialnamequalifyingelement
+                       | @usertype;
+
+namequalifiers(
+    unique int id: @namequalifier,
+    unique int qualifiableelement: @namequalifiableelement ref,
+    int qualifyingelement: @namequalifyingelement ref,
+    int location: @location_default ref
+);
+
+varbind(
+    int expr: @varbindexpr ref,
+    int var: @accessible ref
+);
+
+funbind(
+    int expr: @funbindexpr ref,
+    int fun: @function ref
+);
+
+@any_new_expr = @new_expr
+              | @new_array_expr;
+
+@new_or_delete_expr = @any_new_expr
+                    | @delete_expr
+                    | @delete_array_expr;
+
+@prefix_crement_expr = @preincrexpr | @predecrexpr;
+
+@postfix_crement_expr = @postincrexpr | @postdecrexpr;
+
+@increment_expr = @preincrexpr | @postincrexpr;
+
+@decrement_expr = @predecrexpr | @postdecrexpr;
+
+@crement_expr = @increment_expr | @decrement_expr;
+
+@un_arith_op_expr = @arithnegexpr
+                  | @unaryplusexpr
+                  | @conjugation
+                  | @realpartexpr
+                  | @imagpartexpr
+                  | @crement_expr
+                  ;
+
+@un_bitwise_op_expr = @complementexpr;
+
+@un_log_op_expr = @notexpr;
+
+@un_op_expr = @address_of
+            | @indirect
+            | @un_arith_op_expr
+            | @un_bitwise_op_expr
+            | @builtinaddressof
+            | @vec_fill
+            | @un_log_op_expr
+            | @co_await
+            | @co_yield
+            ;
+
+@bin_log_op_expr = @andlogicalexpr | @orlogicalexpr;
+
+@cmp_op_expr = @eq_op_expr | @rel_op_expr;
+
+@eq_op_expr = @eqexpr | @neexpr;
+
+@rel_op_expr = @gtexpr
+             | @ltexpr
+             | @geexpr
+             | @leexpr
+             | @spaceshipexpr
+             ;
+
+@bin_bitwise_op_expr = @lshiftexpr
+                     | @rshiftexpr
+                     | @andexpr
+                     | @orexpr
+                     | @xorexpr
+                     ;
+
+@p_arith_op_expr = @paddexpr
+                 | @psubexpr
+                 | @pdiffexpr
+                 ;
+
+@bin_arith_op_expr = @addexpr
+                   | @subexpr
+                   | @mulexpr
+                   | @divexpr
+                   | @remexpr
+                   | @jmulexpr
+                   | @jdivexpr
+                   | @fjaddexpr
+                   | @jfaddexpr
+                   | @fjsubexpr
+                   | @jfsubexpr
+                   | @minexpr
+                   | @maxexpr
+                   | @p_arith_op_expr
+                   ;
+
+@bin_op_expr = @bin_arith_op_expr
+             | @bin_bitwise_op_expr
+             | @cmp_op_expr
+             | @bin_log_op_expr
+             ;
+
+@op_expr = @un_op_expr
+         | @bin_op_expr
+         | @assign_expr
+         | @conditionalexpr
+         ;
+
+@assign_arith_expr = @assignaddexpr
+                   | @assignsubexpr
+                   | @assignmulexpr
+                   | @assigndivexpr
+                   | @assignremexpr
+                   ;
+
+@assign_bitwise_expr = @assignandexpr
+                     | @assignorexpr
+                     | @assignxorexpr
+                     | @assignlshiftexpr
+                     | @assignrshiftexpr
+                     ;
+
+@assign_pointer_expr = @assignpaddexpr
+                     | @assignpsubexpr
+                     ;
+
+@assign_op_expr = @assign_arith_expr
+                | @assign_bitwise_expr
+                | @assign_pointer_expr
+                ;
+
+@assign_expr = @assignexpr | @assign_op_expr | @blockassignexpr
+
+/*
+  Binary encoding of the allocator form.
+
+  case @allocator.form of
+    0 = plain
+  | 1 = alignment
+  ;
+*/
+
+/**
+ * The allocator function associated with a `new` or `new[]` expression.
+ * The `form` column specified whether the allocation call contains an alignment
+ * argument.
+ */
+expr_allocator(
+    unique int expr: @any_new_expr ref,
+    int func: @function ref,
+    int form: int ref
+);
+
+/*
+  Binary encoding of the deallocator form.
+
+  case @deallocator.form of
+    0 = plain
+  | 1 = size
+  | 2 = alignment
+  | 4 = destroying_delete
+  ;
+*/
+
+/**
+ * The deallocator function associated with a `delete`, `delete[]`, `new`, or
+ * `new[]` expression. For a `new` or `new[]` expression, the deallocator is the
+ * one used to free memory if the initialization throws an exception.
+ * The `form` column specifies whether the deallocation call contains a size
+ * argument, and alignment argument, or both.
+ */
+expr_deallocator(
+    unique int expr: @new_or_delete_expr ref,
+    int func: @function ref,
+    int form: int ref
+);
+
+/**
+ * Holds if the `@conditionalexpr` is of the two operand form
+ * `guard ? : false`.
+ */
+expr_cond_two_operand(
+    unique int cond: @conditionalexpr ref
+);
+
+/**
+ * The guard of `@conditionalexpr` `guard ? true : false`
+ */
+expr_cond_guard(
+    unique int cond: @conditionalexpr ref,
+    int guard: @expr ref
+);
+
+/**
+ * The expression used when the guard of `@conditionalexpr`
+ * `guard ? true : false` holds. For the two operand form
+ * `guard ?: false` consider using `expr_cond_guard` instead.
+ */
+expr_cond_true(
+    unique int cond: @conditionalexpr ref,
+    int true: @expr ref
+);
+
+/**
+ * The expression used when the guard of `@conditionalexpr`
+ * `guard ? true : false` does not hold.
+ */
+expr_cond_false(
+    unique int cond: @conditionalexpr ref,
+    int false: @expr ref
+);
+
+/** A string representation of the value. */
+values(
+    unique int id: @value,
+    string str: string ref
+);
+
+/** The actual text in the source code for the value, if any. */
+valuetext(
+    unique int id: @value ref,
+    string text: string ref
+);
+
+valuebind(
+    int val: @value ref,
+    unique int expr: @expr ref
+);
+
+fieldoffsets(
+    unique int id: @variable ref,
+    int byteoffset: int ref,
+    int bitoffset: int ref
+);
+
+bitfield(
+    unique int id: @variable ref,
+    int bits: int ref,
+    int declared_bits: int ref
+);
+
+/* TODO
+memberprefix(
+    int member: @expr ref,
+    int prefix: @expr ref
+);
+*/
+
+/*
+   kind(1) = mbrcallexpr
+   kind(2) = mbrptrcallexpr
+   kind(3) = mbrptrmbrcallexpr
+   kind(4) = ptrmbrptrmbrcallexpr
+   kind(5) = mbrreadexpr // x.y
+   kind(6) = mbrptrreadexpr // p->y
+   kind(7) = mbrptrmbrreadexpr // x.*pm
+   kind(8) = mbrptrmbrptrreadexpr // x->*pm
+   kind(9) = staticmbrreadexpr // static x.y
+   kind(10) = staticmbrptrreadexpr // static p->y
+*/
+/* TODO
+memberaccess(
+    int member: @expr ref,
+    int kind: int ref
+);
+*/
+
+initialisers(
+    unique int init: @initialiser,
+    int var: @accessible ref,
+    unique int expr: @expr ref,
+    int location: @location_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
+);
+
+expr_reuse(
+    int reuse: @expr ref,
+    int original: @expr ref,
+    int value_category: int ref
+)
+
+/*
+  case @value.category of
+    1 = prval
+  | 2 = xval
+  | 3 = lval
+  ;
+*/
+expr_types(
+    int id: @expr ref,
+    int typeid: @type ref,
+    int value_category: int ref
+);
+
+case @expr.kind of
+    1 = @errorexpr
+|   2 = @address_of // & AddressOfExpr
+|   3 = @reference_to // ReferenceToExpr (implicit?)
+|   4 = @indirect // * PointerDereferenceExpr
+|   5 = @ref_indirect // ReferenceDereferenceExpr (implicit?)
+// ...
+|   8 = @array_to_pointer // (???)
+|   9 = @vacuous_destructor_call // VacuousDestructorCall
+// ...
+|  11 = @assume // Microsoft
+|  12 = @parexpr
+|  13 = @arithnegexpr
+|  14 = @unaryplusexpr
+|  15 = @complementexpr
+|  16 = @notexpr
+|  17 = @conjugation // GNU ~ operator
+|  18 = @realpartexpr // GNU __real
+|  19 = @imagpartexpr // GNU __imag
+|  20 = @postincrexpr
+|  21 = @postdecrexpr
+|  22 = @preincrexpr
+|  23 = @predecrexpr
+|  24 = @conditionalexpr
+|  25 = @addexpr
+|  26 = @subexpr
+|  27 = @mulexpr
+|  28 = @divexpr
+|  29 = @remexpr
+|  30 = @jmulexpr // C99 mul imaginary
+|  31 = @jdivexpr // C99 div imaginary
+|  32 = @fjaddexpr // C99 add real + imaginary
+|  33 = @jfaddexpr // C99 add imaginary + real
+|  34 = @fjsubexpr // C99 sub real - imaginary
+|  35 = @jfsubexpr // C99 sub imaginary - real
+|  36 = @paddexpr // pointer add (pointer + int or int + pointer)
+|  37 = @psubexpr // pointer sub (pointer - integer)
+|  38 = @pdiffexpr // difference between two pointers
+|  39 = @lshiftexpr
+|  40 = @rshiftexpr
+|  41 = @andexpr
+|  42 = @orexpr
+|  43 = @xorexpr
+|  44 = @eqexpr
+|  45 = @neexpr
+|  46 = @gtexpr
+|  47 = @ltexpr
+|  48 = @geexpr
+|  49 = @leexpr
+|  50 = @minexpr // GNU minimum
+|  51 = @maxexpr // GNU maximum
+|  52 = @assignexpr
+|  53 = @assignaddexpr
+|  54 = @assignsubexpr
+|  55 = @assignmulexpr
+|  56 = @assigndivexpr
+|  57 = @assignremexpr
+|  58 = @assignlshiftexpr
+|  59 = @assignrshiftexpr
+|  60 = @assignandexpr
+|  61 = @assignorexpr
+|  62 = @assignxorexpr
+|  63 = @assignpaddexpr // assign pointer add
+|  64 = @assignpsubexpr // assign pointer sub
+|  65 = @andlogicalexpr
+|  66 = @orlogicalexpr
+|  67 = @commaexpr
+|  68 = @subscriptexpr // access to member of an array, e.g., a[5]
+// ...  69 @objc_subscriptexpr deprecated
+// ...  70 @cmdaccess deprecated
+// ...
+|  73 = @virtfunptrexpr
+|  74 = @callexpr
+// ...  75 @msgexpr_normal deprecated
+// ...  76 @msgexpr_super deprecated
+// ...  77 @atselectorexpr deprecated
+// ...  78 @atprotocolexpr deprecated
+|  79 = @vastartexpr
+|  80 = @vaargexpr
+|  81 = @vaendexpr
+|  82 = @vacopyexpr
+// ...  83 @atencodeexpr deprecated
+|  84 = @varaccess
+|  85 = @thisaccess
+// ...  86 @objc_box_expr deprecated
+|  87 = @new_expr
+|  88 = @delete_expr
+|  89 = @throw_expr
+|  90 = @condition_decl // a variable declared in a condition, e.g., if(int x = y > 2)
+|  91 = @braced_init_list
+|  92 = @type_id
+|  93 = @runtime_sizeof
+|  94 = @runtime_alignof
+|  95 = @sizeof_pack
+|  96 = @expr_stmt // GNU extension
+|  97 = @routineexpr
+|  98 = @type_operand // used to access a type in certain contexts (haven't found any examples yet....)
+|  99 = @offsetofexpr // offsetof ::= type and field
+| 100 = @hasassignexpr // __has_assign ::= type
+| 101 = @hascopyexpr // __has_copy ::= type
+| 102 = @hasnothrowassign // __has_nothrow_assign ::= type
+| 103 = @hasnothrowconstr // __has_nothrow_constructor ::= type
+| 104 = @hasnothrowcopy // __has_nothrow_copy ::= type
+| 105 = @hastrivialassign // __has_trivial_assign ::= type
+| 106 = @hastrivialconstr // __has_trivial_constructor ::= type
+| 107 = @hastrivialcopy // __has_trivial_copy ::= type
+| 108 = @hasuserdestr // __has_user_destructor ::= type
+| 109 = @hasvirtualdestr // __has_virtual_destructor ::= type
+| 110 = @isabstractexpr // __is_abstract ::= type
+| 111 = @isbaseofexpr // __is_base_of ::= type type
+| 112 = @isclassexpr // __is_class ::= type
+| 113 = @isconvtoexpr // __is_convertible_to ::= type type
+| 114 = @isemptyexpr // __is_empty ::= type
+| 115 = @isenumexpr // __is_enum ::= type
+| 116 = @ispodexpr // __is_pod ::= type
+| 117 = @ispolyexpr // __is_polymorphic ::= type
+| 118 = @isunionexpr // __is_union ::= type
+| 119 = @typescompexpr // GNU __builtin_types_compatible ::= type type
+| 120 = @intaddrexpr // frontend internal builtin, used to implement offsetof
+// ...
+| 122 = @hastrivialdestructor // __has_trivial_destructor ::= type
+| 123 = @literal
+| 124 = @uuidof
+| 127 = @aggregateliteral
+| 128 = @delete_array_expr
+| 129 = @new_array_expr
+// ... 130 @objc_array_literal deprecated
+// ... 131 @objc_dictionary_literal deprecated
+| 132 = @foldexpr
+// ...
+| 200 = @ctordirectinit
+| 201 = @ctorvirtualinit
+| 202 = @ctorfieldinit
+| 203 = @ctordelegatinginit
+| 204 = @dtordirectdestruct
+| 205 = @dtorvirtualdestruct
+| 206 = @dtorfielddestruct
+// ...
+| 210 = @static_cast
+| 211 = @reinterpret_cast
+| 212 = @const_cast
+| 213 = @dynamic_cast
+| 214 = @c_style_cast
+| 215 = @lambdaexpr
+| 216 = @param_ref
+| 217 = @noopexpr
+// ...
+| 294 = @istriviallyconstructibleexpr
+| 295 = @isdestructibleexpr
+| 296 = @isnothrowdestructibleexpr
+| 297 = @istriviallydestructibleexpr
+| 298 = @istriviallyassignableexpr
+| 299 = @isnothrowassignableexpr
+| 300 = @istrivialexpr
+| 301 = @isstandardlayoutexpr
+| 302 = @istriviallycopyableexpr
+| 303 = @isliteraltypeexpr
+| 304 = @hastrivialmoveconstructorexpr
+| 305 = @hastrivialmoveassignexpr
+| 306 = @hasnothrowmoveassignexpr
+| 307 = @isconstructibleexpr
+| 308 = @isnothrowconstructibleexpr
+| 309 = @hasfinalizerexpr
+| 310 = @isdelegateexpr
+| 311 = @isinterfaceclassexpr
+| 312 = @isrefarrayexpr
+| 313 = @isrefclassexpr
+| 314 = @issealedexpr
+| 315 = @issimplevalueclassexpr
+| 316 = @isvalueclassexpr
+| 317 = @isfinalexpr
+| 319 = @noexceptexpr
+| 320 = @builtinshufflevector
+| 321 = @builtinchooseexpr
+| 322 = @builtinaddressof
+| 323 = @vec_fill
+| 324 = @builtinconvertvector
+| 325 = @builtincomplex
+| 326 = @spaceshipexpr
+| 327 = @co_await
+| 328 = @co_yield
+| 329 = @temp_init
+| 330 = @isassignable
+| 331 = @isaggregate
+| 332 = @hasuniqueobjectrepresentations
+| 333 = @builtinbitcast
+| 334 = @builtinshuffle
+| 335 = @blockassignexpr
+| 336 = @issame
+| 337 = @isfunction
+| 338 = @islayoutcompatible
+| 339 = @ispointerinterconvertiblebaseof
+| 340 = @isarray
+| 341 = @arrayrank
+| 342 = @arrayextent
+| 343 = @isarithmetic
+| 344 = @iscompletetype
+| 345 = @iscompound
+| 346 = @isconst
+| 347 = @isfloatingpoint
+| 348 = @isfundamental
+| 349 = @isintegral
+| 350 = @islvaluereference
+| 351 = @ismemberfunctionpointer
+| 352 = @ismemberobjectpointer
+| 353 = @ismemberpointer
+| 354 = @isobject
+| 355 = @ispointer
+| 356 = @isreference
+| 357 = @isrvaluereference
+| 358 = @isscalar
+| 359 = @issigned
+| 360 = @isunsigned
+| 361 = @isvoid
+| 362 = @isvolatile
+| 363 = @reuseexpr
+| 364 = @istriviallycopyassignable
+| 365 = @isassignablenopreconditioncheck
+| 366 = @referencebindstotemporary
+| 367 = @issameas
+| 368 = @builtinhasattribute
+| 369 = @ispointerinterconvertiblewithclass
+| 370 = @builtinispointerinterconvertiblewithclass
+| 371 = @iscorrespondingmember
+| 372 = @builtiniscorrespondingmember
+| 373 = @isboundedarray
+| 374 = @isunboundedarray
+| 375 = @isreferenceable
+| 378 = @isnothrowconvertible
+| 379 = @referenceconstructsfromtemporary
+| 380 = @referenceconvertsfromtemporary
+| 381 = @isconvertible
+| 382 = @isvalidwinrttype
+| 383 = @iswinclass
+| 384 = @iswininterface
+| 385 = @istriviallyequalitycomparable
+| 386 = @isscopedenum
+| 387 = @istriviallyrelocatable
+| 388 = @datasizeof
+| 389 = @c11_generic
+| 390 = @requires_expr
+| 391 = @nested_requirement
+| 392 = @compound_requirement
+| 393 = @concept_id
+;
+
+@var_args_expr = @vastartexpr
+               | @vaendexpr
+               | @vaargexpr
+               | @vacopyexpr
+               ;
+
+@builtin_op = @var_args_expr
+            | @noopexpr
+            | @offsetofexpr
+            | @intaddrexpr
+            | @hasassignexpr
+            | @hascopyexpr
+            | @hasnothrowassign
+            | @hasnothrowconstr
+            | @hasnothrowcopy
+            | @hastrivialassign
+            | @hastrivialconstr
+            | @hastrivialcopy
+            | @hastrivialdestructor
+            | @hasuserdestr
+            | @hasvirtualdestr
+            | @isabstractexpr
+            | @isbaseofexpr
+            | @isclassexpr
+            | @isconvtoexpr
+            | @isemptyexpr
+            | @isenumexpr
+            | @ispodexpr
+            | @ispolyexpr
+            | @isunionexpr
+            | @typescompexpr
+            | @builtinshufflevector
+            | @builtinconvertvector
+            | @builtinaddressof
+            | @istriviallyconstructibleexpr
+            | @isdestructibleexpr
+            | @isnothrowdestructibleexpr
+            | @istriviallydestructibleexpr
+            | @istriviallyassignableexpr
+            | @isnothrowassignableexpr
+            | @istrivialexpr
+            | @isstandardlayoutexpr
+            | @istriviallycopyableexpr
+            | @isliteraltypeexpr
+            | @hastrivialmoveconstructorexpr
+            | @hastrivialmoveassignexpr
+            | @hasnothrowmoveassignexpr
+            | @isconstructibleexpr
+            | @isnothrowconstructibleexpr
+            | @hasfinalizerexpr
+            | @isdelegateexpr
+            | @isinterfaceclassexpr
+            | @isrefarrayexpr
+            | @isrefclassexpr
+            | @issealedexpr
+            | @issimplevalueclassexpr
+            | @isvalueclassexpr
+            | @isfinalexpr
+            | @builtinchooseexpr
+            | @builtincomplex
+            | @isassignable
+            | @isaggregate
+            | @hasuniqueobjectrepresentations
+            | @builtinbitcast
+            | @builtinshuffle
+            | @issame
+            | @isfunction
+            | @islayoutcompatible
+            | @ispointerinterconvertiblebaseof
+            | @isarray
+            | @arrayrank
+            | @arrayextent
+            | @isarithmetic
+            | @iscompletetype
+            | @iscompound
+            | @isconst
+            | @isfloatingpoint
+            | @isfundamental
+            | @isintegral
+            | @islvaluereference
+            | @ismemberfunctionpointer
+            | @ismemberobjectpointer
+            | @ismemberpointer
+            | @isobject
+            | @ispointer
+            | @isreference
+            | @isrvaluereference
+            | @isscalar
+            | @issigned
+            | @isunsigned
+            | @isvoid
+            | @isvolatile
+            | @istriviallycopyassignable
+            | @isassignablenopreconditioncheck
+            | @referencebindstotemporary
+            | @issameas
+            | @builtinhasattribute
+            | @ispointerinterconvertiblewithclass
+            | @builtinispointerinterconvertiblewithclass
+            | @iscorrespondingmember
+            | @builtiniscorrespondingmember
+            | @isboundedarray
+            | @isunboundedarray
+            | @isreferenceable
+            | @isnothrowconvertible
+            | @referenceconstructsfromtemporary
+            | @referenceconvertsfromtemporary
+            | @isconvertible
+            | @isvalidwinrttype
+            | @iswinclass
+            | @iswininterface
+            | @istriviallyequalitycomparable
+            | @isscopedenum
+            | @istriviallyrelocatable
+            ;
+
+compound_requirement_is_noexcept(
+    int expr: @compound_requirement ref
+);
+
+new_allocated_type(
+    unique int expr: @new_expr ref,
+    int type_id: @type ref
+);
+
+new_array_allocated_type(
+    unique int expr: @new_array_expr ref,
+    int type_id: @type ref
+);
+
+/**
+ * The field being initialized by an initializer expression within an aggregate
+ * initializer for a class/struct/union. Position is used to sort repeated initializers.
+ */
+#keyset[aggregate, position]
+aggregate_field_init(
+    int aggregate: @aggregateliteral ref,
+    int initializer: @expr ref,
+    int field: @membervariable ref,
+    int position: int ref,
+    boolean is_designated: boolean ref
+);
+
+/**
+ * The index of the element being initialized by an initializer expression
+ * within an aggregate initializer for an array. Position is used to sort repeated initializers.
+ */
+#keyset[aggregate, position]
+aggregate_array_init(
+    int aggregate: @aggregateliteral ref,
+    int initializer: @expr ref,
+    int element_index: int ref,
+    int position: int ref,
+    boolean is_designated: boolean ref
+);
+
+@ctorinit = @ctordirectinit
+          | @ctorvirtualinit
+          | @ctorfieldinit
+          | @ctordelegatinginit;
+@dtordestruct = @dtordirectdestruct
+              | @dtorvirtualdestruct
+              | @dtorfielddestruct;
+
+
+condition_decl_bind(
+    unique int expr: @condition_decl ref,
+    unique int decl: @declaration ref
+);
+
+typeid_bind(
+    unique int expr: @type_id ref,
+    int type_id: @type ref
+);
+
+uuidof_bind(
+    unique int expr: @uuidof ref,
+    int type_id: @type ref
+);
+
+@sizeof_or_alignof = @runtime_sizeof | @runtime_alignof | @datasizeof | @sizeof_pack;
+
+sizeof_bind(
+    unique int expr: @sizeof_or_alignof ref,
+    int type_id: @type ref
+);
+
+code_block(
+    unique int block: @literal ref,
+    unique int routine: @function ref
+);
+
+lambdas(
+    unique int expr: @lambdaexpr ref,
+    string default_capture: string ref,
+    boolean has_explicit_return_type: boolean ref
+);
+
+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
+|  38 = @stmt_consteval_if
+|  39 = @stmt_not_consteval_if
+;
+
+type_vla(
+    int type_id: @type ref,
+    int decl: @stmt_vla_decl ref
+);
+
+variable_vla(
+    int var: @variable ref,
+    int decl: @stmt_vla_decl ref
+);
+
+type_is_vla(unique int type_id: @derivedtype ref)
+
+if_initialization(
+    unique int if_stmt: @stmt_if ref,
+    int init_id: @stmt ref
+);
+
+if_then(
+    unique int if_stmt: @stmt_if ref,
+    int then_id: @stmt ref
+);
+
+if_else(
+    unique int if_stmt: @stmt_if ref,
+    int else_id: @stmt ref
+);
+
+constexpr_if_initialization(
+    unique int constexpr_if_stmt: @stmt_constexpr_if ref,
+    int init_id: @stmt ref
+);
+
+constexpr_if_then(
+    unique int constexpr_if_stmt: @stmt_constexpr_if ref,
+    int then_id: @stmt ref
+);
+
+constexpr_if_else(
+    unique int constexpr_if_stmt: @stmt_constexpr_if ref,
+    int else_id: @stmt ref
+);
+
+@stmt_consteval_or_not_consteval_if = @stmt_consteval_if | @stmt_not_consteval_if;
+
+consteval_if_then(
+    unique int constexpr_if_stmt: @stmt_consteval_or_not_consteval_if ref,
+    int then_id: @stmt ref
+);
+
+consteval_if_else(
+    unique int constexpr_if_stmt: @stmt_consteval_or_not_consteval_if ref,
+    int else_id: @stmt ref
+);
+
+while_body(
+    unique int while_stmt: @stmt_while ref,
+    int body_id: @stmt ref
+);
+
+do_body(
+    unique int do_stmt: @stmt_end_test_while ref,
+    int body_id: @stmt ref
+);
+
+switch_initialization(
+    unique int switch_stmt: @stmt_switch ref,
+    int init_id: @stmt ref
+);
+
+#keyset[switch_stmt, index]
+switch_case(
+    int switch_stmt: @stmt_switch ref,
+    int index: int ref,
+    int case_id: @stmt_switch_case ref
+);
+
+switch_body(
+    unique int switch_stmt: @stmt_switch ref,
+    int body_id: @stmt ref
+);
+
+@stmt_for_or_range_based_for = @stmt_for
+                             | @stmt_range_based_for;
+
+for_initialization(
+    unique int for_stmt: @stmt_for_or_range_based_for ref,
+    int init_id: @stmt ref
+);
+
+for_condition(
+    unique int for_stmt: @stmt_for ref,
+    int condition_id: @expr ref
+);
+
+for_update(
+    unique int for_stmt: @stmt_for ref,
+    int update_id: @expr ref
+);
+
+for_body(
+    unique int for_stmt: @stmt_for ref,
+    int body_id: @stmt ref
+);
+
+@stmtparent = @stmt | @expr_stmt ;
+stmtparents(
+    unique int id: @stmt ref,
+    int index: int ref,
+    int parent: @stmtparent ref
+);
+
+ishandler(unique int block: @stmt_block ref);
+
+@cfgnode = @stmt | @expr | @function | @initialiser ;
+
+stmt_decl_bind(
+    int stmt: @stmt_decl ref,
+    int num: int ref,
+    int decl: @declaration ref
+);
+
+stmt_decl_entry_bind(
+    int stmt: @stmt_decl ref,
+    int num: int ref,
+    int decl_entry: @element ref
+);
+
+@parameterized_element = @function | @stmt_block | @requires_expr;
+
+blockscope(
+    unique int block: @stmt_block ref,
+    int enclosing: @parameterized_element ref
+);
+
+@jump = @stmt_goto | @stmt_break | @stmt_continue;
+
+@jumporlabel = @jump | @stmt_label | @literal;
+
+jumpinfo(
+    unique int id: @jumporlabel ref,
+    string str: string ref,
+    int target: @stmt ref
+);
+
+preprocdirects(
+    unique int id: @preprocdirect,
+    int kind: int ref,
+    int location: @location_default ref
+);
+case @preprocdirect.kind of
+   0 = @ppd_if
+|  1 = @ppd_ifdef
+|  2 = @ppd_ifndef
+|  3 = @ppd_elif
+|  4 = @ppd_else
+|  5 = @ppd_endif
+|  6 = @ppd_plain_include
+|  7 = @ppd_define
+|  8 = @ppd_undef
+|  9 = @ppd_line
+| 10 = @ppd_error
+| 11 = @ppd_pragma
+| 12 = @ppd_objc_import
+| 13 = @ppd_include_next
+| 14 = @ppd_ms_import
+| 15 = @ppd_elifdef
+| 16 = @ppd_elifndef
+| 18 = @ppd_warning
+;
+
+@ppd_include = @ppd_plain_include | @ppd_objc_import | @ppd_include_next | @ppd_ms_import;
+
+@ppd_branch = @ppd_if | @ppd_ifdef | @ppd_ifndef | @ppd_elif | @ppd_elifdef | @ppd_elifndef;
+
+preprocpair(
+    int begin : @ppd_branch ref,
+    int elseelifend : @preprocdirect ref
+);
+
+preproctrue(int branch : @ppd_branch ref);
+preprocfalse(int branch : @ppd_branch ref);
+
+preproctext(
+    unique int id: @preprocdirect ref,
+    string head: string ref,
+    string body: string ref
+);
+
+includes(
+    unique int id: @ppd_include ref,
+    int included: @file ref
+);
+
+link_targets(
+    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/af887e83a815a9cefe774ffa80e2493a1365b9e2/semmlecode.cpp.dbscheme b/cpp/downgrades/af887e83a815a9cefe774ffa80e2493a1365b9e2/semmlecode.cpp.dbscheme
new file mode 100644
index 00000000000..9a7c3c14c10
--- /dev/null
+++ b/cpp/downgrades/af887e83a815a9cefe774ffa80e2493a1365b9e2/semmlecode.cpp.dbscheme
@@ -0,0 +1,2491 @@
+
+/**
+ * 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
+);
+
+/**
+ * Optionally, record the build mode for each compilation.
+ */
+compilation_build_mode(
+    unique int id : @compilation ref,
+    int mode : int ref
+);
+
+/*
+case @compilation_build_mode.mode of
+  0 = @build_mode_none
+| 1 = @build_mode_manual
+| 2 = @build_mode_auto
+;
+*/
+
+/**
+ * The source files that are compiled by a compiler invocation.
+ * If `id` is for the compiler invocation
+ *
+ *   gcc -c f1.c f2.c f3.c
+ *
+ * then there will be rows for
+ *
+ * num | arg
+ * --- | ---
+ * 0   | f1.c
+ * 1   | f2.c
+ * 2   | f3.c
+ *
+ * Note that even if those files `#include` headers, those headers
+ * do not appear as rows.
+ */
+#keyset[id, num]
+compilation_compiling_files(
+    int id : @compilation ref,
+    int num : int ref,
+    int file : @file ref
+);
+
+/**
+ * The time taken by the extractor for a compiler invocation.
+ *
+ * For each file `num`, there will be rows for
+ *
+ * kind | seconds
+ * ---- | ---
+ * 1    | CPU seconds used by the extractor frontend
+ * 2    | Elapsed seconds during the extractor frontend
+ * 3    | CPU seconds used by the extractor backend
+ * 4    | Elapsed seconds during the extractor backend
+ */
+#keyset[id, num, kind]
+compilation_time(
+    int id : @compilation ref,
+    int num : int ref,
+    /* kind:
+       1 = frontend_cpu_seconds
+       2 = frontend_elapsed_seconds
+       3 = extractor_cpu_seconds
+       4 = extractor_elapsed_seconds
+    */
+    int kind : int ref,
+    float seconds : float ref
+);
+
+/**
+ * An error or warning generated by the extractor.
+ * The diagnostic message `diagnostic` was generated during compiler
+ * invocation `compilation`, and is the `file_number_diagnostic_number`th
+ * message generated while extracting the `file_number`th file of that
+ * invocation.
+ */
+#keyset[compilation, file_number, file_number_diagnostic_number]
+diagnostic_for(
+    int diagnostic : @diagnostic ref,
+    int compilation : @compilation ref,
+    int file_number : int ref,
+    int file_number_diagnostic_number : int ref
+);
+
+/**
+ * If extraction was successful, then `cpu_seconds` and
+ * `elapsed_seconds` are the CPU time and elapsed time (respectively)
+ * that extraction took for compiler invocation `id`.
+ */
+compilation_finished(
+    unique int id : @compilation ref,
+    float cpu_seconds : float ref,
+    float elapsed_seconds : float ref
+);
+
+
+/**
+ * External data, 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
+ */
+
+extractor_version(
+    string codeql_version: string ref,
+    string frontend_version: string ref
+)
+
+@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
+| 7 = @user_defined_literal
+| 8 = @deduction_guide
+;
+*/
+
+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
+);
+
+/*
+case @coroutine_placeholder_variable.kind of
+  1 = @handle
+| 2 = @promise
+| 3 = @init_await_resume
+;
+*/
+
+coroutine_placeholder_variable(
+  unique int placeholder_variable: @variable ref,
+  int kind: int ref,
+  int function: @function ref
+)
+
+/** The `new` function used for allocating the coroutine state, if any. */
+coroutine_new(
+  unique int function: @function ref,
+  int new: @function ref
+);
+
+/** The `delete` function used for deallocating the coroutine state, if any. */
+coroutine_delete(
+  unique int function: @function ref,
+  int delete: @function ref
+);
+
+purefunctions(unique int id: @function ref);
+
+function_deleted(unique int id: @function ref);
+
+function_defaulted(unique int id: @function ref);
+
+function_prototyped(unique int id: @function ref)
+
+deduction_guide_for_class(
+    int id: @function ref,
+    int class_template: @usertype ref
+)
+
+member_function_this_type(
+    unique int id: @function ref,
+    int this_type: @type ref
+);
+
+#keyset[id, type_id]
+fun_decls(
+    int id: @fun_decl,
+    int function: @function ref,
+    int type_id: @type ref,
+    string name: string ref,
+    int location: @location_default ref
+);
+fun_def(unique int id: @fun_decl ref);
+fun_specialized(unique int id: @fun_decl ref);
+fun_implicit(unique int id: @fun_decl ref);
+fun_decl_specifiers(
+    int id: @fun_decl ref,
+    string name: string ref
+)
+#keyset[fun_decl, index]
+fun_decl_throws(
+    int fun_decl: @fun_decl ref,
+    int index: int ref,
+    int type_id: @type ref
+);
+/* an empty throw specification is different from none */
+fun_decl_empty_throws(unique int fun_decl: @fun_decl ref);
+fun_decl_noexcept(
+    int fun_decl: @fun_decl ref,
+    int constant: @expr ref
+);
+fun_decl_empty_noexcept(int fun_decl: @fun_decl ref);
+fun_decl_typedef_type(
+    unique int fun_decl: @fun_decl ref,
+    int typedeftype_id: @usertype ref
+);
+
+/*
+case @fun_requires.kind of
+  1 = @template_attached
+| 2 = @function_attached
+;
+*/
+
+fun_requires(
+    int id: @fun_decl ref,
+    int kind: int ref,
+    int constraint: @expr ref
+);
+
+param_decl_bind(
+    unique int id: @var_decl ref,
+    int index: int ref,
+    int fun_decl: @fun_decl ref
+);
+
+#keyset[id, type_id]
+var_decls(
+    int id: @var_decl,
+    int variable: @variable ref,
+    int type_id: @type ref,
+    string name: string ref,
+    int location: @location_default ref
+);
+var_def(unique int id: @var_decl ref);
+var_specialized(int id: @var_decl ref);
+var_decl_specifiers(
+    int id: @var_decl ref,
+    string name: string ref
+)
+is_structured_binding(unique int id: @variable ref);
+var_requires(
+    int id: @var_decl ref,
+    int constraint: @expr ref
+);
+
+type_decls(
+    unique int id: @type_decl,
+    int type_id: @type ref,
+    int location: @location_default ref
+);
+type_def(unique int id: @type_decl ref);
+type_decl_top(
+    unique int type_decl: @type_decl ref
+);
+type_requires(
+    int id: @type_decl ref,
+    int constraint: @expr ref
+);
+
+namespace_decls(
+    unique int id: @namespace_decl,
+    int namespace_id: @namespace ref,
+    int location: @location_default ref,
+    int bodylocation: @location_default ref
+);
+
+case @using.kind of
+  1 = @using_declaration
+| 2 = @using_directive
+| 3 = @using_enum_declaration
+;
+
+usings(
+    unique int id: @using,
+    int element_id: @element ref,
+    int location: @location_default ref,
+    int kind: int ref
+);
+
+/** The element which contains the `using` declaration. */
+using_container(
+    int parent: @element ref,
+    int child: @using ref
+);
+
+static_asserts(
+    unique int id: @static_assert,
+    int condition : @expr ref,
+    string message : string ref,
+    int location: @location_default ref,
+    int enclosing : @element ref
+);
+
+// each function has an ordered list of parameters
+#keyset[id, type_id]
+#keyset[function, index, type_id]
+params(
+    int id: @parameter,
+    int function: @parameterized_element ref,
+    int index: int ref,
+    int type_id: @type ref
+);
+
+overrides(
+    int new: @function ref,
+    int old: @function ref
+);
+
+#keyset[id, type_id]
+membervariables(
+    int id: @membervariable,
+    int type_id: @type ref,
+    string name: string ref
+);
+
+#keyset[id, type_id]
+globalvariables(
+    int id: @globalvariable,
+    int type_id: @type ref,
+    string name: string ref
+);
+
+#keyset[id, type_id]
+localvariables(
+    int id: @localvariable,
+    int type_id: @type ref,
+    string name: string ref
+);
+
+autoderivation(
+    unique int var: @variable ref,
+    int derivation_type: @type ref
+);
+
+orphaned_variables(
+    int var: @localvariable ref,
+    int function: @function ref
+)
+
+enumconstants(
+    unique int id: @enumconstant,
+    int parent: @usertype ref,
+    int index: int ref,
+    int type_id: @type ref,
+    string name: string ref,
+    int location: @location_default ref
+);
+
+@variable = @localscopevariable | @globalvariable | @membervariable;
+
+@localscopevariable = @localvariable | @parameter;
+
+/**
+ * Built-in types are the fundamental types, e.g., integral, floating, and void.
+ */
+case @builtintype.kind of
+   1 = @errortype
+|  2 = @unknowntype
+|  3 = @void
+|  4 = @boolean
+|  5 = @char
+|  6 = @unsigned_char
+|  7 = @signed_char
+|  8 = @short
+|  9 = @unsigned_short
+| 10 = @signed_short
+| 11 = @int
+| 12 = @unsigned_int
+| 13 = @signed_int
+| 14 = @long
+| 15 = @unsigned_long
+| 16 = @signed_long
+| 17 = @long_long
+| 18 = @unsigned_long_long
+| 19 = @signed_long_long
+// ... 20 Microsoft-specific __int8
+// ... 21 Microsoft-specific __int16
+// ... 22 Microsoft-specific __int32
+// ... 23 Microsoft-specific __int64
+| 24 = @float
+| 25 = @double
+| 26 = @long_double
+| 27 = @complex_float         // C99-specific _Complex float
+| 28 = @complex_double        // C99-specific _Complex double
+| 29 = @complex_long_double   // C99-specific _Complex long double
+| 30 = @imaginary_float       // C99-specific _Imaginary float
+| 31 = @imaginary_double      // C99-specific _Imaginary double
+| 32 = @imaginary_long_double // C99-specific _Imaginary long double
+| 33 = @wchar_t               // Microsoft-specific
+| 34 = @decltype_nullptr      // C++11
+| 35 = @int128                // __int128
+| 36 = @unsigned_int128       // unsigned __int128
+| 37 = @signed_int128         // signed __int128
+| 38 = @float128              // __float128
+| 39 = @complex_float128      // _Complex __float128
+| 40 = @decimal32             // _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 or C23 `typeof`/`typeof_unqual`
+ * operator taking an expression as its argument.  For example:
+ * ```
+ * int a;
+ * decltype(1+a) b;
+ * typeof(1+a) c;
+ * ```
+ * Here `expr` is `1+a`.
+ *
+ * Sometimes an additional pair of parentheses around the expression
+ * changes the semantics of the decltype, e.g.
+ * ```
+ * struct A { double x; };
+ * const A* a = new A();
+ * decltype( a->x ); // type is double
+ * decltype((a->x)); // type is const double&
+ * ```
+ * (Please consult the C++11 standard for more details).
+ * `parentheses_would_change_meaning` is `true` iff that is the case.
+ */
+
+/*
+case @decltype.kind of
+|  0 = @decltype
+|  1 = @typeof // The frontend does not differentiate between typeof and typeof_unqual
+;
+*/
+
+#keyset[id, expr]
+decltypes(
+    int id: @decltype,
+    int expr: @expr ref,
+    int kind: int ref,
+    int base_type: @type ref,
+    boolean parentheses_would_change_meaning: boolean ref
+);
+
+/*
+case @type_operator.kind of
+|  0 = @typeof // The frontend does not differentiate between typeof and typeof_unqual
+|  1 = @underlying_type
+|  2 = @bases
+|  3 = @direct_bases
+|  4 = @add_lvalue_reference
+|  5 = @add_pointer
+|  6 = @add_rvalue_reference
+|  7 = @decay
+|  8 = @make_signed
+|  9 = @make_unsigned
+| 10 = @remove_all_extents
+| 11 = @remove_const
+| 12 = @remove_cv
+| 13 = @remove_cvref
+| 14 = @remove_extent
+| 15 = @remove_pointer
+| 16 = @remove_reference_t
+| 17 = @remove_restrict
+| 18 = @remove_volatile
+| 19 = @remove_reference
+;
+*/
+
+type_operators(
+    unique int id: @type_operator,
+    int arg_type: @type ref,
+    int kind: int ref,
+    int base_type: @type ref
+)
+
+/*
+case @usertype.kind of
+|  0 = @unknown_usertype
+|  1 = @struct
+|  2 = @class
+|  3 = @union
+|  4 = @enum
+// ... 5 = @typedef deprecated        // classic C: typedef typedef type name
+// ... 6 = @template deprecated
+|  7 = @template_parameter
+|  8 = @template_template_parameter
+|  9 = @proxy_class                   // a proxy class associated with a template parameter
+// ... 10 objc_class deprecated
+// ... 11 objc_protocol deprecated
+// ... 12 objc_category deprecated
+| 13 = @scoped_enum
+// ... 14 = @using_alias deprecated   // a using name = type style typedef
+| 15 = @template_struct
+| 16 = @template_class
+| 17 = @template_union
+| 18 = @alias
+;
+*/
+
+usertypes(
+    unique int id: @usertype,
+    string name: string ref,
+    int kind: int ref
+);
+
+usertypesize(
+    unique int id: @usertype ref,
+    int size: int ref,
+    int alignment: int ref
+);
+
+usertype_final(unique int id: @usertype ref);
+
+usertype_uuid(
+    unique int id: @usertype ref,
+    string uuid: string ref
+);
+
+/*
+case @usertype.alias_kind of
+| 0 = @typedef
+| 1 = @alias
+*/
+
+usertype_alias_kind(
+    int id: @usertype ref,
+    int alias_kind: int ref
+)
+
+nontype_template_parameters(
+    int id: @expr ref
+);
+
+type_template_type_constraint(
+    int id: @usertype ref,
+    int constraint: @expr ref
+);
+
+mangled_name(
+    unique int id: @declaration ref,
+    int mangled_name : @mangledname,
+    boolean is_complete: boolean ref
+);
+
+is_pod_class(unique int id: @usertype ref);
+is_standard_layout_class(unique int id: @usertype ref);
+
+is_complete(unique int id: @usertype ref);
+
+is_class_template(unique int id: @usertype ref);
+class_instantiation(
+    int to: @usertype ref,
+    int from: @usertype ref
+);
+class_template_argument(
+    int type_id: @usertype ref,
+    int index: int ref,
+    int arg_type: @type ref
+);
+class_template_argument_value(
+    int type_id: @usertype ref,
+    int index: int ref,
+    int arg_value: @expr ref
+);
+
+@user_or_decltype = @usertype | @decltype;
+
+is_proxy_class_for(
+    unique int id: @usertype ref,
+    int templ_param_id: @user_or_decltype ref
+);
+
+type_mentions(
+    unique int id: @type_mention,
+    int type_id: @type ref,
+    int location: @location 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
+);
+
+template_template_instantiation(
+    int to: @usertype ref,
+    int from: @usertype ref
+);
+template_template_argument(
+    int type_id: @usertype ref,
+    int index: int ref,
+    int arg_type: @type ref
+);
+template_template_argument_value(
+    int type_id: @usertype ref,
+    int index: int ref,
+    int arg_value: @expr ref
+);
+
+@concept = @concept_template | @concept_id;
+
+concept_templates(
+    unique int concept_id: @concept_template,
+    string name: string ref,
+    int location: @location_default ref
+);
+concept_instantiation(
+    unique int to: @concept_id ref,
+    int from: @concept_template ref
+);
+is_type_constraint(int concept_id: @concept_id ref);
+concept_template_argument(
+    int concept_id: @concept ref,
+    int index: int ref,
+    int arg_type: @type ref
+);
+concept_template_argument_value(
+    int concept_id: @concept ref,
+    int index: int ref,
+    int arg_value: @expr ref
+);
+
+routinetypes(
+    unique int id: @routinetype,
+    int return_type: @type ref
+);
+
+routinetypeargs(
+    int routine: @routinetype ref,
+    int index: int ref,
+    int type_id: @type ref
+);
+
+ptrtomembers(
+    unique int id: @ptrtomember,
+    int type_id: @type ref,
+    int class_id: @type ref
+);
+
+/*
+ specifiers for types, functions, and variables
+
+    "public",
+    "protected",
+    "private",
+
+    "const",
+    "volatile",
+    "static",
+
+    "pure",
+    "virtual",
+    "sealed", // Microsoft
+    "__interface", // Microsoft
+    "inline",
+    "explicit",
+
+    "near", // near far extension
+    "far", // near far extension
+    "__ptr32", // Microsoft
+    "__ptr64", // Microsoft
+    "__sptr", // Microsoft
+    "__uptr", // Microsoft
+    "dllimport", // Microsoft
+    "dllexport", // Microsoft
+    "thread", // Microsoft
+    "naked", // Microsoft
+    "microsoft_inline", // Microsoft
+    "forceinline", // Microsoft
+    "selectany", // Microsoft
+    "nothrow", // Microsoft
+    "novtable", // Microsoft
+    "noreturn", // Microsoft
+    "noinline", // Microsoft
+    "noalias", // Microsoft
+    "restrict", // Microsoft
+*/
+
+specifiers(
+    unique int id: @specifier,
+    unique string str: string ref
+);
+
+typespecifiers(
+    int type_id: @type ref,
+    int spec_id: @specifier ref
+);
+
+funspecifiers(
+    int func_id: @function ref,
+    int spec_id: @specifier ref
+);
+
+varspecifiers(
+    int var_id: @accessible ref,
+    int spec_id: @specifier ref
+);
+
+explicit_specifier_exprs(
+    unique int func_id: @function ref,
+    int constant: @expr ref
+)
+
+attributes(
+    unique int id: @attribute,
+    int kind: int ref,
+    string name: string ref,
+    string name_space: string ref,
+    int location: @location_default ref
+);
+
+case @attribute.kind of
+  0 = @gnuattribute
+| 1 = @stdattribute
+| 2 = @declspec
+| 3 = @msattribute
+| 4 = @alignas
+// ... 5 @objc_propertyattribute deprecated
+;
+
+attribute_args(
+    unique int id: @attribute_arg,
+    int kind: int ref,
+    int attribute: @attribute ref,
+    int index: int ref,
+    int location: @location_default ref
+);
+
+case @attribute_arg.kind of
+  0 = @attribute_arg_empty
+| 1 = @attribute_arg_token
+| 2 = @attribute_arg_constant
+| 3 = @attribute_arg_type
+| 4 = @attribute_arg_constant_expr
+| 5 = @attribute_arg_expr
+;
+
+attribute_arg_value(
+    unique int arg: @attribute_arg ref,
+    string value: string ref
+);
+attribute_arg_type(
+    unique int arg: @attribute_arg ref,
+    int type_id: @type ref
+);
+attribute_arg_constant(
+    unique int arg: @attribute_arg ref,
+    int constant: @expr ref
+)
+attribute_arg_expr(
+    unique int arg: @attribute_arg ref,
+    int expr: @expr ref
+)
+attribute_arg_name(
+    unique int arg: @attribute_arg ref,
+    string name: string ref
+);
+
+typeattributes(
+    int type_id: @type ref,
+    int spec_id: @attribute ref
+);
+
+funcattributes(
+    int func_id: @function ref,
+    int spec_id: @attribute ref
+);
+
+varattributes(
+    int var_id: @accessible ref,
+    int spec_id: @attribute ref
+);
+
+stmtattributes(
+    int stmt_id: @stmt ref,
+    int spec_id: @attribute ref
+);
+
+@type = @builtintype
+      | @derivedtype
+      | @usertype
+      | @routinetype
+      | @ptrtomember
+      | @decltype
+      | @type_operator;
+
+unspecifiedtype(
+    unique int type_id: @type ref,
+    int unspecified_type_id: @type ref
+);
+
+member(
+    int parent: @type ref,
+    int index: int ref,
+    int child: @member ref
+);
+
+@enclosingfunction_child = @usertype | @variable | @namespace
+
+enclosingfunction(
+    unique int child: @enclosingfunction_child ref,
+    int parent: @function ref
+);
+
+derivations(
+    unique int derivation: @derivation,
+    int sub: @type ref,
+    int index: int ref,
+    int super: @type ref,
+    int location: @location_default ref
+);
+
+derspecifiers(
+    int der_id: @derivation ref,
+    int spec_id: @specifier ref
+);
+
+/**
+ * Contains the byte offset of the base class subobject within the derived
+ * class. Only holds for non-virtual base classes, but see table
+ * `virtual_base_offsets` for offsets of virtual base class subobjects.
+ */
+direct_base_offsets(
+    unique int der_id: @derivation ref,
+    int offset: int ref
+);
+
+/**
+ * Contains the byte offset of the virtual base class subobject for class
+ * `super` within a most-derived object of class `sub`. `super` can be either a
+ * direct or indirect base class.
+ */
+#keyset[sub, super]
+virtual_base_offsets(
+    int sub: @usertype ref,
+    int super: @usertype ref,
+    int offset: int ref
+);
+
+frienddecls(
+    unique int id: @frienddecl,
+    int type_id: @type ref,
+    int decl_id: @declaration ref,
+    int location: @location_default ref
+);
+
+@declaredtype = @usertype ;
+
+@declaration = @function
+             | @declaredtype
+             | @variable
+             | @enumconstant
+             | @frienddecl
+             | @concept_template;
+
+@member = @membervariable
+        | @function
+        | @declaredtype
+        | @enumconstant;
+
+@locatable = @diagnostic
+           | @declaration
+           | @ppd_include
+           | @ppd_define
+           | @macroinvocation
+           /*| @funcall*/
+           | @xmllocatable
+           | @attribute
+           | @attribute_arg;
+
+@namedscope = @namespace | @usertype;
+
+@element = @locatable
+         | @file
+         | @folder
+         | @specifier
+         | @type
+         | @expr
+         | @namespace
+         | @initialiser
+         | @stmt
+         | @derivation
+         | @comment
+         | @preprocdirect
+         | @fun_decl
+         | @var_decl
+         | @type_decl
+         | @namespace_decl
+         | @using
+         | @namequalifier
+         | @specialnamequalifyingelement
+         | @static_assert
+         | @type_mention
+         | @lambdacapture;
+
+@exprparent = @element;
+
+comments(
+    unique int id: @comment,
+    string contents: string ref,
+    int location: @location_default ref
+);
+
+commentbinding(
+    int id: @comment ref,
+    int element: @element ref
+);
+
+exprconv(
+    int converted: @expr ref,
+    unique int conversion: @expr ref
+);
+
+compgenerated(unique int id: @element ref);
+
+/**
+ * `destructor_call` destructs the `i`'th entity that should be
+ * destructed following `element`. Note that entities should be
+ * destructed in reverse construction order, so for a given `element`
+ * these should be called from highest to lowest `i`.
+ */
+#keyset[element, destructor_call]
+#keyset[element, i]
+synthetic_destructor_call(
+    int element: @element ref,
+    int i: int ref,
+    int destructor_call: @routineexpr ref
+);
+
+namespaces(
+    unique int id: @namespace,
+    string name: string ref
+);
+
+namespace_inline(
+    unique int id: @namespace ref
+);
+
+namespacembrs(
+    int parentid: @namespace ref,
+    unique int memberid: @namespacembr ref
+);
+
+@namespacembr = @declaration | @namespace;
+
+exprparents(
+    int expr_id: @expr ref,
+    int child_index: int ref,
+    int parent_id: @exprparent ref
+);
+
+expr_isload(unique int expr_id: @expr ref);
+
+@cast = @c_style_cast
+      | @const_cast
+      | @dynamic_cast
+      | @reinterpret_cast
+      | @static_cast
+      ;
+
+/*
+case @conversion.kind of
+  0 = @simple_conversion           // a numeric conversion, qualification conversion, or a reinterpret_cast
+| 1 = @bool_conversion             // conversion to 'bool'
+| 2 = @base_class_conversion       // a derived-to-base conversion
+| 3 = @derived_class_conversion    // a base-to-derived conversion
+| 4 = @pm_base_class_conversion    // a derived-to-base conversion of a pointer to member
+| 5 = @pm_derived_class_conversion // a base-to-derived conversion of a pointer to member
+| 6 = @glvalue_adjust              // an adjustment of the type of a glvalue
+| 7 = @prvalue_adjust              // an adjustment of the type of a prvalue
+;
+*/
+/**
+ * Describes the semantics represented by a cast expression. This is largely
+ * independent of the source syntax of the cast, so it is separate from the
+ * regular expression kind.
+ */
+conversionkinds(
+    unique int expr_id: @cast ref,
+    int kind: int ref
+);
+
+@conversion = @cast
+            | @array_to_pointer
+            | @parexpr
+            | @reference_to
+            | @ref_indirect
+            | @temp_init
+            | @c11_generic
+            ;
+
+/*
+case @funbindexpr.kind of
+  0 = @normal_call  // a normal call
+| 1 = @virtual_call // a virtual call
+| 2 = @adl_call     // a call whose target is only found by ADL
+;
+*/
+iscall(
+    unique int caller: @funbindexpr ref,
+    int kind: int ref
+);
+
+numtemplatearguments(
+    unique int expr_id: @expr ref,
+    int num: int ref
+);
+
+specialnamequalifyingelements(
+    unique int id: @specialnamequalifyingelement,
+    unique string name: string ref
+);
+
+@namequalifiableelement = @expr | @namequalifier;
+@namequalifyingelement = @namespace
+                       | @specialnamequalifyingelement
+                       | @usertype;
+
+namequalifiers(
+    unique int id: @namequalifier,
+    unique int qualifiableelement: @namequalifiableelement ref,
+    int qualifyingelement: @namequalifyingelement ref,
+    int location: @location_default ref
+);
+
+varbind(
+    int expr: @varbindexpr ref,
+    int var: @accessible ref
+);
+
+funbind(
+    int expr: @funbindexpr ref,
+    int fun: @function ref
+);
+
+@any_new_expr = @new_expr
+              | @new_array_expr;
+
+@new_or_delete_expr = @any_new_expr
+                    | @delete_expr
+                    | @delete_array_expr;
+
+@prefix_crement_expr = @preincrexpr | @predecrexpr;
+
+@postfix_crement_expr = @postincrexpr | @postdecrexpr;
+
+@increment_expr = @preincrexpr | @postincrexpr;
+
+@decrement_expr = @predecrexpr | @postdecrexpr;
+
+@crement_expr = @increment_expr | @decrement_expr;
+
+@un_arith_op_expr = @arithnegexpr
+                  | @unaryplusexpr
+                  | @conjugation
+                  | @realpartexpr
+                  | @imagpartexpr
+                  | @crement_expr
+                  ;
+
+@un_bitwise_op_expr = @complementexpr;
+
+@un_log_op_expr = @notexpr;
+
+@un_op_expr = @address_of
+            | @indirect
+            | @un_arith_op_expr
+            | @un_bitwise_op_expr
+            | @builtinaddressof
+            | @vec_fill
+            | @un_log_op_expr
+            | @co_await
+            | @co_yield
+            ;
+
+@bin_log_op_expr = @andlogicalexpr | @orlogicalexpr;
+
+@cmp_op_expr = @eq_op_expr | @rel_op_expr;
+
+@eq_op_expr = @eqexpr | @neexpr;
+
+@rel_op_expr = @gtexpr
+             | @ltexpr
+             | @geexpr
+             | @leexpr
+             | @spaceshipexpr
+             ;
+
+@bin_bitwise_op_expr = @lshiftexpr
+                     | @rshiftexpr
+                     | @andexpr
+                     | @orexpr
+                     | @xorexpr
+                     ;
+
+@p_arith_op_expr = @paddexpr
+                 | @psubexpr
+                 | @pdiffexpr
+                 ;
+
+@bin_arith_op_expr = @addexpr
+                   | @subexpr
+                   | @mulexpr
+                   | @divexpr
+                   | @remexpr
+                   | @jmulexpr
+                   | @jdivexpr
+                   | @fjaddexpr
+                   | @jfaddexpr
+                   | @fjsubexpr
+                   | @jfsubexpr
+                   | @minexpr
+                   | @maxexpr
+                   | @p_arith_op_expr
+                   ;
+
+@bin_op_expr = @bin_arith_op_expr
+             | @bin_bitwise_op_expr
+             | @cmp_op_expr
+             | @bin_log_op_expr
+             ;
+
+@op_expr = @un_op_expr
+         | @bin_op_expr
+         | @assign_expr
+         | @conditionalexpr
+         ;
+
+@assign_arith_expr = @assignaddexpr
+                   | @assignsubexpr
+                   | @assignmulexpr
+                   | @assigndivexpr
+                   | @assignremexpr
+                   ;
+
+@assign_bitwise_expr = @assignandexpr
+                     | @assignorexpr
+                     | @assignxorexpr
+                     | @assignlshiftexpr
+                     | @assignrshiftexpr
+                     ;
+
+@assign_pointer_expr = @assignpaddexpr
+                     | @assignpsubexpr
+                     ;
+
+@assign_op_expr = @assign_arith_expr
+                | @assign_bitwise_expr
+                | @assign_pointer_expr
+                ;
+
+@assign_expr = @assignexpr | @assign_op_expr | @blockassignexpr
+
+/*
+  Binary encoding of the allocator form.
+
+  case @allocator.form of
+    0 = plain
+  | 1 = alignment
+  ;
+*/
+
+/**
+ * The allocator function associated with a `new` or `new[]` expression.
+ * The `form` column specified whether the allocation call contains an alignment
+ * argument.
+ */
+expr_allocator(
+    unique int expr: @any_new_expr ref,
+    int func: @function ref,
+    int form: int ref
+);
+
+/*
+  Binary encoding of the deallocator form.
+
+  case @deallocator.form of
+    0 = plain
+  | 1 = size
+  | 2 = alignment
+  | 4 = destroying_delete
+  ;
+*/
+
+/**
+ * The deallocator function associated with a `delete`, `delete[]`, `new`, or
+ * `new[]` expression. For a `new` or `new[]` expression, the deallocator is the
+ * one used to free memory if the initialization throws an exception.
+ * The `form` column specifies whether the deallocation call contains a size
+ * argument, and alignment argument, or both.
+ */
+expr_deallocator(
+    unique int expr: @new_or_delete_expr ref,
+    int func: @function ref,
+    int form: int ref
+);
+
+/**
+ * Holds if the `@conditionalexpr` is of the two operand form
+ * `guard ? : false`.
+ */
+expr_cond_two_operand(
+    unique int cond: @conditionalexpr ref
+);
+
+/**
+ * The guard of `@conditionalexpr` `guard ? true : false`
+ */
+expr_cond_guard(
+    unique int cond: @conditionalexpr ref,
+    int guard: @expr ref
+);
+
+/**
+ * The expression used when the guard of `@conditionalexpr`
+ * `guard ? true : false` holds. For the two operand form
+ * `guard ?: false` consider using `expr_cond_guard` instead.
+ */
+expr_cond_true(
+    unique int cond: @conditionalexpr ref,
+    int true: @expr ref
+);
+
+/**
+ * The expression used when the guard of `@conditionalexpr`
+ * `guard ? true : false` does not hold.
+ */
+expr_cond_false(
+    unique int cond: @conditionalexpr ref,
+    int false: @expr ref
+);
+
+/** A string representation of the value. */
+values(
+    unique int id: @value,
+    string str: string ref
+);
+
+/** The actual text in the source code for the value, if any. */
+valuetext(
+    unique int id: @value ref,
+    string text: string ref
+);
+
+valuebind(
+    int val: @value ref,
+    unique int expr: @expr ref
+);
+
+fieldoffsets(
+    unique int id: @variable ref,
+    int byteoffset: int ref,
+    int bitoffset: int ref
+);
+
+bitfield(
+    unique int id: @variable ref,
+    int bits: int ref,
+    int declared_bits: int ref
+);
+
+/* TODO
+memberprefix(
+    int member: @expr ref,
+    int prefix: @expr ref
+);
+*/
+
+/*
+   kind(1) = mbrcallexpr
+   kind(2) = mbrptrcallexpr
+   kind(3) = mbrptrmbrcallexpr
+   kind(4) = ptrmbrptrmbrcallexpr
+   kind(5) = mbrreadexpr // x.y
+   kind(6) = mbrptrreadexpr // p->y
+   kind(7) = mbrptrmbrreadexpr // x.*pm
+   kind(8) = mbrptrmbrptrreadexpr // x->*pm
+   kind(9) = staticmbrreadexpr // static x.y
+   kind(10) = staticmbrptrreadexpr // static p->y
+*/
+/* TODO
+memberaccess(
+    int member: @expr ref,
+    int kind: int ref
+);
+*/
+
+initialisers(
+    unique int init: @initialiser,
+    int var: @accessible ref,
+    unique int expr: @expr ref,
+    int location: @location_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
+);
+
+expr_reuse(
+    int reuse: @expr ref,
+    int original: @expr ref,
+    int value_category: int ref
+)
+
+/*
+  case @value.category of
+    1 = prval
+  | 2 = xval
+  | 3 = lval
+  ;
+*/
+expr_types(
+    int id: @expr ref,
+    int typeid: @type ref,
+    int value_category: int ref
+);
+
+case @expr.kind of
+    1 = @errorexpr
+|   2 = @address_of // & AddressOfExpr
+|   3 = @reference_to // ReferenceToExpr (implicit?)
+|   4 = @indirect // * PointerDereferenceExpr
+|   5 = @ref_indirect // ReferenceDereferenceExpr (implicit?)
+// ...
+|   8 = @array_to_pointer // (???)
+|   9 = @vacuous_destructor_call // VacuousDestructorCall
+// ...
+|  11 = @assume // Microsoft
+|  12 = @parexpr
+|  13 = @arithnegexpr
+|  14 = @unaryplusexpr
+|  15 = @complementexpr
+|  16 = @notexpr
+|  17 = @conjugation // GNU ~ operator
+|  18 = @realpartexpr // GNU __real
+|  19 = @imagpartexpr // GNU __imag
+|  20 = @postincrexpr
+|  21 = @postdecrexpr
+|  22 = @preincrexpr
+|  23 = @predecrexpr
+|  24 = @conditionalexpr
+|  25 = @addexpr
+|  26 = @subexpr
+|  27 = @mulexpr
+|  28 = @divexpr
+|  29 = @remexpr
+|  30 = @jmulexpr // C99 mul imaginary
+|  31 = @jdivexpr // C99 div imaginary
+|  32 = @fjaddexpr // C99 add real + imaginary
+|  33 = @jfaddexpr // C99 add imaginary + real
+|  34 = @fjsubexpr // C99 sub real - imaginary
+|  35 = @jfsubexpr // C99 sub imaginary - real
+|  36 = @paddexpr // pointer add (pointer + int or int + pointer)
+|  37 = @psubexpr // pointer sub (pointer - integer)
+|  38 = @pdiffexpr // difference between two pointers
+|  39 = @lshiftexpr
+|  40 = @rshiftexpr
+|  41 = @andexpr
+|  42 = @orexpr
+|  43 = @xorexpr
+|  44 = @eqexpr
+|  45 = @neexpr
+|  46 = @gtexpr
+|  47 = @ltexpr
+|  48 = @geexpr
+|  49 = @leexpr
+|  50 = @minexpr // GNU minimum
+|  51 = @maxexpr // GNU maximum
+|  52 = @assignexpr
+|  53 = @assignaddexpr
+|  54 = @assignsubexpr
+|  55 = @assignmulexpr
+|  56 = @assigndivexpr
+|  57 = @assignremexpr
+|  58 = @assignlshiftexpr
+|  59 = @assignrshiftexpr
+|  60 = @assignandexpr
+|  61 = @assignorexpr
+|  62 = @assignxorexpr
+|  63 = @assignpaddexpr // assign pointer add
+|  64 = @assignpsubexpr // assign pointer sub
+|  65 = @andlogicalexpr
+|  66 = @orlogicalexpr
+|  67 = @commaexpr
+|  68 = @subscriptexpr // access to member of an array, e.g., a[5]
+// ...  69 @objc_subscriptexpr deprecated
+// ...  70 @cmdaccess deprecated
+// ...
+|  73 = @virtfunptrexpr
+|  74 = @callexpr
+// ...  75 @msgexpr_normal deprecated
+// ...  76 @msgexpr_super deprecated
+// ...  77 @atselectorexpr deprecated
+// ...  78 @atprotocolexpr deprecated
+|  79 = @vastartexpr
+|  80 = @vaargexpr
+|  81 = @vaendexpr
+|  82 = @vacopyexpr
+// ...  83 @atencodeexpr deprecated
+|  84 = @varaccess
+|  85 = @thisaccess
+// ...  86 @objc_box_expr deprecated
+|  87 = @new_expr
+|  88 = @delete_expr
+|  89 = @throw_expr
+|  90 = @condition_decl // a variable declared in a condition, e.g., if(int x = y > 2)
+|  91 = @braced_init_list
+|  92 = @type_id
+|  93 = @runtime_sizeof
+|  94 = @runtime_alignof
+|  95 = @sizeof_pack
+|  96 = @expr_stmt // GNU extension
+|  97 = @routineexpr
+|  98 = @type_operand // used to access a type in certain contexts (haven't found any examples yet....)
+|  99 = @offsetofexpr // offsetof ::= type and field
+| 100 = @hasassignexpr // __has_assign ::= type
+| 101 = @hascopyexpr // __has_copy ::= type
+| 102 = @hasnothrowassign // __has_nothrow_assign ::= type
+| 103 = @hasnothrowconstr // __has_nothrow_constructor ::= type
+| 104 = @hasnothrowcopy // __has_nothrow_copy ::= type
+| 105 = @hastrivialassign // __has_trivial_assign ::= type
+| 106 = @hastrivialconstr // __has_trivial_constructor ::= type
+| 107 = @hastrivialcopy // __has_trivial_copy ::= type
+| 108 = @hasuserdestr // __has_user_destructor ::= type
+| 109 = @hasvirtualdestr // __has_virtual_destructor ::= type
+| 110 = @isabstractexpr // __is_abstract ::= type
+| 111 = @isbaseofexpr // __is_base_of ::= type type
+| 112 = @isclassexpr // __is_class ::= type
+| 113 = @isconvtoexpr // __is_convertible_to ::= type type
+| 114 = @isemptyexpr // __is_empty ::= type
+| 115 = @isenumexpr // __is_enum ::= type
+| 116 = @ispodexpr // __is_pod ::= type
+| 117 = @ispolyexpr // __is_polymorphic ::= type
+| 118 = @isunionexpr // __is_union ::= type
+| 119 = @typescompexpr // GNU __builtin_types_compatible ::= type type
+| 120 = @intaddrexpr // frontend internal builtin, used to implement offsetof
+// ...
+| 122 = @hastrivialdestructor // __has_trivial_destructor ::= type
+| 123 = @literal
+| 124 = @uuidof
+| 127 = @aggregateliteral
+| 128 = @delete_array_expr
+| 129 = @new_array_expr
+// ... 130 @objc_array_literal deprecated
+// ... 131 @objc_dictionary_literal deprecated
+| 132 = @foldexpr
+// ...
+| 200 = @ctordirectinit
+| 201 = @ctorvirtualinit
+| 202 = @ctorfieldinit
+| 203 = @ctordelegatinginit
+| 204 = @dtordirectdestruct
+| 205 = @dtorvirtualdestruct
+| 206 = @dtorfielddestruct
+// ...
+| 210 = @static_cast
+| 211 = @reinterpret_cast
+| 212 = @const_cast
+| 213 = @dynamic_cast
+| 214 = @c_style_cast
+| 215 = @lambdaexpr
+| 216 = @param_ref
+| 217 = @noopexpr
+// ...
+| 294 = @istriviallyconstructibleexpr
+| 295 = @isdestructibleexpr
+| 296 = @isnothrowdestructibleexpr
+| 297 = @istriviallydestructibleexpr
+| 298 = @istriviallyassignableexpr
+| 299 = @isnothrowassignableexpr
+| 300 = @istrivialexpr
+| 301 = @isstandardlayoutexpr
+| 302 = @istriviallycopyableexpr
+| 303 = @isliteraltypeexpr
+| 304 = @hastrivialmoveconstructorexpr
+| 305 = @hastrivialmoveassignexpr
+| 306 = @hasnothrowmoveassignexpr
+| 307 = @isconstructibleexpr
+| 308 = @isnothrowconstructibleexpr
+| 309 = @hasfinalizerexpr
+| 310 = @isdelegateexpr
+| 311 = @isinterfaceclassexpr
+| 312 = @isrefarrayexpr
+| 313 = @isrefclassexpr
+| 314 = @issealedexpr
+| 315 = @issimplevalueclassexpr
+| 316 = @isvalueclassexpr
+| 317 = @isfinalexpr
+| 319 = @noexceptexpr
+| 320 = @builtinshufflevector
+| 321 = @builtinchooseexpr
+| 322 = @builtinaddressof
+| 323 = @vec_fill
+| 324 = @builtinconvertvector
+| 325 = @builtincomplex
+| 326 = @spaceshipexpr
+| 327 = @co_await
+| 328 = @co_yield
+| 329 = @temp_init
+| 330 = @isassignable
+| 331 = @isaggregate
+| 332 = @hasuniqueobjectrepresentations
+| 333 = @builtinbitcast
+| 334 = @builtinshuffle
+| 335 = @blockassignexpr
+| 336 = @issame
+| 337 = @isfunction
+| 338 = @islayoutcompatible
+| 339 = @ispointerinterconvertiblebaseof
+| 340 = @isarray
+| 341 = @arrayrank
+| 342 = @arrayextent
+| 343 = @isarithmetic
+| 344 = @iscompletetype
+| 345 = @iscompound
+| 346 = @isconst
+| 347 = @isfloatingpoint
+| 348 = @isfundamental
+| 349 = @isintegral
+| 350 = @islvaluereference
+| 351 = @ismemberfunctionpointer
+| 352 = @ismemberobjectpointer
+| 353 = @ismemberpointer
+| 354 = @isobject
+| 355 = @ispointer
+| 356 = @isreference
+| 357 = @isrvaluereference
+| 358 = @isscalar
+| 359 = @issigned
+| 360 = @isunsigned
+| 361 = @isvoid
+| 362 = @isvolatile
+| 363 = @reuseexpr
+| 364 = @istriviallycopyassignable
+| 365 = @isassignablenopreconditioncheck
+| 366 = @referencebindstotemporary
+| 367 = @issameas
+| 368 = @builtinhasattribute
+| 369 = @ispointerinterconvertiblewithclass
+| 370 = @builtinispointerinterconvertiblewithclass
+| 371 = @iscorrespondingmember
+| 372 = @builtiniscorrespondingmember
+| 373 = @isboundedarray
+| 374 = @isunboundedarray
+| 375 = @isreferenceable
+| 378 = @isnothrowconvertible
+| 379 = @referenceconstructsfromtemporary
+| 380 = @referenceconvertsfromtemporary
+| 381 = @isconvertible
+| 382 = @isvalidwinrttype
+| 383 = @iswinclass
+| 384 = @iswininterface
+| 385 = @istriviallyequalitycomparable
+| 386 = @isscopedenum
+| 387 = @istriviallyrelocatable
+| 388 = @datasizeof
+| 389 = @c11_generic
+| 390 = @requires_expr
+| 391 = @nested_requirement
+| 392 = @compound_requirement
+| 393 = @concept_id
+;
+
+@var_args_expr = @vastartexpr
+               | @vaendexpr
+               | @vaargexpr
+               | @vacopyexpr
+               ;
+
+@builtin_op = @var_args_expr
+            | @noopexpr
+            | @offsetofexpr
+            | @intaddrexpr
+            | @hasassignexpr
+            | @hascopyexpr
+            | @hasnothrowassign
+            | @hasnothrowconstr
+            | @hasnothrowcopy
+            | @hastrivialassign
+            | @hastrivialconstr
+            | @hastrivialcopy
+            | @hastrivialdestructor
+            | @hasuserdestr
+            | @hasvirtualdestr
+            | @isabstractexpr
+            | @isbaseofexpr
+            | @isclassexpr
+            | @isconvtoexpr
+            | @isemptyexpr
+            | @isenumexpr
+            | @ispodexpr
+            | @ispolyexpr
+            | @isunionexpr
+            | @typescompexpr
+            | @builtinshufflevector
+            | @builtinconvertvector
+            | @builtinaddressof
+            | @istriviallyconstructibleexpr
+            | @isdestructibleexpr
+            | @isnothrowdestructibleexpr
+            | @istriviallydestructibleexpr
+            | @istriviallyassignableexpr
+            | @isnothrowassignableexpr
+            | @istrivialexpr
+            | @isstandardlayoutexpr
+            | @istriviallycopyableexpr
+            | @isliteraltypeexpr
+            | @hastrivialmoveconstructorexpr
+            | @hastrivialmoveassignexpr
+            | @hasnothrowmoveassignexpr
+            | @isconstructibleexpr
+            | @isnothrowconstructibleexpr
+            | @hasfinalizerexpr
+            | @isdelegateexpr
+            | @isinterfaceclassexpr
+            | @isrefarrayexpr
+            | @isrefclassexpr
+            | @issealedexpr
+            | @issimplevalueclassexpr
+            | @isvalueclassexpr
+            | @isfinalexpr
+            | @builtinchooseexpr
+            | @builtincomplex
+            | @isassignable
+            | @isaggregate
+            | @hasuniqueobjectrepresentations
+            | @builtinbitcast
+            | @builtinshuffle
+            | @issame
+            | @isfunction
+            | @islayoutcompatible
+            | @ispointerinterconvertiblebaseof
+            | @isarray
+            | @arrayrank
+            | @arrayextent
+            | @isarithmetic
+            | @iscompletetype
+            | @iscompound
+            | @isconst
+            | @isfloatingpoint
+            | @isfundamental
+            | @isintegral
+            | @islvaluereference
+            | @ismemberfunctionpointer
+            | @ismemberobjectpointer
+            | @ismemberpointer
+            | @isobject
+            | @ispointer
+            | @isreference
+            | @isrvaluereference
+            | @isscalar
+            | @issigned
+            | @isunsigned
+            | @isvoid
+            | @isvolatile
+            | @istriviallycopyassignable
+            | @isassignablenopreconditioncheck
+            | @referencebindstotemporary
+            | @issameas
+            | @builtinhasattribute
+            | @ispointerinterconvertiblewithclass
+            | @builtinispointerinterconvertiblewithclass
+            | @iscorrespondingmember
+            | @builtiniscorrespondingmember
+            | @isboundedarray
+            | @isunboundedarray
+            | @isreferenceable
+            | @isnothrowconvertible
+            | @referenceconstructsfromtemporary
+            | @referenceconvertsfromtemporary
+            | @isconvertible
+            | @isvalidwinrttype
+            | @iswinclass
+            | @iswininterface
+            | @istriviallyequalitycomparable
+            | @isscopedenum
+            | @istriviallyrelocatable
+            ;
+
+compound_requirement_is_noexcept(
+    int expr: @compound_requirement ref
+);
+
+new_allocated_type(
+    unique int expr: @new_expr ref,
+    int type_id: @type ref
+);
+
+new_array_allocated_type(
+    unique int expr: @new_array_expr ref,
+    int type_id: @type ref
+);
+
+/**
+ * The field being initialized by an initializer expression within an aggregate
+ * initializer for a class/struct/union. Position is used to sort repeated initializers.
+ */
+#keyset[aggregate, position]
+aggregate_field_init(
+    int aggregate: @aggregateliteral ref,
+    int initializer: @expr ref,
+    int field: @membervariable ref,
+    int position: int ref,
+    boolean is_designated: boolean ref
+);
+
+/**
+ * The index of the element being initialized by an initializer expression
+ * within an aggregate initializer for an array. Position is used to sort repeated initializers.
+ */
+#keyset[aggregate, position]
+aggregate_array_init(
+    int aggregate: @aggregateliteral ref,
+    int initializer: @expr ref,
+    int element_index: int ref,
+    int position: int ref,
+    boolean is_designated: boolean ref
+);
+
+@ctorinit = @ctordirectinit
+          | @ctorvirtualinit
+          | @ctorfieldinit
+          | @ctordelegatinginit;
+@dtordestruct = @dtordirectdestruct
+              | @dtorvirtualdestruct
+              | @dtorfielddestruct;
+
+
+condition_decl_bind(
+    unique int expr: @condition_decl ref,
+    unique int decl: @declaration ref
+);
+
+typeid_bind(
+    unique int expr: @type_id ref,
+    int type_id: @type ref
+);
+
+uuidof_bind(
+    unique int expr: @uuidof ref,
+    int type_id: @type ref
+);
+
+@sizeof_or_alignof = @runtime_sizeof | @runtime_alignof | @datasizeof | @sizeof_pack;
+
+sizeof_bind(
+    unique int expr: @sizeof_or_alignof ref,
+    int type_id: @type ref
+);
+
+code_block(
+    unique int block: @literal ref,
+    unique int routine: @function ref
+);
+
+lambdas(
+    unique int expr: @lambdaexpr ref,
+    string default_capture: string ref,
+    boolean has_explicit_return_type: boolean ref
+);
+
+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
+|  38 = @stmt_consteval_if
+|  39 = @stmt_not_consteval_if
+;
+
+type_vla(
+    int type_id: @type ref,
+    int decl: @stmt_vla_decl ref
+);
+
+variable_vla(
+    int var: @variable ref,
+    int decl: @stmt_vla_decl ref
+);
+
+type_is_vla(unique int type_id: @derivedtype ref)
+
+if_initialization(
+    unique int if_stmt: @stmt_if ref,
+    int init_id: @stmt ref
+);
+
+if_then(
+    unique int if_stmt: @stmt_if ref,
+    int then_id: @stmt ref
+);
+
+if_else(
+    unique int if_stmt: @stmt_if ref,
+    int else_id: @stmt ref
+);
+
+constexpr_if_initialization(
+    unique int constexpr_if_stmt: @stmt_constexpr_if ref,
+    int init_id: @stmt ref
+);
+
+constexpr_if_then(
+    unique int constexpr_if_stmt: @stmt_constexpr_if ref,
+    int then_id: @stmt ref
+);
+
+constexpr_if_else(
+    unique int constexpr_if_stmt: @stmt_constexpr_if ref,
+    int else_id: @stmt ref
+);
+
+@stmt_consteval_or_not_consteval_if = @stmt_consteval_if | @stmt_not_consteval_if;
+
+consteval_if_then(
+    unique int constexpr_if_stmt: @stmt_consteval_or_not_consteval_if ref,
+    int then_id: @stmt ref
+);
+
+consteval_if_else(
+    unique int constexpr_if_stmt: @stmt_consteval_or_not_consteval_if ref,
+    int else_id: @stmt ref
+);
+
+while_body(
+    unique int while_stmt: @stmt_while ref,
+    int body_id: @stmt ref
+);
+
+do_body(
+    unique int do_stmt: @stmt_end_test_while ref,
+    int body_id: @stmt ref
+);
+
+switch_initialization(
+    unique int switch_stmt: @stmt_switch ref,
+    int init_id: @stmt ref
+);
+
+#keyset[switch_stmt, index]
+switch_case(
+    int switch_stmt: @stmt_switch ref,
+    int index: int ref,
+    int case_id: @stmt_switch_case ref
+);
+
+switch_body(
+    unique int switch_stmt: @stmt_switch ref,
+    int body_id: @stmt ref
+);
+
+@stmt_for_or_range_based_for = @stmt_for
+                             | @stmt_range_based_for;
+
+for_initialization(
+    unique int for_stmt: @stmt_for_or_range_based_for ref,
+    int init_id: @stmt ref
+);
+
+for_condition(
+    unique int for_stmt: @stmt_for ref,
+    int condition_id: @expr ref
+);
+
+for_update(
+    unique int for_stmt: @stmt_for ref,
+    int update_id: @expr ref
+);
+
+for_body(
+    unique int for_stmt: @stmt_for ref,
+    int body_id: @stmt ref
+);
+
+@stmtparent = @stmt | @expr_stmt ;
+stmtparents(
+    unique int id: @stmt ref,
+    int index: int ref,
+    int parent: @stmtparent ref
+);
+
+ishandler(unique int block: @stmt_block ref);
+
+@cfgnode = @stmt | @expr | @function | @initialiser ;
+
+stmt_decl_bind(
+    int stmt: @stmt_decl ref,
+    int num: int ref,
+    int decl: @declaration ref
+);
+
+stmt_decl_entry_bind(
+    int stmt: @stmt_decl ref,
+    int num: int ref,
+    int decl_entry: @element ref
+);
+
+@parameterized_element = @function | @stmt_block | @requires_expr;
+
+blockscope(
+    unique int block: @stmt_block ref,
+    int enclosing: @parameterized_element ref
+);
+
+@jump = @stmt_goto | @stmt_break | @stmt_continue;
+
+@jumporlabel = @jump | @stmt_label | @literal;
+
+jumpinfo(
+    unique int id: @jumporlabel ref,
+    string str: string ref,
+    int target: @stmt ref
+);
+
+preprocdirects(
+    unique int id: @preprocdirect,
+    int kind: int ref,
+    int location: @location_default ref
+);
+case @preprocdirect.kind of
+   0 = @ppd_if
+|  1 = @ppd_ifdef
+|  2 = @ppd_ifndef
+|  3 = @ppd_elif
+|  4 = @ppd_else
+|  5 = @ppd_endif
+|  6 = @ppd_plain_include
+|  7 = @ppd_define
+|  8 = @ppd_undef
+|  9 = @ppd_line
+| 10 = @ppd_error
+| 11 = @ppd_pragma
+| 12 = @ppd_objc_import
+| 13 = @ppd_include_next
+| 14 = @ppd_ms_import
+| 15 = @ppd_elifdef
+| 16 = @ppd_elifndef
+| 18 = @ppd_warning
+;
+
+@ppd_include = @ppd_plain_include | @ppd_objc_import | @ppd_include_next | @ppd_ms_import;
+
+@ppd_branch = @ppd_if | @ppd_ifdef | @ppd_ifndef | @ppd_elif | @ppd_elifdef | @ppd_elifndef;
+
+preprocpair(
+    int begin : @ppd_branch ref,
+    int elseelifend : @preprocdirect ref
+);
+
+preproctrue(int branch : @ppd_branch ref);
+preprocfalse(int branch : @ppd_branch ref);
+
+preproctext(
+    unique int id: @preprocdirect ref,
+    string head: string ref,
+    string body: string ref
+);
+
+includes(
+    unique int id: @ppd_include ref,
+    int included: @file ref
+);
+
+link_targets(
+    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/af887e83a815a9cefe774ffa80e2493a1365b9e2/upgrade.properties b/cpp/downgrades/af887e83a815a9cefe774ffa80e2493a1365b9e2/upgrade.properties
new file mode 100644
index 00000000000..bc85f01c52e
--- /dev/null
+++ b/cpp/downgrades/af887e83a815a9cefe774ffa80e2493a1365b9e2/upgrade.properties
@@ -0,0 +1,3 @@
+description: Support __mfp8 type
+compatibility: backwards
+builtintypes.rel: run builtintypes.qlo
diff --git a/cpp/misc/bulk_generation_targets.json b/cpp/misc/bulk_generation_targets.json
deleted file mode 100644
index 4cddef005b2..00000000000
--- a/cpp/misc/bulk_generation_targets.json
+++ /dev/null
@@ -1,9 +0,0 @@
-{
-  "strategy": "dca",
-  "language": "cpp",
-  "targets": [
-      { "name": "openssl", "with-sources": false, "with-sinks": false },
-      { "name": "sqlite", "with-sources": false, "with-sinks": false }
-  ],
-  "destination": "cpp/ql/lib/ext/generated"
-}
\ No newline at end of file
diff --git a/cpp/ql/lib/change-notes/2025-06-06-lambda-parameters.md b/cpp/ql/lib/change-notes/2025-06-06-lambda-parameters.md
new file mode 100644
index 00000000000..44f9b12968d
--- /dev/null
+++ b/cpp/ql/lib/change-notes/2025-06-06-lambda-parameters.md
@@ -0,0 +1,4 @@
+---
+category: feature
+---
+* Added a predicate `hasParameterList` to `LambdaExpression` to capture whether a lambda has an explicitly specified parameter list.
diff --git a/cpp/ql/lib/semmle/code/cpp/Type.qll b/cpp/ql/lib/semmle/code/cpp/Type.qll
index aa3fa54835c..fef978b198d 100644
--- a/cpp/ql/lib/semmle/code/cpp/Type.qll
+++ b/cpp/ql/lib/semmle/code/cpp/Type.qll
@@ -839,6 +839,9 @@ private predicate floatingPointTypeMapping(
   or
   // _Complex _Float128
   kind = 61 and base = 2 and domain = TComplexDomain() and realKind = 49 and extended = false
+  or
+  // __mfp8
+  kind = 62 and base = 2 and domain = TRealDomain() and realKind = 62 and extended = false
 }
 
 /**
diff --git a/cpp/ql/lib/semmle/code/cpp/exprs/Lambda.qll b/cpp/ql/lib/semmle/code/cpp/exprs/Lambda.qll
index 313875d1325..d1836f0ff4d 100644
--- a/cpp/ql/lib/semmle/code/cpp/exprs/Lambda.qll
+++ b/cpp/ql/lib/semmle/code/cpp/exprs/Lambda.qll
@@ -41,12 +41,17 @@ class LambdaExpression extends Expr, @lambdaexpr {
    *   - "&" if capture-by-reference is the default for implicit captures.
    *   - "=" if capture-by-value is the default for implicit captures.
    */
-  string getDefaultCaptureMode() { lambdas(underlyingElement(this), result, _) }
+  string getDefaultCaptureMode() { lambdas(underlyingElement(this), result, _, _) }
 
   /**
    * Holds if the return type (of the call operator of the resulting object) was explicitly specified.
    */
-  predicate returnTypeIsExplicit() { lambdas(underlyingElement(this), _, true) }
+  predicate returnTypeIsExplicit() { lambdas(underlyingElement(this), _, true, _) }
+
+  /**
+   * Holds if the lambda has an explicitly specified parameter list, even when empty.
+   */
+  predicate hasParameterList() { lambdas(underlyingElement(this), _, _, true) }
 
   /**
    * Gets the function which will be invoked when the resulting object is called.
diff --git a/cpp/ql/lib/semmlecode.cpp.dbscheme b/cpp/ql/lib/semmlecode.cpp.dbscheme
index 9a7c3c14c10..3c45f8b9e71 100644
--- a/cpp/ql/lib/semmlecode.cpp.dbscheme
+++ b/cpp/ql/lib/semmlecode.cpp.dbscheme
@@ -691,6 +691,7 @@ case @builtintype.kind of
 | 59 = @complex_std_float64   // _Complex _Float64
 | 60 = @complex_float64x      // _Complex _Float64x
 | 61 = @complex_std_float128  // _Complex _Float128
+| 62 = @mfp8                  // __mfp8
 ;
 
 builtintypes(
@@ -2138,7 +2139,8 @@ code_block(
 lambdas(
     unique int expr: @lambdaexpr ref,
     string default_capture: string ref,
-    boolean has_explicit_return_type: boolean ref
+    boolean has_explicit_return_type: boolean ref,
+    boolean has_explicit_parameter_list: boolean ref
 );
 
 lambda_capture(
diff --git a/cpp/ql/lib/semmlecode.cpp.dbscheme.stats b/cpp/ql/lib/semmlecode.cpp.dbscheme.stats
index bca58ed2f5b..3672711aa41 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>16142</v>
+            <v>15784</v>
         </e>
         <e>
             <k>@externalDataElement</k>
@@ -18,15 +18,15 @@
         </e>
         <e>
             <k>@location_default</k>
-            <v>36226754</v>
+            <v>36090715</v>
         </e>
         <e>
             <k>@location_stmt</k>
-            <v>5202209</v>
+            <v>5203174</v>
         </e>
         <e>
             <k>@location_expr</k>
-            <v>17956521</v>
+            <v>17959854</v>
         </e>
         <e>
             <k>@diagnostic</k>
@@ -34,47 +34,47 @@
         </e>
         <e>
             <k>@file</k>
-            <v>83260</v>
+            <v>81416</v>
         </e>
         <e>
             <k>@folder</k>
-            <v>15818</v>
+            <v>15468</v>
         </e>
         <e>
             <k>@macro_expansion</k>
-            <v>40121869</v>
+            <v>39233853</v>
         </e>
         <e>
             <k>@other_macro_reference</k>
-            <v>312756</v>
+            <v>312446</v>
         </e>
         <e>
             <k>@function</k>
-            <v>4015439</v>
+            <v>4000084</v>
         </e>
         <e>
             <k>@fun_decl</k>
-            <v>4154519</v>
+            <v>4138632</v>
         </e>
         <e>
             <k>@var_decl</k>
-            <v>9247204</v>
+            <v>9237883</v>
         </e>
         <e>
             <k>@type_decl</k>
-            <v>1882105</v>
+            <v>1840519</v>
         </e>
         <e>
             <k>@namespace_decl</k>
-            <v>430914</v>
+            <v>429821</v>
         </e>
         <e>
             <k>@using_declaration</k>
-            <v>341862</v>
+            <v>334516</v>
         </e>
         <e>
             <k>@using_directive</k>
-            <v>8125</v>
+            <v>8117</v>
         </e>
         <e>
             <k>@using_enum_declaration</k>
@@ -82,307 +82,311 @@
         </e>
         <e>
             <k>@static_assert</k>
-            <v>183493</v>
+            <v>183028</v>
         </e>
         <e>
             <k>@parameter</k>
-            <v>6965639</v>
+            <v>6939003</v>
         </e>
         <e>
             <k>@membervariable</k>
-            <v>1489139</v>
+            <v>1489415</v>
         </e>
         <e>
             <k>@globalvariable</k>
-            <v>466518</v>
+            <v>486788</v>
         </e>
         <e>
             <k>@localvariable</k>
-            <v>734804</v>
+            <v>727548</v>
         </e>
         <e>
             <k>@enumconstant</k>
-            <v>343781</v>
+            <v>343845</v>
         </e>
         <e>
             <k>@errortype</k>
-            <v>125</v>
+            <v>124</v>
         </e>
         <e>
             <k>@unknowntype</k>
-            <v>125</v>
+            <v>124</v>
         </e>
         <e>
             <k>@void</k>
-            <v>125</v>
+            <v>124</v>
         </e>
         <e>
             <k>@boolean</k>
-            <v>125</v>
+            <v>124</v>
         </e>
         <e>
             <k>@char</k>
-            <v>125</v>
+            <v>124</v>
         </e>
         <e>
             <k>@unsigned_char</k>
-            <v>125</v>
+            <v>124</v>
         </e>
         <e>
             <k>@signed_char</k>
-            <v>125</v>
+            <v>124</v>
         </e>
         <e>
             <k>@short</k>
-            <v>125</v>
+            <v>124</v>
         </e>
         <e>
             <k>@unsigned_short</k>
-            <v>125</v>
+            <v>124</v>
         </e>
         <e>
             <k>@signed_short</k>
-            <v>125</v>
+            <v>124</v>
         </e>
         <e>
             <k>@int</k>
-            <v>125</v>
+            <v>124</v>
         </e>
         <e>
             <k>@unsigned_int</k>
-            <v>125</v>
+            <v>124</v>
         </e>
         <e>
             <k>@signed_int</k>
-            <v>125</v>
+            <v>124</v>
         </e>
         <e>
             <k>@long</k>
-            <v>125</v>
+            <v>124</v>
         </e>
         <e>
             <k>@unsigned_long</k>
-            <v>125</v>
+            <v>124</v>
         </e>
         <e>
             <k>@signed_long</k>
-            <v>125</v>
+            <v>124</v>
         </e>
         <e>
             <k>@long_long</k>
-            <v>125</v>
+            <v>124</v>
         </e>
         <e>
             <k>@unsigned_long_long</k>
-            <v>125</v>
+            <v>124</v>
         </e>
         <e>
             <k>@signed_long_long</k>
-            <v>125</v>
+            <v>124</v>
         </e>
         <e>
             <k>@float</k>
-            <v>125</v>
+            <v>124</v>
         </e>
         <e>
             <k>@double</k>
-            <v>125</v>
+            <v>124</v>
         </e>
         <e>
             <k>@long_double</k>
-            <v>125</v>
+            <v>124</v>
         </e>
         <e>
             <k>@complex_float</k>
-            <v>125</v>
+            <v>124</v>
         </e>
         <e>
             <k>@complex_double</k>
-            <v>125</v>
+            <v>124</v>
         </e>
         <e>
             <k>@complex_long_double</k>
-            <v>125</v>
+            <v>124</v>
         </e>
         <e>
             <k>@imaginary_float</k>
-            <v>125</v>
+            <v>124</v>
         </e>
         <e>
             <k>@imaginary_double</k>
-            <v>125</v>
+            <v>124</v>
         </e>
         <e>
             <k>@imaginary_long_double</k>
-            <v>125</v>
+            <v>124</v>
         </e>
         <e>
             <k>@wchar_t</k>
-            <v>125</v>
+            <v>124</v>
         </e>
         <e>
             <k>@decltype_nullptr</k>
-            <v>125</v>
+            <v>124</v>
         </e>
         <e>
             <k>@int128</k>
-            <v>125</v>
+            <v>124</v>
         </e>
         <e>
             <k>@unsigned_int128</k>
-            <v>125</v>
+            <v>124</v>
         </e>
         <e>
             <k>@signed_int128</k>
-            <v>125</v>
+            <v>124</v>
         </e>
         <e>
             <k>@float128</k>
-            <v>125</v>
+            <v>124</v>
         </e>
         <e>
             <k>@complex_float128</k>
-            <v>125</v>
+            <v>124</v>
         </e>
         <e>
             <k>@decimal32</k>
-            <v>125</v>
+            <v>124</v>
         </e>
         <e>
             <k>@decimal64</k>
-            <v>125</v>
+            <v>124</v>
         </e>
         <e>
             <k>@decimal128</k>
-            <v>125</v>
+            <v>124</v>
         </e>
         <e>
             <k>@char16_t</k>
-            <v>125</v>
+            <v>124</v>
         </e>
         <e>
             <k>@char32_t</k>
-            <v>125</v>
+            <v>124</v>
         </e>
         <e>
             <k>@std_float32</k>
-            <v>125</v>
+            <v>124</v>
         </e>
         <e>
             <k>@float32x</k>
-            <v>125</v>
+            <v>124</v>
         </e>
         <e>
             <k>@std_float64</k>
-            <v>125</v>
+            <v>124</v>
         </e>
         <e>
             <k>@float64x</k>
-            <v>125</v>
+            <v>124</v>
         </e>
         <e>
             <k>@std_float128</k>
-            <v>125</v>
+            <v>124</v>
         </e>
         <e>
             <k>@char8_t</k>
-            <v>125</v>
+            <v>124</v>
         </e>
         <e>
             <k>@float16</k>
-            <v>125</v>
+            <v>124</v>
         </e>
         <e>
             <k>@complex_float16</k>
-            <v>125</v>
+            <v>124</v>
         </e>
         <e>
             <k>@fp16</k>
-            <v>125</v>
+            <v>124</v>
         </e>
         <e>
             <k>@std_bfloat16</k>
-            <v>125</v>
+            <v>124</v>
         </e>
         <e>
             <k>@std_float16</k>
-            <v>125</v>
+            <v>124</v>
         </e>
         <e>
             <k>@complex_std_float32</k>
-            <v>125</v>
+            <v>124</v>
         </e>
         <e>
             <k>@complex_float32x</k>
-            <v>125</v>
+            <v>124</v>
         </e>
         <e>
             <k>@complex_std_float64</k>
-            <v>125</v>
+            <v>124</v>
         </e>
         <e>
             <k>@complex_float64x</k>
-            <v>125</v>
+            <v>124</v>
         </e>
         <e>
             <k>@complex_std_float128</k>
-            <v>125</v>
+            <v>124</v>
+        </e>
+        <e>
+            <k>@mfp8</k>
+            <v>124</v>
         </e>
         <e>
             <k>@pointer</k>
-            <v>470652</v>
+            <v>470186</v>
         </e>
         <e>
             <k>@type_with_specifiers</k>
-            <v>696526</v>
+            <v>693862</v>
         </e>
         <e>
             <k>@array</k>
-            <v>98431</v>
+            <v>98055</v>
         </e>
         <e>
             <k>@routineptr</k>
-            <v>858764</v>
+            <v>857913</v>
         </e>
         <e>
             <k>@reference</k>
-            <v>970559</v>
+            <v>966847</v>
         </e>
         <e>
             <k>@gnu_vector</k>
-            <v>863</v>
+            <v>843</v>
         </e>
         <e>
             <k>@routinereference</k>
-            <v>470</v>
+            <v>469</v>
         </e>
         <e>
             <k>@rvalue_reference</k>
-            <v>291793</v>
+            <v>290677</v>
         </e>
         <e>
             <k>@block</k>
             <v>10</v>
         </e>
-        <e>
-            <k>@decltype</k>
-            <v>102057</v>
-        </e>
         <e>
             <k>@type_operator</k>
             <v>8519</v>
         </e>
+        <e>
+            <k>@decltype</k>
+            <v>102076</v>
+        </e>
         <e>
             <k>@usertype</k>
-            <v>4962767</v>
+            <v>4863327</v>
         </e>
         <e>
             <k>@mangledname</k>
-            <v>6329773</v>
+            <v>6313666</v>
         </e>
         <e>
             <k>@type_mention</k>
-            <v>5812069</v>
+            <v>5813148</v>
         </e>
         <e>
             <k>@concept_template</k>
@@ -390,15 +394,15 @@
         </e>
         <e>
             <k>@routinetype</k>
-            <v>758603</v>
+            <v>757852</v>
         </e>
         <e>
             <k>@ptrtomember</k>
-            <v>12029</v>
+            <v>12026</v>
         </e>
         <e>
             <k>@specifier</k>
-            <v>7754</v>
+            <v>7724</v>
         </e>
         <e>
             <k>@gnuattribute</k>
@@ -406,11 +410,11 @@
         </e>
         <e>
             <k>@stdattribute</k>
-            <v>350577</v>
+            <v>349236</v>
         </e>
         <e>
             <k>@declspec</k>
-            <v>328789</v>
+            <v>328850</v>
         </e>
         <e>
             <k>@msattribute</k>
@@ -418,19 +422,19 @@
         </e>
         <e>
             <k>@alignas</k>
-            <v>2192</v>
+            <v>2171</v>
         </e>
         <e>
             <k>@attribute_arg_token</k>
-            <v>20955</v>
+            <v>20935</v>
         </e>
         <e>
             <k>@attribute_arg_constant_expr</k>
-            <v>88857</v>
+            <v>86995</v>
         </e>
         <e>
             <k>@attribute_arg_expr</k>
-            <v>1793</v>
+            <v>1753</v>
         </e>
         <e>
             <k>@attribute_arg_empty</k>
@@ -442,39 +446,39 @@
         </e>
         <e>
             <k>@attribute_arg_type</k>
-            <v>466</v>
+            <v>461</v>
         </e>
         <e>
             <k>@derivation</k>
-            <v>597157</v>
+            <v>598061</v>
         </e>
         <e>
             <k>@frienddecl</k>
-            <v>879292</v>
+            <v>881070</v>
         </e>
         <e>
             <k>@comment</k>
-            <v>11233849</v>
+            <v>11190891</v>
         </e>
         <e>
             <k>@namespace</k>
-            <v>11044</v>
+            <v>10800</v>
         </e>
         <e>
             <k>@specialnamequalifyingelement</k>
-            <v>125</v>
+            <v>124</v>
         </e>
         <e>
             <k>@namequalifier</k>
-            <v>3254040</v>
+            <v>3255225</v>
         </e>
         <e>
             <k>@value</k>
-            <v>13436143</v>
+            <v>13438637</v>
         </e>
         <e>
             <k>@initialiser</k>
-            <v>2338659</v>
+            <v>2334426</v>
         </e>
         <e>
             <k>@address_of</k>
@@ -482,131 +486,131 @@
         </e>
         <e>
             <k>@indirect</k>
-            <v>403000</v>
+            <v>403075</v>
         </e>
         <e>
             <k>@array_to_pointer</k>
-            <v>1948290</v>
+            <v>1948651</v>
         </e>
         <e>
             <k>@parexpr</k>
-            <v>4901469</v>
+            <v>4902379</v>
         </e>
         <e>
             <k>@arithnegexpr</k>
-            <v>584894</v>
+            <v>585003</v>
         </e>
         <e>
             <k>@unaryplusexpr</k>
-            <v>4122</v>
+            <v>4081</v>
         </e>
         <e>
             <k>@complementexpr</k>
-            <v>38090</v>
+            <v>38098</v>
         </e>
         <e>
             <k>@notexpr</k>
-            <v>357805</v>
+            <v>357277</v>
         </e>
         <e>
             <k>@postincrexpr</k>
-            <v>84356</v>
+            <v>84372</v>
         </e>
         <e>
             <k>@postdecrexpr</k>
-            <v>57234</v>
+            <v>57244</v>
         </e>
         <e>
             <k>@preincrexpr</k>
-            <v>96438</v>
+            <v>96455</v>
         </e>
         <e>
             <k>@predecrexpr</k>
-            <v>35718</v>
+            <v>35725</v>
         </e>
         <e>
             <k>@conditionalexpr</k>
-            <v>895370</v>
+            <v>895536</v>
         </e>
         <e>
             <k>@addexpr</k>
-            <v>569921</v>
+            <v>570027</v>
         </e>
         <e>
             <k>@subexpr</k>
-            <v>465494</v>
+            <v>465581</v>
         </e>
         <e>
             <k>@mulexpr</k>
-            <v>434549</v>
+            <v>434630</v>
         </e>
         <e>
             <k>@divexpr</k>
-            <v>60159</v>
+            <v>58998</v>
         </e>
         <e>
             <k>@remexpr</k>
-            <v>20100</v>
+            <v>20080</v>
         </e>
         <e>
             <k>@paddexpr</k>
-            <v>118331</v>
+            <v>118353</v>
         </e>
         <e>
             <k>@psubexpr</k>
-            <v>67843</v>
+            <v>67856</v>
         </e>
         <e>
             <k>@pdiffexpr</k>
-            <v>43900</v>
+            <v>43732</v>
         </e>
         <e>
             <k>@lshiftexpr</k>
-            <v>550121</v>
+            <v>550224</v>
         </e>
         <e>
             <k>@rshiftexpr</k>
-            <v>199982</v>
+            <v>200019</v>
         </e>
         <e>
             <k>@andexpr</k>
-            <v>479844</v>
+            <v>479933</v>
         </e>
         <e>
             <k>@orexpr</k>
-            <v>193501</v>
+            <v>193537</v>
         </e>
         <e>
             <k>@xorexpr</k>
-            <v>73764</v>
+            <v>73778</v>
         </e>
         <e>
             <k>@eqexpr</k>
-            <v>641535</v>
+            <v>641654</v>
         </e>
         <e>
             <k>@neexpr</k>
-            <v>410719</v>
+            <v>410795</v>
         </e>
         <e>
             <k>@gtexpr</k>
-            <v>110832</v>
+            <v>110852</v>
         </e>
         <e>
             <k>@ltexpr</k>
-            <v>139031</v>
+            <v>139057</v>
         </e>
         <e>
             <k>@geexpr</k>
-            <v>81151</v>
+            <v>81166</v>
         </e>
         <e>
             <k>@leexpr</k>
-            <v>291203</v>
+            <v>291256</v>
         </e>
         <e>
             <k>@assignexpr</k>
-            <v>1277487</v>
+            <v>1277725</v>
         </e>
         <e>
             <k>@assignaddexpr</k>
@@ -614,23 +618,23 @@
         </e>
         <e>
             <k>@assignsubexpr</k>
-            <v>15263</v>
+            <v>15266</v>
         </e>
         <e>
             <k>@assignmulexpr</k>
-            <v>14065</v>
+            <v>13754</v>
         </e>
         <e>
             <k>@assigndivexpr</k>
-            <v>6789</v>
+            <v>6791</v>
         </e>
         <e>
             <k>@assignremexpr</k>
-            <v>875</v>
+            <v>872</v>
         </e>
         <e>
             <k>@assignlshiftexpr</k>
-            <v>3693</v>
+            <v>3694</v>
         </e>
         <e>
             <k>@assignrshiftexpr</k>
@@ -638,19 +642,19 @@
         </e>
         <e>
             <k>@assignandexpr</k>
-            <v>6509</v>
+            <v>6510</v>
         </e>
         <e>
             <k>@assignorexpr</k>
-            <v>19550</v>
+            <v>19554</v>
         </e>
         <e>
             <k>@assignxorexpr</k>
-            <v>29824</v>
+            <v>29829</v>
         </e>
         <e>
             <k>@assignpaddexpr</k>
-            <v>18574</v>
+            <v>18578</v>
         </e>
         <e>
             <k>@assignpsubexpr</k>
@@ -658,31 +662,31 @@
         </e>
         <e>
             <k>@andlogicalexpr</k>
-            <v>345599</v>
+            <v>345664</v>
         </e>
         <e>
             <k>@orlogicalexpr</k>
-            <v>1100373</v>
+            <v>1100577</v>
         </e>
         <e>
             <k>@commaexpr</k>
-            <v>169097</v>
+            <v>168450</v>
         </e>
         <e>
             <k>@subscriptexpr</k>
-            <v>433900</v>
+            <v>433981</v>
         </e>
         <e>
             <k>@callexpr</k>
-            <v>300995</v>
+            <v>300697</v>
         </e>
         <e>
             <k>@vastartexpr</k>
-            <v>5084</v>
+            <v>5071</v>
         </e>
         <e>
             <k>@vaargexpr</k>
-            <v>1299</v>
+            <v>1300</v>
         </e>
         <e>
             <k>@vaendexpr</k>
@@ -690,43 +694,43 @@
         </e>
         <e>
             <k>@vacopyexpr</k>
-            <v>171</v>
+            <v>170</v>
         </e>
         <e>
             <k>@varaccess</k>
-            <v>8231069</v>
+            <v>8232597</v>
         </e>
         <e>
             <k>@runtime_sizeof</k>
-            <v>400899</v>
+            <v>400974</v>
         </e>
         <e>
             <k>@runtime_alignof</k>
-            <v>62611</v>
+            <v>62549</v>
         </e>
         <e>
             <k>@expr_stmt</k>
-            <v>147941</v>
+            <v>147968</v>
         </e>
         <e>
             <k>@routineexpr</k>
-            <v>6134772</v>
+            <v>6134315</v>
         </e>
         <e>
             <k>@type_operand</k>
-            <v>1401351</v>
+            <v>1401612</v>
         </e>
         <e>
             <k>@offsetofexpr</k>
-            <v>148598</v>
+            <v>148626</v>
         </e>
         <e>
             <k>@typescompexpr</k>
-            <v>699930</v>
+            <v>700060</v>
         </e>
         <e>
             <k>@literal</k>
-            <v>6101485</v>
+            <v>6102022</v>
         </e>
         <e>
             <k>@aggregateliteral</k>
@@ -734,31 +738,31 @@
         </e>
         <e>
             <k>@c_style_cast</k>
-            <v>6025595</v>
+            <v>6026987</v>
         </e>
         <e>
             <k>@temp_init</k>
-            <v>1075277</v>
+            <v>1073608</v>
         </e>
         <e>
             <k>@errorexpr</k>
-            <v>57350</v>
+            <v>57293</v>
         </e>
         <e>
             <k>@reference_to</k>
-            <v>2184503</v>
+            <v>2182339</v>
         </e>
         <e>
             <k>@ref_indirect</k>
-            <v>2645319</v>
+            <v>2642698</v>
         </e>
         <e>
             <k>@vacuous_destructor_call</k>
-            <v>9836</v>
+            <v>9826</v>
         </e>
         <e>
             <k>@assume</k>
-            <v>4394</v>
+            <v>4383</v>
         </e>
         <e>
             <k>@conjugation</k>
@@ -766,11 +770,11 @@
         </e>
         <e>
             <k>@realpartexpr</k>
-            <v>94</v>
+            <v>92</v>
         </e>
         <e>
             <k>@imagpartexpr</k>
-            <v>94</v>
+            <v>92</v>
         </e>
         <e>
             <k>@jmulexpr</k>
@@ -810,35 +814,35 @@
         </e>
         <e>
             <k>@thisaccess</k>
-            <v>1518451</v>
+            <v>1514600</v>
         </e>
         <e>
             <k>@new_expr</k>
-            <v>57992</v>
+            <v>57934</v>
         </e>
         <e>
             <k>@delete_expr</k>
-            <v>14412</v>
+            <v>14398</v>
         </e>
         <e>
             <k>@throw_expr</k>
-            <v>26141</v>
+            <v>26079</v>
         </e>
         <e>
             <k>@condition_decl</k>
-            <v>437622</v>
+            <v>437589</v>
         </e>
         <e>
             <k>@braced_init_list</k>
-            <v>2331</v>
+            <v>2328</v>
         </e>
         <e>
             <k>@type_id</k>
-            <v>60130</v>
+            <v>60071</v>
         </e>
         <e>
             <k>@sizeof_pack</k>
-            <v>2181</v>
+            <v>2178</v>
         </e>
         <e>
             <k>@hasassignexpr</k>
@@ -866,7 +870,7 @@
         </e>
         <e>
             <k>@hastrivialconstr</k>
-            <v>3</v>
+            <v>7</v>
         </e>
         <e>
             <k>@hastrivialcopy</k>
@@ -890,23 +894,23 @@
         </e>
         <e>
             <k>@isclassexpr</k>
-            <v>2538</v>
+            <v>2531</v>
         </e>
         <e>
             <k>@isconvtoexpr</k>
-            <v>250</v>
+            <v>249</v>
         </e>
         <e>
             <k>@isemptyexpr</k>
-            <v>8880</v>
+            <v>8846</v>
         </e>
         <e>
             <k>@isenumexpr</k>
-            <v>2376</v>
+            <v>2990</v>
         </e>
         <e>
             <k>@ispodexpr</k>
-            <v>1065</v>
+            <v>1041</v>
         </e>
         <e>
             <k>@ispolyexpr</k>
@@ -922,75 +926,75 @@
         </e>
         <e>
             <k>@hastrivialdestructor</k>
-            <v>555</v>
+            <v>3503</v>
         </e>
         <e>
             <k>@uuidof</k>
-            <v>28057</v>
+            <v>27985</v>
         </e>
         <e>
             <k>@delete_array_expr</k>
-            <v>1591</v>
+            <v>1556</v>
         </e>
         <e>
             <k>@new_array_expr</k>
-            <v>6932</v>
+            <v>6914</v>
         </e>
         <e>
             <k>@foldexpr</k>
-            <v>1368</v>
+            <v>1367</v>
         </e>
         <e>
             <k>@ctordirectinit</k>
-            <v>141602</v>
+            <v>141461</v>
         </e>
         <e>
             <k>@ctorvirtualinit</k>
-            <v>5046</v>
+            <v>5041</v>
         </e>
         <e>
             <k>@ctorfieldinit</k>
-            <v>258185</v>
+            <v>257929</v>
         </e>
         <e>
             <k>@ctordelegatinginit</k>
-            <v>3627</v>
+            <v>3613</v>
         </e>
         <e>
             <k>@dtordirectdestruct</k>
-            <v>49481</v>
+            <v>49432</v>
         </e>
         <e>
             <k>@dtorvirtualdestruct</k>
-            <v>5003</v>
+            <v>4998</v>
         </e>
         <e>
             <k>@dtorfielddestruct</k>
-            <v>49994</v>
+            <v>49945</v>
         </e>
         <e>
             <k>@static_cast</k>
-            <v>389474</v>
+            <v>387985</v>
         </e>
         <e>
             <k>@reinterpret_cast</k>
-            <v>41835</v>
+            <v>41729</v>
         </e>
         <e>
             <k>@const_cast</k>
-            <v>30706</v>
+            <v>30676</v>
         </e>
         <e>
             <k>@dynamic_cast</k>
-            <v>1011</v>
+            <v>989</v>
         </e>
         <e>
             <k>@lambdaexpr</k>
-            <v>17748</v>
+            <v>17730</v>
         </e>
         <e>
             <k>@param_ref</k>
-            <v>177835</v>
+            <v>177449</v>
         </e>
         <e>
             <k>@noopexpr</k>
@@ -998,7 +1002,7 @@
         </e>
         <e>
             <k>@istriviallyconstructibleexpr</k>
-            <v>2376</v>
+            <v>3737</v>
         </e>
         <e>
             <k>@isdestructibleexpr</k>
@@ -1010,19 +1014,19 @@
         </e>
         <e>
             <k>@istriviallydestructibleexpr</k>
-            <v>1000</v>
+            <v>996</v>
         </e>
         <e>
             <k>@istriviallyassignableexpr</k>
-            <v>2376</v>
+            <v>3737</v>
         </e>
         <e>
             <k>@isnothrowassignableexpr</k>
-            <v>5127</v>
+            <v>5108</v>
         </e>
         <e>
             <k>@istrivialexpr</k>
-            <v>1375</v>
+            <v>3644</v>
         </e>
         <e>
             <k>@isstandardlayoutexpr</k>
@@ -1030,7 +1034,7 @@
         </e>
         <e>
             <k>@istriviallycopyableexpr</k>
-            <v>598</v>
+            <v>1538</v>
         </e>
         <e>
             <k>@isliteraltypeexpr</k>
@@ -1050,11 +1054,11 @@
         </e>
         <e>
             <k>@isconstructibleexpr</k>
-            <v>3627</v>
+            <v>3613</v>
         </e>
         <e>
             <k>@isnothrowconstructibleexpr</k>
-            <v>20761</v>
+            <v>20682</v>
         </e>
         <e>
             <k>@hasfinalizerexpr</k>
@@ -1090,11 +1094,11 @@
         </e>
         <e>
             <k>@isfinalexpr</k>
-            <v>11803</v>
+            <v>11792</v>
         </e>
         <e>
             <k>@noexceptexpr</k>
-            <v>30854</v>
+            <v>30678</v>
         </e>
         <e>
             <k>@builtinshufflevector</k>
@@ -1102,11 +1106,11 @@
         </e>
         <e>
             <k>@builtinchooseexpr</k>
-            <v>20642</v>
+            <v>20646</v>
         </e>
         <e>
             <k>@builtinaddressof</k>
-            <v>16294</v>
+            <v>16278</v>
         </e>
         <e>
             <k>@vec_fill</k>
@@ -1146,11 +1150,11 @@
         </e>
         <e>
             <k>@builtinbitcast</k>
-            <v>250</v>
+            <v>249</v>
         </e>
         <e>
             <k>@builtinshuffle</k>
-            <v>782</v>
+            <v>764</v>
         </e>
         <e>
             <k>@blockassignexpr</k>
@@ -1266,7 +1270,7 @@
         </e>
         <e>
             <k>@reuseexpr</k>
-            <v>906491</v>
+            <v>906424</v>
         </e>
         <e>
             <k>@istriviallycopyassignable</k>
@@ -1362,11 +1366,11 @@
         </e>
         <e>
             <k>@c11_generic</k>
-            <v>30031</v>
+            <v>30036</v>
         </e>
         <e>
             <k>@requires_expr</k>
-            <v>17661</v>
+            <v>17660</v>
         </e>
         <e>
             <k>@nested_requirement</k>
@@ -1374,87 +1378,87 @@
         </e>
         <e>
             <k>@compound_requirement</k>
-            <v>11720</v>
+            <v>11719</v>
         </e>
         <e>
             <k>@concept_id</k>
-            <v>96781</v>
+            <v>96773</v>
         </e>
         <e>
             <k>@lambdacapture</k>
-            <v>28523</v>
+            <v>28450</v>
         </e>
         <e>
             <k>@stmt_expr</k>
-            <v>2025815</v>
+            <v>2026191</v>
         </e>
         <e>
             <k>@stmt_if</k>
-            <v>987388</v>
+            <v>987571</v>
         </e>
         <e>
             <k>@stmt_while</k>
-            <v>39534</v>
+            <v>39542</v>
         </e>
         <e>
             <k>@stmt_goto</k>
-            <v>151155</v>
+            <v>151183</v>
         </e>
         <e>
             <k>@stmt_label</k>
-            <v>72498</v>
+            <v>72512</v>
         </e>
         <e>
             <k>@stmt_return</k>
-            <v>1508953</v>
+            <v>1507458</v>
         </e>
         <e>
             <k>@stmt_block</k>
-            <v>1846814</v>
+            <v>1839752</v>
         </e>
         <e>
             <k>@stmt_end_test_while</k>
-            <v>232974</v>
+            <v>233017</v>
         </e>
         <e>
             <k>@stmt_for</k>
-            <v>84148</v>
+            <v>84163</v>
         </e>
         <e>
             <k>@stmt_switch_case</k>
-            <v>894840</v>
+            <v>894773</v>
         </e>
         <e>
             <k>@stmt_switch</k>
-            <v>440777</v>
+            <v>440744</v>
         </e>
         <e>
             <k>@stmt_asm</k>
-            <v>64015</v>
+            <v>64027</v>
         </e>
         <e>
             <k>@stmt_decl</k>
-            <v>768980</v>
+            <v>767030</v>
         </e>
         <e>
             <k>@stmt_empty</k>
-            <v>459543</v>
+            <v>459509</v>
         </e>
         <e>
             <k>@stmt_continue</k>
-            <v>28011</v>
+            <v>28016</v>
         </e>
         <e>
             <k>@stmt_break</k>
-            <v>140276</v>
+            <v>139921</v>
         </e>
         <e>
             <k>@stmt_try_block</k>
-            <v>28918</v>
+            <v>28885</v>
         </e>
         <e>
             <k>@stmt_microsoft_try</k>
-            <v>224</v>
+            <v>223</v>
         </e>
         <e>
             <k>@stmt_set_vla_size</k>
@@ -1466,19 +1470,19 @@
         </e>
         <e>
             <k>@stmt_assigned_goto</k>
-            <v>12391</v>
+            <v>12393</v>
         </e>
         <e>
             <k>@stmt_range_based_for</k>
-            <v>7398</v>
+            <v>7391</v>
         </e>
         <e>
             <k>@stmt_handler</k>
-            <v>47389</v>
+            <v>47330</v>
         </e>
         <e>
             <k>@stmt_constexpr_if</k>
-            <v>103934</v>
+            <v>103537</v>
         </e>
         <e>
             <k>@stmt_co_return</k>
@@ -1494,43 +1498,43 @@
         </e>
         <e>
             <k>@ppd_if</k>
-            <v>589589</v>
+            <v>587335</v>
         </e>
         <e>
             <k>@ppd_ifdef</k>
-            <v>213751</v>
+            <v>213791</v>
         </e>
         <e>
             <k>@ppd_ifndef</k>
-            <v>157794</v>
+            <v>157824</v>
         </e>
         <e>
             <k>@ppd_elif</k>
-            <v>27982</v>
+            <v>27363</v>
         </e>
         <e>
             <k>@ppd_else</k>
-            <v>236511</v>
+            <v>235606</v>
         </e>
         <e>
             <k>@ppd_endif</k>
-            <v>886636</v>
+            <v>883245</v>
         </e>
         <e>
             <k>@ppd_plain_include</k>
-            <v>406728</v>
+            <v>397722</v>
         </e>
         <e>
             <k>@ppd_define</k>
-            <v>2749584</v>
+            <v>2739070</v>
         </e>
         <e>
             <k>@ppd_undef</k>
-            <v>101058</v>
+            <v>100671</v>
         </e>
         <e>
             <k>@ppd_pragma</k>
-            <v>407234</v>
+            <v>405677</v>
         </e>
         <e>
             <k>@ppd_include_next</k>
@@ -1538,11 +1542,11 @@
         </e>
         <e>
             <k>@ppd_line</k>
-            <v>19055</v>
+            <v>18866</v>
         </e>
         <e>
             <k>@ppd_error</k>
-            <v>125</v>
+            <v>124</v>
         </e>
         <e>
             <k>@ppd_objc_import</k>
@@ -1566,7 +1570,7 @@
         </e>
         <e>
             <k>@link_target</k>
-            <v>943</v>
+            <v>923</v>
         </e>
         <e>
             <k>@xmldtd</k>
@@ -1596,11 +1600,11 @@
     <stats>
         <relation>
             <name>compilations</name>
-            <cardinality>16142</cardinality>
+            <cardinality>15784</cardinality>
             <columnsizes>
                 <e>
                     <k>id</k>
-                    <v>16142</v>
+                    <v>15784</v>
                 </e>
                 <e>
                     <k>cwd</k>
@@ -1618,7 +1622,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>16142</v>
+                                    <v>15784</v>
                                 </b>
                             </bs>
                         </hist>
@@ -1644,19 +1648,19 @@
         </relation>
         <relation>
             <name>compilation_args</name>
-            <cardinality>1292348</cardinality>
+            <cardinality>1263730</cardinality>
             <columnsizes>
                 <e>
                     <k>id</k>
-                    <v>16142</v>
+                    <v>15784</v>
                 </e>
                 <e>
                     <k>num</k>
-                    <v>1874</v>
+                    <v>1833</v>
                 </e>
                 <e>
                     <k>arg</k>
-                    <v>37368</v>
+                    <v>36541</v>
                 </e>
             </columnsizes>
             <dependencies>
@@ -1670,77 +1674,77 @@
                                 <b>
                                     <a>36</a>
                                     <b>42</b>
-                                    <v>1281</v>
+                                    <v>1252</v>
                                 </b>
                                 <b>
                                     <a>42</a>
                                     <b>43</b>
-                                    <v>1402</v>
+                                    <v>1371</v>
                                 </b>
                                 <b>
                                     <a>43</a>
                                     <b>44</b>
-                                    <v>917</v>
+                                    <v>896</v>
                                 </b>
                                 <b>
                                     <a>44</a>
                                     <b>45</b>
-                                    <v>647</v>
+                                    <v>632</v>
                                 </b>
                                 <b>
                                     <a>45</a>
                                     <b>51</b>
-                                    <v>1213</v>
+                                    <v>1186</v>
                                 </b>
                                 <b>
                                     <a>51</a>
                                     <b>70</b>
-                                    <v>620</v>
+                                    <v>606</v>
                                 </b>
                                 <b>
                                     <a>71</a>
                                     <b>72</b>
-                                    <v>903</v>
+                                    <v>883</v>
                                 </b>
                                 <b>
                                     <a>72</a>
                                     <b>90</b>
-                                    <v>1146</v>
+                                    <v>1120</v>
                                 </b>
                                 <b>
                                     <a>94</a>
                                     <b>96</b>
-                                    <v>498</v>
+                                    <v>487</v>
                                 </b>
                                 <b>
                                     <a>98</a>
                                     <b>99</b>
-                                    <v>1712</v>
+                                    <v>1674</v>
                                 </b>
                                 <b>
                                     <a>100</a>
                                     <b>102</b>
-                                    <v>121</v>
+                                    <v>118</v>
                                 </b>
                                 <b>
                                     <a>103</a>
                                     <b>104</b>
-                                    <v>2548</v>
+                                    <v>2492</v>
                                 </b>
                                 <b>
                                     <a>104</a>
                                     <b>119</b>
-                                    <v>1362</v>
+                                    <v>1331</v>
                                 </b>
                                 <b>
                                     <a>120</a>
                                     <b>138</b>
-                                    <v>1186</v>
+                                    <v>1160</v>
                                 </b>
                                 <b>
                                     <a>139</a>
                                     <b>140</b>
-                                    <v>579</v>
+                                    <v>567</v>
                                 </b>
                             </bs>
                         </hist>
@@ -1756,67 +1760,67 @@
                                 <b>
                                     <a>34</a>
                                     <b>38</b>
-                                    <v>755</v>
+                                    <v>738</v>
                                 </b>
                                 <b>
                                     <a>38</a>
                                     <b>39</b>
-                                    <v>1914</v>
+                                    <v>1872</v>
                                 </b>
                                 <b>
                                     <a>39</a>
                                     <b>40</b>
-                                    <v>1254</v>
+                                    <v>1226</v>
                                 </b>
                                 <b>
                                     <a>40</a>
                                     <b>42</b>
-                                    <v>1389</v>
+                                    <v>1358</v>
                                 </b>
                                 <b>
                                     <a>42</a>
                                     <b>53</b>
-                                    <v>768</v>
+                                    <v>751</v>
                                 </b>
                                 <b>
                                     <a>53</a>
                                     <b>54</b>
-                                    <v>903</v>
+                                    <v>883</v>
                                 </b>
                                 <b>
                                     <a>54</a>
                                     <b>63</b>
-                                    <v>1146</v>
+                                    <v>1120</v>
                                 </b>
                                 <b>
                                     <a>64</a>
                                     <b>67</b>
-                                    <v>512</v>
+                                    <v>501</v>
                                 </b>
                                 <b>
                                     <a>67</a>
                                     <b>68</b>
-                                    <v>1793</v>
+                                    <v>1753</v>
                                 </b>
                                 <b>
                                     <a>68</a>
                                     <b>70</b>
-                                    <v>1240</v>
+                                    <v>1213</v>
                                 </b>
                                 <b>
                                     <a>70</a>
                                     <b>71</b>
-                                    <v>1793</v>
+                                    <v>1753</v>
                                 </b>
                                 <b>
                                     <a>73</a>
                                     <b>79</b>
-                                    <v>1213</v>
+                                    <v>1186</v>
                                 </b>
                                 <b>
                                     <a>79</a>
                                     <b>89</b>
-                                    <v>1442</v>
+                                    <v>1411</v>
                                 </b>
                                 <b>
                                     <a>89</a>
@@ -1837,57 +1841,57 @@
                                 <b>
                                     <a>43</a>
                                     <b>90</b>
-                                    <v>80</v>
+                                    <v>79</v>
                                 </b>
                                 <b>
                                     <a>90</a>
                                     <b>108</b>
-                                    <v>148</v>
+                                    <v>145</v>
                                 </b>
                                 <b>
                                     <a>108</a>
                                     <b>183</b>
-                                    <v>134</v>
+                                    <v>131</v>
                                 </b>
                                 <b>
                                     <a>198</a>
                                     <b>422</b>
-                                    <v>148</v>
+                                    <v>145</v>
                                 </b>
                                 <b>
                                     <a>422</a>
                                     <b>595</b>
-                                    <v>161</v>
+                                    <v>158</v>
                                 </b>
                                 <b>
                                     <a>595</a>
                                     <b>605</b>
-                                    <v>161</v>
+                                    <v>158</v>
                                 </b>
                                 <b>
                                     <a>605</a>
                                     <b>749</b>
-                                    <v>148</v>
+                                    <v>145</v>
                                 </b>
                                 <b>
                                     <a>750</a>
                                     <b>778</b>
-                                    <v>148</v>
+                                    <v>145</v>
                                 </b>
                                 <b>
                                     <a>781</a>
                                     <b>883</b>
-                                    <v>148</v>
+                                    <v>145</v>
                                 </b>
                                 <b>
                                     <a>930</a>
                                     <b>1190</b>
-                                    <v>107</v>
+                                    <v>105</v>
                                 </b>
                                 <b>
                                     <a>1197</a>
                                     <b>1198</b>
-                                    <v>485</v>
+                                    <v>474</v>
                                 </b>
                             </bs>
                         </hist>
@@ -1903,67 +1907,67 @@
                                 <b>
                                     <a>1</a>
                                     <b>5</b>
-                                    <v>161</v>
+                                    <v>158</v>
                                 </b>
                                 <b>
                                     <a>5</a>
                                     <b>7</b>
-                                    <v>148</v>
+                                    <v>145</v>
                                 </b>
                                 <b>
                                     <a>9</a>
                                     <b>12</b>
-                                    <v>94</v>
+                                    <v>92</v>
                                 </b>
                                 <b>
                                     <a>12</a>
                                     <b>15</b>
-                                    <v>148</v>
+                                    <v>145</v>
                                 </b>
                                 <b>
                                     <a>15</a>
                                     <b>18</b>
-                                    <v>121</v>
+                                    <v>118</v>
                                 </b>
                                 <b>
                                     <a>18</a>
                                     <b>22</b>
-                                    <v>148</v>
+                                    <v>145</v>
                                 </b>
                                 <b>
                                     <a>22</a>
                                     <b>27</b>
-                                    <v>161</v>
+                                    <v>158</v>
                                 </b>
                                 <b>
                                     <a>27</a>
                                     <b>29</b>
-                                    <v>107</v>
+                                    <v>105</v>
                                 </b>
                                 <b>
                                     <a>29</a>
                                     <b>34</b>
-                                    <v>148</v>
+                                    <v>145</v>
                                 </b>
                                 <b>
                                     <a>34</a>
                                     <b>44</b>
-                                    <v>161</v>
+                                    <v>158</v>
                                 </b>
                                 <b>
                                     <a>45</a>
                                     <b>63</b>
-                                    <v>148</v>
+                                    <v>145</v>
                                 </b>
                                 <b>
                                     <a>67</a>
                                     <b>94</b>
-                                    <v>148</v>
+                                    <v>145</v>
                                 </b>
                                 <b>
                                     <a>94</a>
                                     <b>164</b>
-                                    <v>148</v>
+                                    <v>145</v>
                                 </b>
                                 <b>
                                     <a>171</a>
@@ -1984,22 +1988,22 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>17113</v>
+                                    <v>16734</v>
                                 </b>
                                 <b>
                                     <a>2</a>
                                     <b>3</b>
-                                    <v>16196</v>
+                                    <v>15837</v>
                                 </b>
                                 <b>
                                     <a>3</a>
                                     <b>103</b>
-                                    <v>2805</v>
+                                    <v>2742</v>
                                 </b>
                                 <b>
                                     <a>104</a>
                                     <b>1198</b>
-                                    <v>1254</v>
+                                    <v>1226</v>
                                 </b>
                             </bs>
                         </hist>
@@ -2015,17 +2019,17 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>24746</v>
+                                    <v>24198</v>
                                 </b>
                                 <b>
                                     <a>2</a>
                                     <b>3</b>
-                                    <v>11139</v>
+                                    <v>10892</v>
                                 </b>
                                 <b>
                                     <a>3</a>
                                     <b>62</b>
-                                    <v>1483</v>
+                                    <v>1450</v>
                                 </b>
                             </bs>
                         </hist>
@@ -2035,11 +2039,11 @@
         </relation>
         <relation>
             <name>compilation_build_mode</name>
-            <cardinality>16142</cardinality>
+            <cardinality>15784</cardinality>
             <columnsizes>
                 <e>
                     <k>id</k>
-                    <v>16142</v>
+                    <v>15784</v>
                 </e>
                 <e>
                     <k>mode</k>
@@ -2057,7 +2061,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>16142</v>
+                                    <v>15784</v>
                                 </b>
                             </bs>
                         </hist>
@@ -2083,11 +2087,11 @@
         </relation>
         <relation>
             <name>compilation_compiling_files</name>
-            <cardinality>16142</cardinality>
+            <cardinality>15784</cardinality>
             <columnsizes>
                 <e>
                     <k>id</k>
-                    <v>16142</v>
+                    <v>15784</v>
                 </e>
                 <e>
                     <k>num</k>
@@ -2095,7 +2099,7 @@
                 </e>
                 <e>
                     <k>file</k>
-                    <v>7390</v>
+                    <v>7226</v>
                 </e>
             </columnsizes>
             <dependencies>
@@ -2109,7 +2113,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>16142</v>
+                                    <v>15784</v>
                                 </b>
                             </bs>
                         </hist>
@@ -2125,7 +2129,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>16142</v>
+                                    <v>15784</v>
                                 </b>
                             </bs>
                         </hist>
@@ -2173,12 +2177,12 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>175</v>
+                                    <v>171</v>
                                 </b>
                                 <b>
                                     <a>2</a>
                                     <b>3</b>
-                                    <v>7187</v>
+                                    <v>7028</v>
                                 </b>
                                 <b>
                                     <a>28</a>
@@ -2199,7 +2203,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>7390</v>
+                                    <v>7226</v>
                                 </b>
                             </bs>
                         </hist>
@@ -2209,11 +2213,11 @@
         </relation>
         <relation>
             <name>compilation_time</name>
-            <cardinality>64299</cardinality>
+            <cardinality>62875</cardinality>
             <columnsizes>
                 <e>
                     <k>id</k>
-                    <v>16074</v>
+                    <v>15718</v>
                 </e>
                 <e>
                     <k>num</k>
@@ -2221,11 +2225,11 @@
                 </e>
                 <e>
                     <k>kind</k>
-                    <v>53</v>
+                    <v>52</v>
                 </e>
                 <e>
                     <k>seconds</k>
-                    <v>17801</v>
+                    <v>17604</v>
                 </e>
             </columnsizes>
             <dependencies>
@@ -2239,7 +2243,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>16074</v>
+                                    <v>15718</v>
                                 </b>
                             </bs>
                         </hist>
@@ -2255,7 +2259,7 @@
                                 <b>
                                     <a>4</a>
                                     <b>5</b>
-                                    <v>16074</v>
+                                    <v>15718</v>
                                 </b>
                             </bs>
                         </hist>
@@ -2271,17 +2275,17 @@
                                 <b>
                                     <a>2</a>
                                     <b>3</b>
-                                    <v>107</v>
+                                    <v>105</v>
                                 </b>
                                 <b>
                                     <a>3</a>
                                     <b>4</b>
-                                    <v>7821</v>
+                                    <v>7661</v>
                                 </b>
                                 <b>
                                     <a>4</a>
                                     <b>5</b>
-                                    <v>8145</v>
+                                    <v>7951</v>
                                 </b>
                             </bs>
                         </hist>
@@ -2327,8 +2331,8 @@
                             <budget>12</budget>
                             <bs>
                                 <b>
-                                    <a>1320</a>
-                                    <b>1321</b>
+                                    <a>1335</a>
+                                    <b>1336</b>
                                     <v>13</v>
                                 </b>
                             </bs>
@@ -2345,7 +2349,7 @@
                                 <b>
                                     <a>1192</a>
                                     <b>1193</b>
-                                    <v>53</v>
+                                    <v>52</v>
                                 </b>
                             </bs>
                         </hist>
@@ -2361,7 +2365,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>53</v>
+                                    <v>52</v>
                                 </b>
                             </bs>
                         </hist>
@@ -2375,23 +2379,23 @@
                             <budget>12</budget>
                             <bs>
                                 <b>
-                                    <a>9</a>
-                                    <b>10</b>
+                                    <a>10</a>
+                                    <b>11</b>
                                     <v>13</v>
                                 </b>
                                 <b>
-                                    <a>12</a>
-                                    <b>13</b>
+                                    <a>11</a>
+                                    <b>12</b>
                                     <v>13</v>
                                 </b>
                                 <b>
-                                    <a>718</a>
-                                    <b>719</b>
+                                    <a>752</a>
+                                    <b>753</b>
                                     <v>13</v>
                                 </b>
                                 <b>
-                                    <a>792</a>
-                                    <b>793</b>
+                                    <a>775</a>
+                                    <b>776</b>
                                     <v>13</v>
                                 </b>
                             </bs>
@@ -2408,27 +2412,22 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>11233</v>
+                                    <v>11327</v>
                                 </b>
                                 <b>
                                     <a>2</a>
                                     <b>3</b>
-                                    <v>3910</v>
+                                    <v>3494</v>
                                 </b>
                                 <b>
                                     <a>3</a>
                                     <b>4</b>
-                                    <v>1200</v>
+                                    <v>1463</v>
                                 </b>
                                 <b>
                                     <a>4</a>
-                                    <b>24</b>
-                                    <v>1335</v>
-                                </b>
-                                <b>
-                                    <a>24</a>
-                                    <b>696</b>
-                                    <v>121</v>
+                                    <b>695</b>
+                                    <v>1318</v>
                                 </b>
                             </bs>
                         </hist>
@@ -2444,7 +2443,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>17801</v>
+                                    <v>17604</v>
                                 </b>
                             </bs>
                         </hist>
@@ -2460,17 +2459,17 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>14969</v>
+                                    <v>14822</v>
                                 </b>
                                 <b>
                                     <a>2</a>
                                     <b>3</b>
-                                    <v>2818</v>
+                                    <v>2756</v>
                                 </b>
                                 <b>
                                     <a>3</a>
                                     <b>4</b>
-                                    <v>13</v>
+                                    <v>26</v>
                                 </b>
                             </bs>
                         </hist>
@@ -2480,7 +2479,7 @@
         </relation>
         <relation>
             <name>diagnostic_for</name>
-            <cardinality>4444</cardinality>
+            <cardinality>4443</cardinality>
             <columnsizes>
                 <e>
                     <k>diagnostic</k>
@@ -2726,19 +2725,19 @@
         </relation>
         <relation>
             <name>compilation_finished</name>
-            <cardinality>16142</cardinality>
+            <cardinality>15784</cardinality>
             <columnsizes>
                 <e>
                     <k>id</k>
-                    <v>16142</v>
+                    <v>15784</v>
                 </e>
                 <e>
                     <k>cpu_seconds</k>
-                    <v>12164</v>
+                    <v>11815</v>
                 </e>
                 <e>
                     <k>elapsed_seconds</k>
-                    <v>256</v>
+                    <v>250</v>
                 </e>
             </columnsizes>
             <dependencies>
@@ -2752,7 +2751,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>16142</v>
+                                    <v>15784</v>
                                 </b>
                             </bs>
                         </hist>
@@ -2768,7 +2767,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>16142</v>
+                                    <v>15784</v>
                                 </b>
                             </bs>
                         </hist>
@@ -2784,17 +2783,17 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>10168</v>
+                                    <v>9877</v>
                                 </b>
                                 <b>
                                     <a>2</a>
                                     <b>3</b>
-                                    <v>1402</v>
+                                    <v>1397</v>
                                 </b>
                                 <b>
                                     <a>3</a>
-                                    <b>24</b>
-                                    <v>593</v>
+                                    <b>37</b>
+                                    <v>540</v>
                                 </b>
                             </bs>
                         </hist>
@@ -2810,12 +2809,12 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>11368</v>
+                                    <v>10998</v>
                                 </b>
                                 <b>
                                     <a>2</a>
                                     <b>3</b>
-                                    <v>795</v>
+                                    <v>817</v>
                                 </b>
                             </bs>
                         </hist>
@@ -2831,12 +2830,12 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>40</v>
+                                    <v>39</v>
                                 </b>
                                 <b>
                                     <a>2</a>
                                     <b>3</b>
-                                    <v>26</v>
+                                    <v>39</v>
                                 </b>
                                 <b>
                                     <a>3</a>
@@ -2849,28 +2848,13 @@
                                     <v>13</v>
                                 </b>
                                 <b>
-                                    <a>6</a>
-                                    <b>7</b>
-                                    <v>13</v>
+                                    <a>11</a>
+                                    <b>12</b>
+                                    <v>26</v>
                                 </b>
                                 <b>
-                                    <a>7</a>
-                                    <b>8</b>
-                                    <v>13</v>
-                                </b>
-                                <b>
-                                    <a>9</a>
-                                    <b>10</b>
-                                    <v>13</v>
-                                </b>
-                                <b>
-                                    <a>10</a>
-                                    <b>11</b>
-                                    <v>13</v>
-                                </b>
-                                <b>
-                                    <a>15</a>
-                                    <b>16</b>
+                                    <a>14</a>
+                                    <b>15</b>
                                     <v>13</v>
                                 </b>
                                 <b>
@@ -2879,28 +2863,33 @@
                                     <v>13</v>
                                 </b>
                                 <b>
-                                    <a>32</a>
-                                    <b>33</b>
+                                    <a>19</a>
+                                    <b>20</b>
                                     <v>13</v>
                                 </b>
                                 <b>
-                                    <a>48</a>
-                                    <b>49</b>
+                                    <a>26</a>
+                                    <b>27</b>
                                     <v>13</v>
                                 </b>
                                 <b>
-                                    <a>157</a>
-                                    <b>158</b>
+                                    <a>50</a>
+                                    <b>51</b>
                                     <v>13</v>
                                 </b>
                                 <b>
-                                    <a>249</a>
-                                    <b>250</b>
+                                    <a>148</a>
+                                    <b>149</b>
                                     <v>13</v>
                                 </b>
                                 <b>
-                                    <a>309</a>
-                                    <b>310</b>
+                                    <a>250</a>
+                                    <b>251</b>
+                                    <v>13</v>
+                                </b>
+                                <b>
+                                    <a>311</a>
+                                    <b>312</b>
                                     <v>13</v>
                                 </b>
                                 <b>
@@ -2922,12 +2911,12 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>40</v>
+                                    <v>39</v>
                                 </b>
                                 <b>
                                     <a>2</a>
                                     <b>3</b>
-                                    <v>26</v>
+                                    <v>39</v>
                                 </b>
                                 <b>
                                     <a>3</a>
@@ -2940,28 +2929,13 @@
                                     <v>13</v>
                                 </b>
                                 <b>
-                                    <a>6</a>
-                                    <b>7</b>
-                                    <v>13</v>
+                                    <a>11</a>
+                                    <b>12</b>
+                                    <v>26</v>
                                 </b>
                                 <b>
-                                    <a>7</a>
-                                    <b>8</b>
-                                    <v>13</v>
-                                </b>
-                                <b>
-                                    <a>8</a>
-                                    <b>9</b>
-                                    <v>13</v>
-                                </b>
-                                <b>
-                                    <a>10</a>
-                                    <b>11</b>
-                                    <v>13</v>
-                                </b>
-                                <b>
-                                    <a>15</a>
-                                    <b>16</b>
+                                    <a>14</a>
+                                    <b>15</b>
                                     <v>13</v>
                                 </b>
                                 <b>
@@ -2970,33 +2944,38 @@
                                     <v>13</v>
                                 </b>
                                 <b>
-                                    <a>32</a>
-                                    <b>33</b>
+                                    <a>19</a>
+                                    <b>20</b>
                                     <v>13</v>
                                 </b>
                                 <b>
-                                    <a>48</a>
-                                    <b>49</b>
+                                    <a>26</a>
+                                    <b>27</b>
                                     <v>13</v>
                                 </b>
                                 <b>
-                                    <a>147</a>
-                                    <b>148</b>
+                                    <a>49</a>
+                                    <b>50</b>
                                     <v>13</v>
                                 </b>
                                 <b>
-                                    <a>170</a>
-                                    <b>171</b>
+                                    <a>143</a>
+                                    <b>144</b>
                                     <v>13</v>
                                 </b>
                                 <b>
-                                    <a>222</a>
-                                    <b>223</b>
+                                    <a>173</a>
+                                    <b>174</b>
                                     <v>13</v>
                                 </b>
                                 <b>
-                                    <a>264</a>
-                                    <b>265</b>
+                                    <a>220</a>
+                                    <b>221</b>
+                                    <v>13</v>
+                                </b>
+                                <b>
+                                    <a>258</a>
+                                    <b>259</b>
                                     <v>13</v>
                                 </b>
                             </bs>
@@ -3223,11 +3202,11 @@
         </relation>
         <relation>
             <name>sourceLocationPrefix</name>
-            <cardinality>125</cardinality>
+            <cardinality>124</cardinality>
             <columnsizes>
                 <e>
                     <k>prefix</k>
-                    <v>125</v>
+                    <v>124</v>
                 </e>
             </columnsizes>
             <dependencies/>
@@ -4721,15 +4700,15 @@
         </relation>
         <relation>
             <name>extractor_version</name>
-            <cardinality>125</cardinality>
+            <cardinality>124</cardinality>
             <columnsizes>
                 <e>
                     <k>codeql_version</k>
-                    <v>125</v>
+                    <v>124</v>
                 </e>
                 <e>
                     <k>frontend_version</k>
-                    <v>125</v>
+                    <v>124</v>
                 </e>
             </columnsizes>
             <dependencies>
@@ -4743,7 +4722,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>125</v>
+                                    <v>124</v>
                                 </b>
                             </bs>
                         </hist>
@@ -4759,7 +4738,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>125</v>
+                                    <v>124</v>
                                 </b>
                             </bs>
                         </hist>
@@ -4769,31 +4748,31 @@
         </relation>
         <relation>
             <name>locations_default</name>
-            <cardinality>36226754</cardinality>
+            <cardinality>36090715</cardinality>
             <columnsizes>
                 <e>
                     <k>id</k>
-                    <v>36226754</v>
+                    <v>36090715</v>
                 </e>
                 <e>
                     <k>container</k>
-                    <v>41023</v>
+                    <v>40866</v>
                 </e>
                 <e>
                     <k>startLine</k>
-                    <v>7495820</v>
+                    <v>7467156</v>
                 </e>
                 <e>
                     <k>startColumn</k>
-                    <v>21262</v>
+                    <v>21180</v>
                 </e>
                 <e>
                     <k>endLine</k>
-                    <v>7497821</v>
+                    <v>7469149</v>
                 </e>
                 <e>
                     <k>endColumn</k>
-                    <v>53530</v>
+                    <v>53326</v>
                 </e>
             </columnsizes>
             <dependencies>
@@ -4807,7 +4786,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>36226754</v>
+                                    <v>36090715</v>
                                 </b>
                             </bs>
                         </hist>
@@ -4823,7 +4802,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>36226754</v>
+                                    <v>36090715</v>
                                 </b>
                             </bs>
                         </hist>
@@ -4839,7 +4818,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>36226754</v>
+                                    <v>36090715</v>
                                 </b>
                             </bs>
                         </hist>
@@ -4855,7 +4834,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>36226754</v>
+                                    <v>36090715</v>
                                 </b>
                             </bs>
                         </hist>
@@ -4871,7 +4850,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>36226754</v>
+                                    <v>36090715</v>
                                 </b>
                             </bs>
                         </hist>
@@ -4887,67 +4866,67 @@
                                 <b>
                                     <a>1</a>
                                     <b>15</b>
-                                    <v>3126</v>
+                                    <v>3114</v>
                                 </b>
                                 <b>
                                     <a>15</a>
                                     <b>41</b>
-                                    <v>3126</v>
+                                    <v>3114</v>
                                 </b>
                                 <b>
                                     <a>42</a>
                                     <b>66</b>
-                                    <v>3376</v>
+                                    <v>3364</v>
                                 </b>
                                 <b>
                                     <a>67</a>
                                     <b>95</b>
-                                    <v>3126</v>
+                                    <v>3114</v>
                                 </b>
                                 <b>
                                     <a>98</a>
                                     <b>124</b>
-                                    <v>3251</v>
+                                    <v>3239</v>
                                 </b>
                                 <b>
                                     <a>124</a>
                                     <b>174</b>
-                                    <v>3376</v>
+                                    <v>3364</v>
                                 </b>
                                 <b>
                                     <a>175</a>
                                     <b>228</b>
-                                    <v>3126</v>
+                                    <v>3114</v>
                                 </b>
                                 <b>
                                     <a>230</a>
                                     <b>303</b>
-                                    <v>3126</v>
+                                    <v>3114</v>
                                 </b>
                                 <b>
                                     <a>305</a>
                                     <b>406</b>
-                                    <v>3126</v>
+                                    <v>3114</v>
                                 </b>
                                 <b>
                                     <a>408</a>
                                     <b>596</b>
-                                    <v>3251</v>
+                                    <v>3239</v>
                                 </b>
                                 <b>
                                     <a>598</a>
                                     <b>943</b>
-                                    <v>3126</v>
+                                    <v>3114</v>
                                 </b>
                                 <b>
                                     <a>986</a>
                                     <b>2568</b>
-                                    <v>3251</v>
+                                    <v>3114</v>
                                 </b>
                                 <b>
-                                    <a>2725</a>
+                                    <a>2587</a>
                                     <b>57658</b>
-                                    <v>2626</v>
+                                    <v>2741</v>
                                 </b>
                             </bs>
                         </hist>
@@ -4963,67 +4942,67 @@
                                 <b>
                                     <a>1</a>
                                     <b>13</b>
-                                    <v>3502</v>
+                                    <v>3488</v>
                                 </b>
                                 <b>
                                     <a>13</a>
                                     <b>29</b>
-                                    <v>3251</v>
+                                    <v>3239</v>
                                 </b>
                                 <b>
                                     <a>29</a>
                                     <b>42</b>
-                                    <v>3126</v>
+                                    <v>3114</v>
                                 </b>
                                 <b>
                                     <a>42</a>
                                     <b>58</b>
-                                    <v>3376</v>
+                                    <v>3364</v>
                                 </b>
                                 <b>
                                     <a>58</a>
                                     <b>76</b>
-                                    <v>3126</v>
+                                    <v>3114</v>
                                 </b>
                                 <b>
                                     <a>77</a>
                                     <b>102</b>
-                                    <v>3251</v>
+                                    <v>3239</v>
                                 </b>
                                 <b>
                                     <a>102</a>
                                     <b>134</b>
-                                    <v>3126</v>
+                                    <v>3114</v>
                                 </b>
                                 <b>
                                     <a>134</a>
                                     <b>173</b>
-                                    <v>3126</v>
+                                    <v>3114</v>
                                 </b>
                                 <b>
                                     <a>173</a>
                                     <b>242</b>
-                                    <v>3126</v>
+                                    <v>3114</v>
                                 </b>
                                 <b>
                                     <a>243</a>
                                     <b>348</b>
-                                    <v>3126</v>
+                                    <v>3114</v>
                                 </b>
                                 <b>
                                     <a>348</a>
                                     <b>489</b>
-                                    <v>3126</v>
+                                    <v>3114</v>
                                 </b>
                                 <b>
                                     <a>493</a>
                                     <b>1269</b>
-                                    <v>3126</v>
+                                    <v>3114</v>
                                 </b>
                                 <b>
                                     <a>1337</a>
                                     <b>57597</b>
-                                    <v>2626</v>
+                                    <v>2616</v>
                                 </b>
                             </bs>
                         </hist>
@@ -5039,67 +5018,67 @@
                                 <b>
                                     <a>1</a>
                                     <b>4</b>
-                                    <v>2251</v>
+                                    <v>2242</v>
                                 </b>
                                 <b>
                                     <a>4</a>
                                     <b>7</b>
-                                    <v>3126</v>
+                                    <v>3114</v>
                                 </b>
                                 <b>
                                     <a>7</a>
                                     <b>12</b>
-                                    <v>3502</v>
+                                    <v>3488</v>
                                 </b>
                                 <b>
                                     <a>12</a>
                                     <b>16</b>
-                                    <v>3126</v>
+                                    <v>3114</v>
                                 </b>
                                 <b>
                                     <a>16</a>
                                     <b>22</b>
-                                    <v>3376</v>
+                                    <v>3364</v>
                                 </b>
                                 <b>
                                     <a>22</a>
                                     <b>28</b>
-                                    <v>3126</v>
+                                    <v>3114</v>
                                 </b>
                                 <b>
                                     <a>28</a>
                                     <b>33</b>
-                                    <v>3251</v>
+                                    <v>3239</v>
                                 </b>
                                 <b>
                                     <a>33</a>
                                     <b>39</b>
-                                    <v>3376</v>
+                                    <v>3364</v>
                                 </b>
                                 <b>
                                     <a>39</a>
                                     <b>48</b>
-                                    <v>3376</v>
+                                    <v>3364</v>
                                 </b>
                                 <b>
                                     <a>48</a>
                                     <b>60</b>
-                                    <v>3376</v>
+                                    <v>3364</v>
                                 </b>
                                 <b>
                                     <a>60</a>
                                     <b>82</b>
-                                    <v>3376</v>
+                                    <v>3364</v>
                                 </b>
                                 <b>
                                     <a>83</a>
                                     <b>98</b>
-                                    <v>3251</v>
+                                    <v>3239</v>
                                 </b>
                                 <b>
                                     <a>98</a>
                                     <b>141</b>
-                                    <v>2501</v>
+                                    <v>2491</v>
                                 </b>
                             </bs>
                         </hist>
@@ -5115,67 +5094,67 @@
                                 <b>
                                     <a>1</a>
                                     <b>13</b>
-                                    <v>3502</v>
+                                    <v>3488</v>
                                 </b>
                                 <b>
                                     <a>13</a>
                                     <b>29</b>
-                                    <v>3251</v>
+                                    <v>3239</v>
                                 </b>
                                 <b>
                                     <a>29</a>
                                     <b>42</b>
-                                    <v>3126</v>
+                                    <v>3114</v>
                                 </b>
                                 <b>
                                     <a>42</a>
                                     <b>58</b>
-                                    <v>3376</v>
+                                    <v>3364</v>
                                 </b>
                                 <b>
                                     <a>58</a>
                                     <b>76</b>
-                                    <v>3126</v>
+                                    <v>3114</v>
                                 </b>
                                 <b>
                                     <a>77</a>
                                     <b>102</b>
-                                    <v>3251</v>
+                                    <v>3239</v>
                                 </b>
                                 <b>
                                     <a>102</a>
                                     <b>134</b>
-                                    <v>3126</v>
+                                    <v>3114</v>
                                 </b>
                                 <b>
                                     <a>134</a>
                                     <b>173</b>
-                                    <v>3251</v>
+                                    <v>3239</v>
                                 </b>
                                 <b>
                                     <a>174</a>
                                     <b>244</b>
-                                    <v>3126</v>
+                                    <v>3114</v>
                                 </b>
                                 <b>
                                     <a>246</a>
                                     <b>348</b>
-                                    <v>3126</v>
+                                    <v>3114</v>
                                 </b>
                                 <b>
                                     <a>348</a>
                                     <b>494</b>
-                                    <v>3126</v>
+                                    <v>3114</v>
                                 </b>
                                 <b>
                                     <a>513</a>
                                     <b>1349</b>
-                                    <v>3126</v>
+                                    <v>3114</v>
                                 </b>
                                 <b>
                                     <a>1407</a>
                                     <b>57597</b>
-                                    <v>2501</v>
+                                    <v>2491</v>
                                 </b>
                             </bs>
                         </hist>
@@ -5191,67 +5170,67 @@
                                 <b>
                                     <a>1</a>
                                     <b>12</b>
-                                    <v>3376</v>
+                                    <v>3364</v>
                                 </b>
                                 <b>
                                     <a>13</a>
                                     <b>24</b>
-                                    <v>3251</v>
+                                    <v>3239</v>
                                 </b>
                                 <b>
                                     <a>25</a>
                                     <b>33</b>
-                                    <v>3251</v>
+                                    <v>3239</v>
                                 </b>
                                 <b>
                                     <a>33</a>
                                     <b>39</b>
-                                    <v>3376</v>
+                                    <v>3364</v>
                                 </b>
                                 <b>
                                     <a>39</a>
                                     <b>45</b>
-                                    <v>3627</v>
+                                    <v>3613</v>
                                 </b>
                                 <b>
                                     <a>45</a>
                                     <b>54</b>
-                                    <v>3126</v>
+                                    <v>3114</v>
                                 </b>
                                 <b>
                                     <a>54</a>
                                     <b>62</b>
-                                    <v>3627</v>
+                                    <v>3613</v>
                                 </b>
                                 <b>
                                     <a>62</a>
                                     <b>71</b>
-                                    <v>3376</v>
+                                    <v>3364</v>
                                 </b>
                                 <b>
                                     <a>71</a>
                                     <b>83</b>
-                                    <v>3502</v>
+                                    <v>3488</v>
                                 </b>
                                 <b>
                                     <a>83</a>
                                     <b>99</b>
-                                    <v>3126</v>
+                                    <v>3114</v>
                                 </b>
                                 <b>
                                     <a>99</a>
                                     <b>114</b>
-                                    <v>3126</v>
+                                    <v>3114</v>
                                 </b>
                                 <b>
                                     <a>114</a>
-                                    <b>136</b>
-                                    <v>3126</v>
+                                    <b>143</b>
+                                    <v>3114</v>
                                 </b>
                                 <b>
                                     <a>147</a>
                                     <b>363</b>
-                                    <v>1125</v>
+                                    <v>1121</v>
                                 </b>
                             </bs>
                         </hist>
@@ -5267,32 +5246,32 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>4960358</v>
+                                    <v>4941390</v>
                                 </b>
                                 <b>
                                     <a>2</a>
                                     <b>3</b>
-                                    <v>800711</v>
+                                    <v>797649</v>
                                 </b>
                                 <b>
                                     <a>3</a>
                                     <b>4</b>
-                                    <v>566326</v>
+                                    <v>564160</v>
                                 </b>
                                 <b>
                                     <a>4</a>
                                     <b>12</b>
-                                    <v>593091</v>
+                                    <v>590823</v>
                                 </b>
                                 <b>
                                     <a>12</a>
                                     <b>210</b>
-                                    <v>562324</v>
+                                    <v>560173</v>
                                 </b>
                                 <b>
                                     <a>210</a>
                                     <b>534</b>
-                                    <v>13007</v>
+                                    <v>12957</v>
                                 </b>
                             </bs>
                         </hist>
@@ -5308,27 +5287,27 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>5018642</v>
+                                    <v>4999451</v>
                                 </b>
                                 <b>
                                     <a>2</a>
                                     <b>3</b>
-                                    <v>1234586</v>
+                                    <v>1229865</v>
                                 </b>
                                 <b>
                                     <a>3</a>
                                     <b>6</b>
-                                    <v>664132</v>
+                                    <v>661593</v>
                                 </b>
                                 <b>
                                     <a>6</a>
                                     <b>106</b>
-                                    <v>562324</v>
+                                    <v>560173</v>
                                 </b>
                                 <b>
                                     <a>107</a>
                                     <b>329</b>
-                                    <v>16134</v>
+                                    <v>16072</v>
                                 </b>
                             </bs>
                         </hist>
@@ -5344,27 +5323,27 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>5655509</v>
+                                    <v>5633882</v>
                                 </b>
                                 <b>
                                     <a>2</a>
                                     <b>3</b>
-                                    <v>532682</v>
+                                    <v>530645</v>
                                 </b>
                                 <b>
                                     <a>3</a>
                                     <b>7</b>
-                                    <v>579333</v>
+                                    <v>577118</v>
                                 </b>
                                 <b>
                                     <a>7</a>
                                     <b>24</b>
-                                    <v>571454</v>
+                                    <v>569269</v>
                                 </b>
                                 <b>
                                     <a>24</a>
                                     <b>72</b>
-                                    <v>156840</v>
+                                    <v>156240</v>
                                 </b>
                             </bs>
                         </hist>
@@ -5380,12 +5359,12 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>7320969</v>
+                                    <v>7292974</v>
                                 </b>
                                 <b>
                                     <a>2</a>
                                     <b>81</b>
-                                    <v>174850</v>
+                                    <v>174182</v>
                                 </b>
                             </bs>
                         </hist>
@@ -5401,27 +5380,27 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>5027272</v>
+                                    <v>5008048</v>
                                 </b>
                                 <b>
                                     <a>2</a>
                                     <b>3</b>
-                                    <v>767567</v>
+                                    <v>764632</v>
                                 </b>
                                 <b>
                                     <a>3</a>
                                     <b>4</b>
-                                    <v>559822</v>
+                                    <v>557681</v>
                                 </b>
                                 <b>
                                     <a>4</a>
                                     <b>12</b>
-                                    <v>604348</v>
+                                    <v>602037</v>
                                 </b>
                                 <b>
                                     <a>12</a>
                                     <b>235</b>
-                                    <v>536809</v>
+                                    <v>534756</v>
                                 </b>
                             </bs>
                         </hist>
@@ -5437,67 +5416,67 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>1500</v>
+                                    <v>1495</v>
                                 </b>
                                 <b>
                                     <a>2</a>
                                     <b>4</b>
-                                    <v>1876</v>
+                                    <v>1868</v>
                                 </b>
                                 <b>
                                     <a>4</a>
                                     <b>9</b>
-                                    <v>1625</v>
+                                    <v>1619</v>
                                 </b>
                                 <b>
                                     <a>9</a>
                                     <b>19</b>
-                                    <v>1751</v>
+                                    <v>1744</v>
                                 </b>
                                 <b>
                                     <a>20</a>
                                     <b>74</b>
-                                    <v>1625</v>
+                                    <v>1619</v>
                                 </b>
                                 <b>
                                     <a>81</a>
                                     <b>173</b>
-                                    <v>1625</v>
+                                    <v>1619</v>
                                 </b>
                                 <b>
                                     <a>173</a>
                                     <b>435</b>
-                                    <v>1625</v>
+                                    <v>1619</v>
                                 </b>
                                 <b>
                                     <a>468</a>
                                     <b>904</b>
-                                    <v>1625</v>
+                                    <v>1619</v>
                                 </b>
                                 <b>
                                     <a>945</a>
                                     <b>1309</b>
-                                    <v>1625</v>
+                                    <v>1619</v>
                                 </b>
                                 <b>
                                     <a>1328</a>
                                     <b>1510</b>
-                                    <v>1625</v>
+                                    <v>1619</v>
                                 </b>
                                 <b>
                                     <a>1531</a>
                                     <b>1774</b>
-                                    <v>1625</v>
+                                    <v>1619</v>
                                 </b>
                                 <b>
                                     <a>1834</a>
                                     <b>2887</b>
-                                    <v>1625</v>
+                                    <v>1619</v>
                                 </b>
                                 <b>
                                     <a>3491</a>
                                     <b>119749</b>
-                                    <v>1500</v>
+                                    <v>1495</v>
                                 </b>
                             </bs>
                         </hist>
@@ -5513,67 +5492,67 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>1876</v>
+                                    <v>1868</v>
                                 </b>
                                 <b>
                                     <a>2</a>
                                     <b>4</b>
-                                    <v>1751</v>
+                                    <v>1744</v>
                                 </b>
                                 <b>
                                     <a>4</a>
                                     <b>6</b>
-                                    <v>1500</v>
+                                    <v>1495</v>
                                 </b>
                                 <b>
                                     <a>6</a>
                                     <b>11</b>
-                                    <v>1751</v>
+                                    <v>1744</v>
                                 </b>
                                 <b>
                                     <a>11</a>
                                     <b>33</b>
-                                    <v>1625</v>
+                                    <v>1619</v>
                                 </b>
                                 <b>
                                     <a>34</a>
                                     <b>45</b>
-                                    <v>1625</v>
+                                    <v>1619</v>
                                 </b>
                                 <b>
                                     <a>50</a>
                                     <b>75</b>
-                                    <v>1751</v>
+                                    <v>1744</v>
                                 </b>
                                 <b>
                                     <a>78</a>
                                     <b>98</b>
-                                    <v>1751</v>
+                                    <v>1744</v>
                                 </b>
                                 <b>
                                     <a>101</a>
                                     <b>131</b>
-                                    <v>1625</v>
+                                    <v>1619</v>
                                 </b>
                                 <b>
                                     <a>131</a>
                                     <b>147</b>
-                                    <v>1876</v>
+                                    <v>1868</v>
                                 </b>
                                 <b>
                                     <a>149</a>
                                     <b>161</b>
-                                    <v>1625</v>
+                                    <v>1619</v>
                                 </b>
                                 <b>
                                     <a>162</a>
                                     <b>198</b>
-                                    <v>1625</v>
+                                    <v>1619</v>
                                 </b>
                                 <b>
                                     <a>202</a>
                                     <b>329</b>
-                                    <v>875</v>
+                                    <v>872</v>
                                 </b>
                             </bs>
                         </hist>
@@ -5589,67 +5568,67 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>1625</v>
+                                    <v>1619</v>
                                 </b>
                                 <b>
                                     <a>2</a>
                                     <b>4</b>
-                                    <v>1876</v>
+                                    <v>1868</v>
                                 </b>
                                 <b>
                                     <a>4</a>
                                     <b>9</b>
-                                    <v>1625</v>
+                                    <v>1619</v>
                                 </b>
                                 <b>
                                     <a>9</a>
                                     <b>19</b>
-                                    <v>1751</v>
+                                    <v>1744</v>
                                 </b>
                                 <b>
                                     <a>20</a>
                                     <b>74</b>
-                                    <v>1625</v>
+                                    <v>1619</v>
                                 </b>
                                 <b>
                                     <a>80</a>
                                     <b>169</b>
-                                    <v>1625</v>
+                                    <v>1619</v>
                                 </b>
                                 <b>
                                     <a>171</a>
                                     <b>432</b>
-                                    <v>1625</v>
+                                    <v>1619</v>
                                 </b>
                                 <b>
                                     <a>467</a>
                                     <b>822</b>
-                                    <v>1625</v>
+                                    <v>1619</v>
                                 </b>
                                 <b>
                                     <a>861</a>
                                     <b>1001</b>
-                                    <v>1625</v>
+                                    <v>1619</v>
                                 </b>
                                 <b>
                                     <a>1002</a>
                                     <b>1190</b>
-                                    <v>1625</v>
+                                    <v>1619</v>
                                 </b>
                                 <b>
                                     <a>1201</a>
                                     <b>1338</b>
-                                    <v>1625</v>
+                                    <v>1619</v>
                                 </b>
                                 <b>
                                     <a>1347</a>
                                     <b>1920</b>
-                                    <v>1625</v>
+                                    <v>1619</v>
                                 </b>
                                 <b>
                                     <a>2210</a>
                                     <b>59360</b>
-                                    <v>1375</v>
+                                    <v>1370</v>
                                 </b>
                             </bs>
                         </hist>
@@ -5665,67 +5644,67 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>1625</v>
+                                    <v>1619</v>
                                 </b>
                                 <b>
                                     <a>2</a>
                                     <b>4</b>
-                                    <v>1876</v>
+                                    <v>1868</v>
                                 </b>
                                 <b>
                                     <a>4</a>
                                     <b>9</b>
-                                    <v>1625</v>
+                                    <v>1619</v>
                                 </b>
                                 <b>
                                     <a>9</a>
                                     <b>19</b>
-                                    <v>1751</v>
+                                    <v>1744</v>
                                 </b>
                                 <b>
                                     <a>20</a>
                                     <b>74</b>
-                                    <v>1625</v>
+                                    <v>1619</v>
                                 </b>
                                 <b>
                                     <a>80</a>
                                     <b>169</b>
-                                    <v>1625</v>
+                                    <v>1619</v>
                                 </b>
                                 <b>
                                     <a>171</a>
                                     <b>432</b>
-                                    <v>1625</v>
+                                    <v>1619</v>
                                 </b>
                                 <b>
                                     <a>467</a>
                                     <b>822</b>
-                                    <v>1625</v>
+                                    <v>1619</v>
                                 </b>
                                 <b>
                                     <a>861</a>
                                     <b>1003</b>
-                                    <v>1625</v>
+                                    <v>1619</v>
                                 </b>
                                 <b>
                                     <a>1003</a>
                                     <b>1198</b>
-                                    <v>1625</v>
+                                    <v>1619</v>
                                 </b>
                                 <b>
                                     <a>1201</a>
                                     <b>1338</b>
-                                    <v>1625</v>
+                                    <v>1619</v>
                                 </b>
                                 <b>
                                     <a>1347</a>
                                     <b>1920</b>
-                                    <v>1625</v>
+                                    <v>1619</v>
                                 </b>
                                 <b>
                                     <a>2220</a>
                                     <b>59375</b>
-                                    <v>1375</v>
+                                    <v>1370</v>
                                 </b>
                             </bs>
                         </hist>
@@ -5741,67 +5720,67 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>1876</v>
+                                    <v>1868</v>
                                 </b>
                                 <b>
                                     <a>2</a>
                                     <b>4</b>
-                                    <v>1751</v>
+                                    <v>1744</v>
                                 </b>
                                 <b>
                                     <a>4</a>
                                     <b>7</b>
-                                    <v>1876</v>
+                                    <v>1868</v>
                                 </b>
                                 <b>
                                     <a>7</a>
                                     <b>13</b>
-                                    <v>1751</v>
+                                    <v>1744</v>
                                 </b>
                                 <b>
                                     <a>13</a>
                                     <b>21</b>
-                                    <v>1751</v>
+                                    <v>1744</v>
                                 </b>
                                 <b>
                                     <a>21</a>
                                     <b>29</b>
-                                    <v>1625</v>
+                                    <v>1619</v>
                                 </b>
                                 <b>
                                     <a>29</a>
                                     <b>37</b>
-                                    <v>1500</v>
+                                    <v>1495</v>
                                 </b>
                                 <b>
                                     <a>37</a>
                                     <b>50</b>
-                                    <v>1625</v>
+                                    <v>1619</v>
                                 </b>
                                 <b>
                                     <a>50</a>
                                     <b>58</b>
-                                    <v>1625</v>
+                                    <v>1619</v>
                                 </b>
                                 <b>
                                     <a>61</a>
                                     <b>67</b>
-                                    <v>1751</v>
+                                    <v>1744</v>
                                 </b>
                                 <b>
                                     <a>67</a>
                                     <b>76</b>
-                                    <v>1751</v>
+                                    <v>1619</v>
                                 </b>
                                 <b>
                                     <a>76</a>
-                                    <b>140</b>
-                                    <v>1625</v>
+                                    <b>137</b>
+                                    <v>1619</v>
                                 </b>
                                 <b>
-                                    <a>144</a>
+                                    <a>139</a>
                                     <b>299</b>
-                                    <v>750</v>
+                                    <v>872</v>
                                 </b>
                             </bs>
                         </hist>
@@ -5817,32 +5796,32 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>4959983</v>
+                                    <v>4941016</v>
                                 </b>
                                 <b>
                                     <a>2</a>
                                     <b>3</b>
-                                    <v>807965</v>
+                                    <v>804876</v>
                                 </b>
                                 <b>
                                     <a>3</a>
                                     <b>4</b>
-                                    <v>561448</v>
+                                    <v>559301</v>
                                 </b>
                                 <b>
                                     <a>4</a>
                                     <b>12</b>
-                                    <v>593467</v>
+                                    <v>591197</v>
                                 </b>
                                 <b>
                                     <a>12</a>
                                     <b>214</b>
-                                    <v>562449</v>
+                                    <v>560298</v>
                                 </b>
                                 <b>
                                     <a>214</a>
                                     <b>530</b>
-                                    <v>12507</v>
+                                    <v>12459</v>
                                 </b>
                             </bs>
                         </hist>
@@ -5858,27 +5837,27 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>5017141</v>
+                                    <v>4997956</v>
                                 </b>
                                 <b>
                                     <a>2</a>
                                     <b>3</b>
-                                    <v>1237713</v>
+                                    <v>1232980</v>
                                 </b>
                                 <b>
                                     <a>3</a>
                                     <b>6</b>
-                                    <v>664507</v>
+                                    <v>661966</v>
                                 </b>
                                 <b>
                                     <a>6</a>
                                     <b>107</b>
-                                    <v>562449</v>
+                                    <v>560298</v>
                                 </b>
                                 <b>
                                     <a>107</a>
                                     <b>329</b>
-                                    <v>16009</v>
+                                    <v>15948</v>
                                 </b>
                             </bs>
                         </hist>
@@ -5894,12 +5873,12 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>7316466</v>
+                                    <v>7288488</v>
                                 </b>
                                 <b>
                                     <a>2</a>
                                     <b>7</b>
-                                    <v>181354</v>
+                                    <v>180661</v>
                                 </b>
                             </bs>
                         </hist>
@@ -5915,27 +5894,27 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>5658136</v>
+                                    <v>5636499</v>
                                 </b>
                                 <b>
                                     <a>2</a>
                                     <b>3</b>
-                                    <v>531306</v>
+                                    <v>529274</v>
                                 </b>
                                 <b>
                                     <a>3</a>
                                     <b>7</b>
-                                    <v>580209</v>
+                                    <v>577990</v>
                                 </b>
                                 <b>
                                     <a>7</a>
                                     <b>24</b>
-                                    <v>571079</v>
+                                    <v>568895</v>
                                 </b>
                                 <b>
                                     <a>24</a>
                                     <b>72</b>
-                                    <v>157090</v>
+                                    <v>156489</v>
                                 </b>
                             </bs>
                         </hist>
@@ -5951,27 +5930,27 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>5027147</v>
+                                    <v>5007923</v>
                                 </b>
                                 <b>
                                     <a>2</a>
                                     <b>3</b>
-                                    <v>774196</v>
+                                    <v>771235</v>
                                 </b>
                                 <b>
                                     <a>3</a>
                                     <b>4</b>
-                                    <v>555194</v>
+                                    <v>553071</v>
                                 </b>
                                 <b>
                                     <a>4</a>
                                     <b>12</b>
-                                    <v>605348</v>
+                                    <v>603034</v>
                                 </b>
                                 <b>
                                     <a>12</a>
                                     <b>235</b>
-                                    <v>535933</v>
+                                    <v>533884</v>
                                 </b>
                             </bs>
                         </hist>
@@ -5987,52 +5966,52 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>15759</v>
+                                    <v>15698</v>
                                 </b>
                                 <b>
                                     <a>2</a>
                                     <b>3</b>
-                                    <v>5628</v>
+                                    <v>5606</v>
                                 </b>
                                 <b>
                                     <a>3</a>
-                                    <b>6</b>
-                                    <v>4127</v>
+                                    <b>7</b>
+                                    <v>4485</v>
                                 </b>
                                 <b>
-                                    <a>6</a>
-                                    <b>16</b>
-                                    <v>4252</v>
+                                    <a>7</a>
+                                    <b>17</b>
+                                    <v>4111</v>
                                 </b>
                                 <b>
-                                    <a>16</a>
-                                    <b>29</b>
-                                    <v>4127</v>
+                                    <a>17</a>
+                                    <b>32</b>
+                                    <v>4236</v>
                                 </b>
                                 <b>
-                                    <a>30</a>
-                                    <b>97</b>
-                                    <v>4127</v>
+                                    <a>35</a>
+                                    <b>103</b>
+                                    <v>4111</v>
                                 </b>
                                 <b>
-                                    <a>97</a>
-                                    <b>518</b>
-                                    <v>4127</v>
+                                    <a>147</a>
+                                    <b>635</b>
+                                    <v>4111</v>
                                 </b>
                                 <b>
-                                    <a>523</a>
-                                    <b>1928</b>
-                                    <v>4127</v>
+                                    <a>651</a>
+                                    <b>2069</b>
+                                    <v>4111</v>
                                 </b>
                                 <b>
-                                    <a>1990</a>
-                                    <b>3352</b>
-                                    <v>4127</v>
+                                    <a>2137</a>
+                                    <b>3404</b>
+                                    <v>4111</v>
                                 </b>
                                 <b>
-                                    <a>3386</a>
+                                    <a>3430</a>
                                     <b>33692</b>
-                                    <v>3126</v>
+                                    <v>2741</v>
                                 </b>
                             </bs>
                         </hist>
@@ -6048,52 +6027,52 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>18760</v>
+                                    <v>18564</v>
                                 </b>
                                 <b>
                                     <a>2</a>
                                     <b>3</b>
-                                    <v>5628</v>
+                                    <v>5606</v>
                                 </b>
                                 <b>
                                     <a>3</a>
                                     <b>5</b>
-                                    <v>4127</v>
+                                    <v>4236</v>
                                 </b>
                                 <b>
                                     <a>5</a>
                                     <b>7</b>
-                                    <v>3376</v>
+                                    <v>3364</v>
                                 </b>
                                 <b>
                                     <a>7</a>
                                     <b>15</b>
-                                    <v>4752</v>
+                                    <v>4609</v>
                                 </b>
                                 <b>
                                     <a>15</a>
-                                    <b>79</b>
-                                    <v>4127</v>
+                                    <b>78</b>
+                                    <v>4111</v>
                                 </b>
                                 <b>
-                                    <a>80</a>
+                                    <a>78</a>
                                     <b>143</b>
-                                    <v>4127</v>
+                                    <v>4236</v>
                                 </b>
                                 <b>
                                     <a>150</a>
                                     <b>202</b>
-                                    <v>4127</v>
+                                    <v>4111</v>
                                 </b>
                                 <b>
                                     <a>203</a>
                                     <b>263</b>
-                                    <v>4127</v>
+                                    <v>4111</v>
                                 </b>
                                 <b>
                                     <a>266</a>
                                     <b>329</b>
-                                    <v>375</v>
+                                    <v>373</v>
                                 </b>
                             </bs>
                         </hist>
@@ -6109,52 +6088,52 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>16009</v>
+                                    <v>15948</v>
                                 </b>
                                 <b>
                                     <a>2</a>
                                     <b>3</b>
-                                    <v>6128</v>
+                                    <v>5980</v>
                                 </b>
                                 <b>
                                     <a>3</a>
-                                    <b>8</b>
-                                    <v>4127</v>
+                                    <b>7</b>
+                                    <v>4111</v>
                                 </b>
                                 <b>
-                                    <a>8</a>
+                                    <a>7</a>
                                     <b>17</b>
-                                    <v>4127</v>
+                                    <v>4236</v>
                                 </b>
                                 <b>
                                     <a>17</a>
                                     <b>35</b>
-                                    <v>4127</v>
+                                    <v>4111</v>
                                 </b>
                                 <b>
                                     <a>35</a>
                                     <b>140</b>
-                                    <v>4127</v>
+                                    <v>4111</v>
                                 </b>
                                 <b>
                                     <a>157</a>
                                     <b>601</b>
-                                    <v>4127</v>
+                                    <v>4111</v>
                                 </b>
                                 <b>
                                     <a>610</a>
-                                    <b>1713</b>
-                                    <v>4127</v>
+                                    <b>1714</b>
+                                    <v>4111</v>
                                 </b>
                                 <b>
                                     <a>1749</a>
                                     <b>2382</b>
-                                    <v>4127</v>
+                                    <v>4111</v>
                                 </b>
                                 <b>
                                     <a>2421</a>
                                     <b>30689</b>
-                                    <v>2501</v>
+                                    <v>2491</v>
                                 </b>
                             </bs>
                         </hist>
@@ -6170,52 +6149,52 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>17385</v>
+                                    <v>17318</v>
                                 </b>
                                 <b>
                                     <a>2</a>
                                     <b>3</b>
-                                    <v>6378</v>
+                                    <v>6354</v>
                                 </b>
                                 <b>
                                     <a>3</a>
                                     <b>4</b>
-                                    <v>3502</v>
+                                    <v>3114</v>
                                 </b>
                                 <b>
                                     <a>4</a>
                                     <b>6</b>
-                                    <v>3502</v>
+                                    <v>3862</v>
                                 </b>
                                 <b>
                                     <a>6</a>
                                     <b>11</b>
-                                    <v>4627</v>
+                                    <v>4609</v>
                                 </b>
                                 <b>
                                     <a>11</a>
                                     <b>22</b>
-                                    <v>4127</v>
+                                    <v>4111</v>
                                 </b>
                                 <b>
                                     <a>22</a>
                                     <b>40</b>
-                                    <v>4252</v>
+                                    <v>4236</v>
                                 </b>
                                 <b>
                                     <a>42</a>
                                     <b>60</b>
-                                    <v>4877</v>
+                                    <v>4859</v>
                                 </b>
                                 <b>
                                     <a>60</a>
                                     <b>68</b>
-                                    <v>4127</v>
+                                    <v>4111</v>
                                 </b>
                                 <b>
                                     <a>68</a>
                                     <b>73</b>
-                                    <v>750</v>
+                                    <v>747</v>
                                 </b>
                             </bs>
                         </hist>
@@ -6231,52 +6210,52 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>16009</v>
+                                    <v>15948</v>
                                 </b>
                                 <b>
                                     <a>2</a>
                                     <b>3</b>
-                                    <v>6128</v>
+                                    <v>5980</v>
                                 </b>
                                 <b>
                                     <a>3</a>
-                                    <b>8</b>
-                                    <v>4127</v>
+                                    <b>7</b>
+                                    <v>4111</v>
                                 </b>
                                 <b>
-                                    <a>8</a>
+                                    <a>7</a>
                                     <b>17</b>
-                                    <v>4252</v>
+                                    <v>4360</v>
                                 </b>
                                 <b>
                                     <a>17</a>
                                     <b>36</b>
-                                    <v>4252</v>
+                                    <v>4236</v>
                                 </b>
                                 <b>
                                     <a>36</a>
                                     <b>170</b>
-                                    <v>4127</v>
+                                    <v>4111</v>
                                 </b>
                                 <b>
                                     <a>173</a>
-                                    <b>619</b>
-                                    <v>4127</v>
+                                    <b>620</b>
+                                    <v>4111</v>
                                 </b>
                                 <b>
                                     <a>622</a>
                                     <b>1824</b>
-                                    <v>4127</v>
+                                    <v>4111</v>
                                 </b>
                                 <b>
                                     <a>1843</a>
                                     <b>2449</b>
-                                    <v>4127</v>
+                                    <v>4111</v>
                                 </b>
                                 <b>
                                     <a>2460</a>
                                     <b>30688</b>
-                                    <v>2251</v>
+                                    <v>2242</v>
                                 </b>
                             </bs>
                         </hist>
@@ -6286,19 +6265,19 @@
         </relation>
         <relation>
             <name>locations_stmt</name>
-            <cardinality>5202209</cardinality>
+            <cardinality>5203174</cardinality>
             <columnsizes>
                 <e>
                     <k>id</k>
-                    <v>5202209</v>
+                    <v>5203174</v>
                 </e>
                 <e>
                     <k>container</k>
-                    <v>4152</v>
+                    <v>4153</v>
                 </e>
                 <e>
                     <k>startLine</k>
-                    <v>272815</v>
+                    <v>272866</v>
                 </e>
                 <e>
                     <k>startColumn</k>
@@ -6306,11 +6285,11 @@
                 </e>
                 <e>
                     <k>endLine</k>
-                    <v>264987</v>
+                    <v>265036</v>
                 </e>
                 <e>
                     <k>endColumn</k>
-                    <v>3226</v>
+                    <v>3227</v>
                 </e>
             </columnsizes>
             <dependencies>
@@ -6324,7 +6303,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>5202209</v>
+                                    <v>5203174</v>
                                 </b>
                             </bs>
                         </hist>
@@ -6340,7 +6319,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>5202209</v>
+                                    <v>5203174</v>
                                 </b>
                             </bs>
                         </hist>
@@ -6356,7 +6335,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>5202209</v>
+                                    <v>5203174</v>
                                 </b>
                             </bs>
                         </hist>
@@ -6372,7 +6351,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>5202209</v>
+                                    <v>5203174</v>
                                 </b>
                             </bs>
                         </hist>
@@ -6388,7 +6367,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>5202209</v>
+                                    <v>5203174</v>
                                 </b>
                             </bs>
                         </hist>
@@ -6789,67 +6768,67 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>29405</v>
+                                    <v>29411</v>
                                 </b>
                                 <b>
                                     <a>2</a>
                                     <b>3</b>
-                                    <v>20875</v>
+                                    <v>20879</v>
                                 </b>
                                 <b>
                                     <a>3</a>
                                     <b>4</b>
-                                    <v>17031</v>
+                                    <v>17034</v>
                                 </b>
                                 <b>
                                     <a>4</a>
                                     <b>6</b>
-                                    <v>19725</v>
+                                    <v>19728</v>
                                 </b>
                                 <b>
                                     <a>6</a>
                                     <b>8</b>
-                                    <v>17087</v>
+                                    <v>17090</v>
                                 </b>
                                 <b>
                                     <a>8</a>
                                     <b>11</b>
-                                    <v>22811</v>
+                                    <v>22816</v>
                                 </b>
                                 <b>
                                     <a>11</a>
                                     <b>16</b>
-                                    <v>23569</v>
+                                    <v>23573</v>
                                 </b>
                                 <b>
                                     <a>16</a>
                                     <b>22</b>
-                                    <v>20931</v>
+                                    <v>20935</v>
                                 </b>
                                 <b>
                                     <a>22</a>
                                     <b>29</b>
-                                    <v>23232</v>
+                                    <v>23236</v>
                                 </b>
                                 <b>
                                     <a>29</a>
                                     <b>37</b>
-                                    <v>23681</v>
+                                    <v>23686</v>
                                 </b>
                                 <b>
                                     <a>37</a>
                                     <b>45</b>
-                                    <v>20623</v>
+                                    <v>20627</v>
                                 </b>
                                 <b>
                                     <a>45</a>
                                     <b>56</b>
-                                    <v>22138</v>
+                                    <v>22142</v>
                                 </b>
                                 <b>
                                     <a>56</a>
                                     <b>73</b>
-                                    <v>11700</v>
+                                    <v>11702</v>
                                 </b>
                             </bs>
                         </hist>
@@ -6865,67 +6844,67 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>30443</v>
+                                    <v>30449</v>
                                 </b>
                                 <b>
                                     <a>2</a>
                                     <b>3</b>
-                                    <v>21464</v>
+                                    <v>21468</v>
                                 </b>
                                 <b>
                                     <a>3</a>
                                     <b>4</b>
-                                    <v>17312</v>
+                                    <v>17315</v>
                                 </b>
                                 <b>
                                     <a>4</a>
                                     <b>6</b>
-                                    <v>19641</v>
+                                    <v>19644</v>
                                 </b>
                                 <b>
                                     <a>6</a>
                                     <b>8</b>
-                                    <v>17368</v>
+                                    <v>17371</v>
                                 </b>
                                 <b>
                                     <a>8</a>
                                     <b>11</b>
-                                    <v>23990</v>
+                                    <v>23994</v>
                                 </b>
                                 <b>
                                     <a>11</a>
                                     <b>16</b>
-                                    <v>22334</v>
+                                    <v>22338</v>
                                 </b>
                                 <b>
                                     <a>16</a>
                                     <b>22</b>
-                                    <v>22138</v>
+                                    <v>22142</v>
                                 </b>
                                 <b>
                                     <a>22</a>
                                     <b>29</b>
-                                    <v>23148</v>
+                                    <v>23152</v>
                                 </b>
                                 <b>
                                     <a>29</a>
                                     <b>36</b>
-                                    <v>21857</v>
+                                    <v>21861</v>
                                 </b>
                                 <b>
                                     <a>36</a>
                                     <b>44</b>
-                                    <v>22306</v>
+                                    <v>22310</v>
                                 </b>
                                 <b>
                                     <a>44</a>
                                     <b>54</b>
-                                    <v>21661</v>
+                                    <v>21665</v>
                                 </b>
                                 <b>
                                     <a>54</a>
                                     <b>68</b>
-                                    <v>9147</v>
+                                    <v>9148</v>
                                 </b>
                             </bs>
                         </hist>
@@ -6941,57 +6920,57 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>36616</v>
+                                    <v>36623</v>
                                 </b>
                                 <b>
                                     <a>2</a>
                                     <b>3</b>
-                                    <v>28451</v>
+                                    <v>28456</v>
                                 </b>
                                 <b>
                                     <a>3</a>
                                     <b>4</b>
-                                    <v>22952</v>
+                                    <v>22956</v>
                                 </b>
                                 <b>
                                     <a>4</a>
                                     <b>5</b>
-                                    <v>21970</v>
+                                    <v>21974</v>
                                 </b>
                                 <b>
                                     <a>5</a>
                                     <b>6</b>
-                                    <v>23793</v>
+                                    <v>23798</v>
                                 </b>
                                 <b>
                                     <a>6</a>
                                     <b>7</b>
-                                    <v>27104</v>
+                                    <v>27109</v>
                                 </b>
                                 <b>
                                     <a>7</a>
                                     <b>8</b>
-                                    <v>31061</v>
+                                    <v>31066</v>
                                 </b>
                                 <b>
                                     <a>8</a>
                                     <b>9</b>
-                                    <v>27890</v>
+                                    <v>27895</v>
                                 </b>
                                 <b>
                                     <a>9</a>
                                     <b>10</b>
-                                    <v>20426</v>
+                                    <v>20430</v>
                                 </b>
                                 <b>
                                     <a>10</a>
                                     <b>12</b>
-                                    <v>22699</v>
+                                    <v>22703</v>
                                 </b>
                                 <b>
                                     <a>12</a>
                                     <b>18</b>
-                                    <v>9848</v>
+                                    <v>9850</v>
                                 </b>
                             </bs>
                         </hist>
@@ -7007,67 +6986,67 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>47222</v>
+                                    <v>47231</v>
                                 </b>
                                 <b>
                                     <a>2</a>
                                     <b>3</b>
-                                    <v>35213</v>
+                                    <v>35220</v>
                                 </b>
                                 <b>
                                     <a>3</a>
                                     <b>4</b>
-                                    <v>25168</v>
+                                    <v>25173</v>
                                 </b>
                                 <b>
                                     <a>4</a>
                                     <b>5</b>
-                                    <v>22110</v>
+                                    <v>22114</v>
                                 </b>
                                 <b>
                                     <a>5</a>
                                     <b>6</b>
-                                    <v>17452</v>
+                                    <v>17455</v>
                                 </b>
                                 <b>
                                     <a>6</a>
                                     <b>7</b>
-                                    <v>16470</v>
+                                    <v>16473</v>
                                 </b>
                                 <b>
                                     <a>7</a>
                                     <b>8</b>
-                                    <v>13917</v>
+                                    <v>13919</v>
                                 </b>
                                 <b>
                                     <a>8</a>
                                     <b>9</b>
-                                    <v>15067</v>
+                                    <v>15070</v>
                                 </b>
                                 <b>
                                     <a>9</a>
                                     <b>10</b>
-                                    <v>14730</v>
+                                    <v>14733</v>
                                 </b>
                                 <b>
                                     <a>10</a>
                                     <b>11</b>
-                                    <v>14394</v>
+                                    <v>14396</v>
                                 </b>
                                 <b>
                                     <a>11</a>
                                     <b>12</b>
-                                    <v>13861</v>
+                                    <v>13863</v>
                                 </b>
                                 <b>
                                     <a>12</a>
                                     <b>14</b>
-                                    <v>21577</v>
+                                    <v>21581</v>
                                 </b>
                                 <b>
                                     <a>14</a>
                                     <b>24</b>
-                                    <v>15628</v>
+                                    <v>15631</v>
                                 </b>
                             </bs>
                         </hist>
@@ -7083,62 +7062,62 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>30219</v>
+                                    <v>30224</v>
                                 </b>
                                 <b>
                                     <a>2</a>
                                     <b>3</b>
-                                    <v>22110</v>
+                                    <v>22114</v>
                                 </b>
                                 <b>
                                     <a>3</a>
                                     <b>4</b>
-                                    <v>17677</v>
+                                    <v>17680</v>
                                 </b>
                                 <b>
                                     <a>4</a>
                                     <b>6</b>
-                                    <v>21941</v>
+                                    <v>21946</v>
                                 </b>
                                 <b>
                                     <a>6</a>
                                     <b>8</b>
-                                    <v>20062</v>
+                                    <v>20065</v>
                                 </b>
                                 <b>
                                     <a>8</a>
                                     <b>10</b>
-                                    <v>18013</v>
+                                    <v>18017</v>
                                 </b>
                                 <b>
                                     <a>10</a>
                                     <b>14</b>
-                                    <v>24944</v>
+                                    <v>24948</v>
                                 </b>
                                 <b>
                                     <a>14</a>
                                     <b>18</b>
-                                    <v>23232</v>
+                                    <v>23236</v>
                                 </b>
                                 <b>
                                     <a>18</a>
                                     <b>22</b>
-                                    <v>24074</v>
+                                    <v>24078</v>
                                 </b>
                                 <b>
                                     <a>22</a>
                                     <b>26</b>
-                                    <v>25224</v>
+                                    <v>25229</v>
                                 </b>
                                 <b>
                                     <a>26</a>
                                     <b>30</b>
-                                    <v>22531</v>
+                                    <v>22535</v>
                                 </b>
                                 <b>
                                     <a>30</a>
                                     <b>36</b>
-                                    <v>20679</v>
+                                    <v>20683</v>
                                 </b>
                                 <b>
                                     <a>36</a>
@@ -7529,67 +7508,67 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>23765</v>
+                                    <v>23770</v>
                                 </b>
                                 <b>
                                     <a>2</a>
                                     <b>3</b>
-                                    <v>19669</v>
+                                    <v>19672</v>
                                 </b>
                                 <b>
                                     <a>3</a>
                                     <b>4</b>
-                                    <v>15684</v>
+                                    <v>15687</v>
                                 </b>
                                 <b>
                                     <a>4</a>
                                     <b>6</b>
-                                    <v>21296</v>
+                                    <v>21300</v>
                                 </b>
                                 <b>
                                     <a>6</a>
                                     <b>8</b>
-                                    <v>17059</v>
+                                    <v>17062</v>
                                 </b>
                                 <b>
                                     <a>8</a>
                                     <b>11</b>
-                                    <v>21100</v>
+                                    <v>21104</v>
                                 </b>
                                 <b>
                                     <a>11</a>
                                     <b>15</b>
-                                    <v>20005</v>
+                                    <v>20009</v>
                                 </b>
                                 <b>
                                     <a>15</a>
                                     <b>21</b>
-                                    <v>21941</v>
+                                    <v>21946</v>
                                 </b>
                                 <b>
                                     <a>21</a>
                                     <b>27</b>
-                                    <v>21072</v>
+                                    <v>21076</v>
                                 </b>
                                 <b>
                                     <a>27</a>
                                     <b>34</b>
-                                    <v>20370</v>
+                                    <v>20374</v>
                                 </b>
                                 <b>
                                     <a>34</a>
                                     <b>42</b>
-                                    <v>21549</v>
+                                    <v>21553</v>
                                 </b>
                                 <b>
                                     <a>42</a>
                                     <b>51</b>
-                                    <v>19921</v>
+                                    <v>19925</v>
                                 </b>
                                 <b>
                                     <a>51</a>
                                     <b>68</b>
-                                    <v>20258</v>
+                                    <v>20262</v>
                                 </b>
                                 <b>
                                     <a>68</a>
@@ -7610,62 +7589,62 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>34063</v>
+                                    <v>34069</v>
                                 </b>
                                 <b>
                                     <a>2</a>
                                     <b>3</b>
-                                    <v>22026</v>
+                                    <v>22030</v>
                                 </b>
                                 <b>
                                     <a>3</a>
                                     <b>4</b>
-                                    <v>17424</v>
+                                    <v>17427</v>
                                 </b>
                                 <b>
                                     <a>4</a>
                                     <b>6</b>
-                                    <v>21380</v>
+                                    <v>21384</v>
                                 </b>
                                 <b>
                                     <a>6</a>
                                     <b>8</b>
-                                    <v>20482</v>
+                                    <v>20486</v>
                                 </b>
                                 <b>
                                     <a>8</a>
                                     <b>11</b>
-                                    <v>21689</v>
+                                    <v>21693</v>
                                 </b>
                                 <b>
                                     <a>11</a>
                                     <b>16</b>
-                                    <v>23793</v>
+                                    <v>23798</v>
                                 </b>
                                 <b>
                                     <a>16</a>
                                     <b>20</b>
-                                    <v>19921</v>
+                                    <v>19925</v>
                                 </b>
                                 <b>
                                     <a>20</a>
                                     <b>26</b>
-                                    <v>23429</v>
+                                    <v>23433</v>
                                 </b>
                                 <b>
                                     <a>26</a>
                                     <b>32</b>
-                                    <v>22222</v>
+                                    <v>22226</v>
                                 </b>
                                 <b>
                                     <a>32</a>
                                     <b>39</b>
-                                    <v>20454</v>
+                                    <v>20458</v>
                                 </b>
                                 <b>
                                     <a>39</a>
                                     <b>58</b>
-                                    <v>18097</v>
+                                    <v>18101</v>
                                 </b>
                             </bs>
                         </hist>
@@ -7681,62 +7660,62 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>44332</v>
+                                    <v>44341</v>
                                 </b>
                                 <b>
                                     <a>2</a>
                                     <b>3</b>
-                                    <v>32407</v>
+                                    <v>32413</v>
                                 </b>
                                 <b>
                                     <a>3</a>
                                     <b>4</b>
-                                    <v>25196</v>
+                                    <v>25201</v>
                                 </b>
                                 <b>
                                     <a>4</a>
                                     <b>5</b>
-                                    <v>20791</v>
+                                    <v>20795</v>
                                 </b>
                                 <b>
                                     <a>5</a>
                                     <b>6</b>
-                                    <v>18855</v>
+                                    <v>18858</v>
                                 </b>
                                 <b>
                                     <a>6</a>
                                     <b>7</b>
-                                    <v>15853</v>
+                                    <v>15856</v>
                                 </b>
                                 <b>
                                     <a>7</a>
                                     <b>8</b>
-                                    <v>16246</v>
+                                    <v>16249</v>
                                 </b>
                                 <b>
                                     <a>8</a>
                                     <b>9</b>
-                                    <v>14927</v>
+                                    <v>14930</v>
                                 </b>
                                 <b>
                                     <a>9</a>
                                     <b>10</b>
-                                    <v>13917</v>
+                                    <v>13919</v>
                                 </b>
                                 <b>
                                     <a>10</a>
                                     <b>12</b>
-                                    <v>24439</v>
+                                    <v>24443</v>
                                 </b>
                                 <b>
                                     <a>12</a>
                                     <b>15</b>
-                                    <v>24186</v>
+                                    <v>24191</v>
                                 </b>
                                 <b>
                                     <a>15</a>
                                     <b>100</b>
-                                    <v>13832</v>
+                                    <v>13835</v>
                                 </b>
                             </bs>
                         </hist>
@@ -7752,57 +7731,57 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>34063</v>
+                                    <v>34069</v>
                                 </b>
                                 <b>
                                     <a>2</a>
                                     <b>3</b>
-                                    <v>27834</v>
+                                    <v>27839</v>
                                 </b>
                                 <b>
                                     <a>3</a>
                                     <b>4</b>
-                                    <v>22980</v>
+                                    <v>22984</v>
                                 </b>
                                 <b>
                                     <a>4</a>
                                     <b>5</b>
-                                    <v>24326</v>
+                                    <v>24331</v>
                                 </b>
                                 <b>
                                     <a>5</a>
                                     <b>6</b>
-                                    <v>25337</v>
+                                    <v>25341</v>
                                 </b>
                                 <b>
                                     <a>6</a>
                                     <b>7</b>
-                                    <v>27946</v>
+                                    <v>27951</v>
                                 </b>
                                 <b>
                                     <a>7</a>
                                     <b>8</b>
-                                    <v>30612</v>
+                                    <v>30617</v>
                                 </b>
                                 <b>
                                     <a>8</a>
                                     <b>9</b>
-                                    <v>25589</v>
+                                    <v>25594</v>
                                 </b>
                                 <b>
                                     <a>9</a>
                                     <b>10</b>
-                                    <v>17620</v>
+                                    <v>17624</v>
                                 </b>
                                 <b>
                                     <a>10</a>
                                     <b>12</b>
-                                    <v>20454</v>
+                                    <v>20458</v>
                                 </b>
                                 <b>
                                     <a>12</a>
                                     <b>18</b>
-                                    <v>8221</v>
+                                    <v>8222</v>
                                 </b>
                             </bs>
                         </hist>
@@ -7818,67 +7797,67 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>33726</v>
+                                    <v>33732</v>
                                 </b>
                                 <b>
                                     <a>2</a>
                                     <b>3</b>
-                                    <v>22699</v>
+                                    <v>22703</v>
                                 </b>
                                 <b>
                                     <a>3</a>
                                     <b>4</b>
-                                    <v>17115</v>
+                                    <v>17119</v>
                                 </b>
                                 <b>
                                     <a>4</a>
                                     <b>6</b>
-                                    <v>24326</v>
+                                    <v>24331</v>
                                 </b>
                                 <b>
                                     <a>6</a>
                                     <b>8</b>
-                                    <v>20931</v>
+                                    <v>20935</v>
                                 </b>
                                 <b>
                                     <a>8</a>
                                     <b>10</b>
-                                    <v>17480</v>
+                                    <v>17483</v>
                                 </b>
                                 <b>
                                     <a>10</a>
                                     <b>13</b>
-                                    <v>19697</v>
+                                    <v>19700</v>
                                 </b>
                                 <b>
                                     <a>13</a>
                                     <b>16</b>
-                                    <v>20510</v>
+                                    <v>20514</v>
                                 </b>
                                 <b>
                                     <a>16</a>
                                     <b>19</b>
-                                    <v>20062</v>
+                                    <v>20065</v>
                                 </b>
                                 <b>
                                     <a>19</a>
                                     <b>22</b>
-                                    <v>18967</v>
+                                    <v>18971</v>
                                 </b>
                                 <b>
                                     <a>22</a>
                                     <b>26</b>
-                                    <v>23681</v>
+                                    <v>23686</v>
                                 </b>
                                 <b>
                                     <a>26</a>
                                     <b>31</b>
-                                    <v>20959</v>
+                                    <v>20963</v>
                                 </b>
                                 <b>
                                     <a>31</a>
                                     <b>39</b>
-                                    <v>4826</v>
+                                    <v>4827</v>
                                 </b>
                             </bs>
                         </hist>
@@ -8278,19 +8257,19 @@
         </relation>
         <relation>
             <name>locations_expr</name>
-            <cardinality>17956521</cardinality>
+            <cardinality>17959854</cardinality>
             <columnsizes>
                 <e>
                     <k>id</k>
-                    <v>17956521</v>
+                    <v>17959854</v>
                 </e>
                 <e>
                     <k>container</k>
-                    <v>6341</v>
+                    <v>6342</v>
                 </e>
                 <e>
                     <k>startLine</k>
-                    <v>261984</v>
+                    <v>262033</v>
                 </e>
                 <e>
                     <k>startColumn</k>
@@ -8298,11 +8277,11 @@
                 </e>
                 <e>
                     <k>endLine</k>
-                    <v>261956</v>
+                    <v>262005</v>
                 </e>
                 <e>
                     <k>endColumn</k>
-                    <v>3815</v>
+                    <v>3816</v>
                 </e>
             </columnsizes>
             <dependencies>
@@ -8316,7 +8295,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>17956521</v>
+                                    <v>17959854</v>
                                 </b>
                             </bs>
                         </hist>
@@ -8332,7 +8311,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>17956521</v>
+                                    <v>17959854</v>
                                 </b>
                             </bs>
                         </hist>
@@ -8348,7 +8327,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>17956521</v>
+                                    <v>17959854</v>
                                 </b>
                             </bs>
                         </hist>
@@ -8364,7 +8343,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>17956521</v>
+                                    <v>17959854</v>
                                 </b>
                             </bs>
                         </hist>
@@ -8380,7 +8359,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>17956521</v>
+                                    <v>17959854</v>
                                 </b>
                             </bs>
                         </hist>
@@ -8401,12 +8380,12 @@
                                 <b>
                                     <a>2</a>
                                     <b>6</b>
-                                    <v>476</v>
+                                    <v>477</v>
                                 </b>
                                 <b>
                                     <a>6</a>
                                     <b>11</b>
-                                    <v>476</v>
+                                    <v>477</v>
                                 </b>
                                 <b>
                                     <a>12</a>
@@ -8416,47 +8395,47 @@
                                 <b>
                                     <a>27</a>
                                     <b>87</b>
-                                    <v>476</v>
+                                    <v>477</v>
                                 </b>
                                 <b>
                                     <a>95</a>
                                     <b>514</b>
-                                    <v>476</v>
+                                    <v>477</v>
                                 </b>
                                 <b>
                                     <a>525</a>
                                     <b>1401</b>
-                                    <v>476</v>
+                                    <v>477</v>
                                 </b>
                                 <b>
                                     <a>1526</a>
                                     <b>2343</b>
-                                    <v>476</v>
+                                    <v>477</v>
                                 </b>
                                 <b>
                                     <a>2404</a>
                                     <b>3615</b>
-                                    <v>476</v>
+                                    <v>477</v>
                                 </b>
                                 <b>
                                     <a>3668</a>
                                     <b>5162</b>
-                                    <v>476</v>
+                                    <v>477</v>
                                 </b>
                                 <b>
                                     <a>5341</a>
                                     <b>7345</b>
-                                    <v>476</v>
+                                    <v>477</v>
                                 </b>
                                 <b>
                                     <a>7399</a>
                                     <b>9307</b>
-                                    <v>476</v>
+                                    <v>477</v>
                                 </b>
                                 <b>
                                     <a>9382</a>
                                     <b>16759</b>
-                                    <v>476</v>
+                                    <v>477</v>
                                 </b>
                                 <b>
                                     <a>18811</a>
@@ -8482,7 +8461,7 @@
                                 <b>
                                     <a>2</a>
                                     <b>4</b>
-                                    <v>476</v>
+                                    <v>477</v>
                                 </b>
                                 <b>
                                     <a>4</a>
@@ -8497,42 +8476,42 @@
                                 <b>
                                     <a>20</a>
                                     <b>66</b>
-                                    <v>476</v>
+                                    <v>477</v>
                                 </b>
                                 <b>
                                     <a>67</a>
                                     <b>162</b>
-                                    <v>476</v>
+                                    <v>477</v>
                                 </b>
                                 <b>
                                     <a>166</a>
                                     <b>362</b>
-                                    <v>476</v>
+                                    <v>477</v>
                                 </b>
                                 <b>
                                     <a>376</a>
                                     <b>591</b>
-                                    <v>476</v>
+                                    <v>477</v>
                                 </b>
                                 <b>
                                     <a>593</a>
                                     <b>929</b>
-                                    <v>476</v>
+                                    <v>477</v>
                                 </b>
                                 <b>
                                     <a>960</a>
                                     <b>1269</b>
-                                    <v>476</v>
+                                    <v>477</v>
                                 </b>
                                 <b>
                                     <a>1291</a>
                                     <b>1782</b>
-                                    <v>476</v>
+                                    <v>477</v>
                                 </b>
                                 <b>
                                     <a>1851</a>
                                     <b>2492</b>
-                                    <v>476</v>
+                                    <v>477</v>
                                 </b>
                                 <b>
                                     <a>2594</a>
@@ -8568,7 +8547,7 @@
                                 <b>
                                     <a>7</a>
                                     <b>16</b>
-                                    <v>476</v>
+                                    <v>477</v>
                                 </b>
                                 <b>
                                     <a>16</a>
@@ -8578,7 +8557,7 @@
                                 <b>
                                     <a>36</a>
                                     <b>59</b>
-                                    <v>476</v>
+                                    <v>477</v>
                                 </b>
                                 <b>
                                     <a>59</a>
@@ -8644,7 +8623,7 @@
                                 <b>
                                     <a>2</a>
                                     <b>4</b>
-                                    <v>476</v>
+                                    <v>477</v>
                                 </b>
                                 <b>
                                     <a>4</a>
@@ -8659,42 +8638,42 @@
                                 <b>
                                     <a>20</a>
                                     <b>68</b>
-                                    <v>476</v>
+                                    <v>477</v>
                                 </b>
                                 <b>
                                     <a>68</a>
                                     <b>163</b>
-                                    <v>476</v>
+                                    <v>477</v>
                                 </b>
                                 <b>
                                     <a>166</a>
                                     <b>362</b>
-                                    <v>476</v>
+                                    <v>477</v>
                                 </b>
                                 <b>
                                     <a>376</a>
                                     <b>592</b>
-                                    <v>476</v>
+                                    <v>477</v>
                                 </b>
                                 <b>
                                     <a>593</a>
                                     <b>931</b>
-                                    <v>476</v>
+                                    <v>477</v>
                                 </b>
                                 <b>
                                     <a>960</a>
                                     <b>1273</b>
-                                    <v>476</v>
+                                    <v>477</v>
                                 </b>
                                 <b>
                                     <a>1292</a>
                                     <b>1786</b>
-                                    <v>476</v>
+                                    <v>477</v>
                                 </b>
                                 <b>
                                     <a>1855</a>
                                     <b>2501</b>
-                                    <v>476</v>
+                                    <v>477</v>
                                 </b>
                                 <b>
                                     <a>2593</a>
@@ -8720,7 +8699,7 @@
                                 <b>
                                     <a>2</a>
                                     <b>4</b>
-                                    <v>476</v>
+                                    <v>477</v>
                                 </b>
                                 <b>
                                     <a>4</a>
@@ -8730,17 +8709,17 @@
                                 <b>
                                     <a>7</a>
                                     <b>15</b>
-                                    <v>476</v>
+                                    <v>477</v>
                                 </b>
                                 <b>
                                     <a>15</a>
                                     <b>36</b>
-                                    <v>476</v>
+                                    <v>477</v>
                                 </b>
                                 <b>
                                     <a>36</a>
                                     <b>62</b>
-                                    <v>476</v>
+                                    <v>477</v>
                                 </b>
                                 <b>
                                     <a>62</a>
@@ -8755,7 +8734,7 @@
                                 <b>
                                     <a>73</a>
                                     <b>75</b>
-                                    <v>448</v>
+                                    <v>449</v>
                                 </b>
                                 <b>
                                     <a>75</a>
@@ -8770,12 +8749,12 @@
                                 <b>
                                     <a>77</a>
                                     <b>79</b>
-                                    <v>476</v>
+                                    <v>477</v>
                                 </b>
                                 <b>
                                     <a>79</a>
                                     <b>84</b>
-                                    <v>476</v>
+                                    <v>477</v>
                                 </b>
                                 <b>
                                     <a>84</a>
@@ -8796,67 +8775,67 @@
                                 <b>
                                     <a>1</a>
                                     <b>5</b>
-                                    <v>21998</v>
+                                    <v>22002</v>
                                 </b>
                                 <b>
                                     <a>5</a>
                                     <b>9</b>
-                                    <v>22503</v>
+                                    <v>22507</v>
                                 </b>
                                 <b>
                                     <a>9</a>
                                     <b>15</b>
-                                    <v>21885</v>
+                                    <v>21889</v>
                                 </b>
                                 <b>
                                     <a>15</a>
                                     <b>23</b>
-                                    <v>20623</v>
+                                    <v>20627</v>
                                 </b>
                                 <b>
                                     <a>23</a>
                                     <b>32</b>
-                                    <v>20679</v>
+                                    <v>20683</v>
                                 </b>
                                 <b>
                                     <a>32</a>
                                     <b>44</b>
-                                    <v>20482</v>
+                                    <v>20486</v>
                                 </b>
                                 <b>
                                     <a>44</a>
                                     <b>60</b>
-                                    <v>20146</v>
+                                    <v>20149</v>
                                 </b>
                                 <b>
                                     <a>60</a>
                                     <b>80</b>
-                                    <v>20286</v>
+                                    <v>20290</v>
                                 </b>
                                 <b>
                                     <a>80</a>
                                     <b>103</b>
-                                    <v>19949</v>
+                                    <v>19953</v>
                                 </b>
                                 <b>
                                     <a>103</a>
                                     <b>130</b>
-                                    <v>20090</v>
+                                    <v>20093</v>
                                 </b>
                                 <b>
                                     <a>130</a>
                                     <b>159</b>
-                                    <v>19893</v>
+                                    <v>19897</v>
                                 </b>
                                 <b>
                                     <a>159</a>
                                     <b>194</b>
-                                    <v>19949</v>
+                                    <v>19953</v>
                                 </b>
                                 <b>
                                     <a>194</a>
                                     <b>297</b>
-                                    <v>13496</v>
+                                    <v>13498</v>
                                 </b>
                             </bs>
                         </hist>
@@ -8872,62 +8851,62 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>32099</v>
+                                    <v>32105</v>
                                 </b>
                                 <b>
                                     <a>2</a>
                                     <b>3</b>
-                                    <v>21324</v>
+                                    <v>21328</v>
                                 </b>
                                 <b>
                                     <a>3</a>
                                     <b>4</b>
-                                    <v>15488</v>
+                                    <v>15491</v>
                                 </b>
                                 <b>
                                     <a>4</a>
                                     <b>6</b>
-                                    <v>22334</v>
+                                    <v>22338</v>
                                 </b>
                                 <b>
                                     <a>6</a>
                                     <b>8</b>
-                                    <v>18602</v>
+                                    <v>18606</v>
                                 </b>
                                 <b>
                                     <a>8</a>
                                     <b>11</b>
-                                    <v>22418</v>
+                                    <v>22423</v>
                                 </b>
                                 <b>
                                     <a>11</a>
                                     <b>16</b>
-                                    <v>23681</v>
+                                    <v>23686</v>
                                 </b>
                                 <b>
                                     <a>16</a>
                                     <b>21</b>
-                                    <v>22503</v>
+                                    <v>22507</v>
                                 </b>
                                 <b>
                                     <a>21</a>
                                     <b>28</b>
-                                    <v>22671</v>
+                                    <v>22675</v>
                                 </b>
                                 <b>
                                     <a>28</a>
                                     <b>35</b>
-                                    <v>21633</v>
+                                    <v>21637</v>
                                 </b>
                                 <b>
                                     <a>35</a>
                                     <b>43</b>
-                                    <v>21773</v>
+                                    <v>21777</v>
                                 </b>
                                 <b>
                                     <a>43</a>
                                     <b>61</b>
-                                    <v>17452</v>
+                                    <v>17455</v>
                                 </b>
                             </bs>
                         </hist>
@@ -8943,62 +8922,62 @@
                                 <b>
                                     <a>1</a>
                                     <b>4</b>
-                                    <v>21801</v>
+                                    <v>21805</v>
                                 </b>
                                 <b>
                                     <a>4</a>
                                     <b>7</b>
-                                    <v>23934</v>
+                                    <v>23938</v>
                                 </b>
                                 <b>
                                     <a>7</a>
                                     <b>11</b>
-                                    <v>22783</v>
+                                    <v>22787</v>
                                 </b>
                                 <b>
                                     <a>11</a>
                                     <b>16</b>
-                                    <v>23765</v>
+                                    <v>23770</v>
                                 </b>
                                 <b>
                                     <a>16</a>
                                     <b>21</b>
-                                    <v>23906</v>
+                                    <v>23910</v>
                                 </b>
                                 <b>
                                     <a>21</a>
                                     <b>26</b>
-                                    <v>20567</v>
+                                    <v>20570</v>
                                 </b>
                                 <b>
                                     <a>26</a>
                                     <b>31</b>
-                                    <v>22082</v>
+                                    <v>22086</v>
                                 </b>
                                 <b>
                                     <a>31</a>
                                     <b>36</b>
-                                    <v>24102</v>
+                                    <v>24106</v>
                                 </b>
                                 <b>
                                     <a>36</a>
                                     <b>40</b>
-                                    <v>21464</v>
+                                    <v>21468</v>
                                 </b>
                                 <b>
                                     <a>40</a>
                                     <b>44</b>
-                                    <v>22615</v>
+                                    <v>22619</v>
                                 </b>
                                 <b>
                                     <a>44</a>
                                     <b>49</b>
-                                    <v>22755</v>
+                                    <v>22759</v>
                                 </b>
                                 <b>
                                     <a>49</a>
                                     <b>63</b>
-                                    <v>12205</v>
+                                    <v>12207</v>
                                 </b>
                             </bs>
                         </hist>
@@ -9014,27 +8993,27 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>138947</v>
+                                    <v>138972</v>
                                 </b>
                                 <b>
                                     <a>2</a>
                                     <b>3</b>
-                                    <v>61112</v>
+                                    <v>61123</v>
                                 </b>
                                 <b>
                                     <a>3</a>
                                     <b>4</b>
-                                    <v>37682</v>
+                                    <v>37689</v>
                                 </b>
                                 <b>
                                     <a>4</a>
                                     <b>6</b>
-                                    <v>19977</v>
+                                    <v>19981</v>
                                 </b>
                                 <b>
                                     <a>6</a>
                                     <b>23</b>
-                                    <v>4264</v>
+                                    <v>4265</v>
                                 </b>
                             </bs>
                         </hist>
@@ -9050,62 +9029,62 @@
                                 <b>
                                     <a>1</a>
                                     <b>4</b>
-                                    <v>23148</v>
+                                    <v>23152</v>
                                 </b>
                                 <b>
                                     <a>4</a>
                                     <b>7</b>
-                                    <v>22727</v>
+                                    <v>22731</v>
                                 </b>
                                 <b>
                                     <a>7</a>
                                     <b>11</b>
-                                    <v>22418</v>
+                                    <v>22423</v>
                                 </b>
                                 <b>
                                     <a>11</a>
                                     <b>16</b>
-                                    <v>22138</v>
+                                    <v>22142</v>
                                 </b>
                                 <b>
                                     <a>16</a>
                                     <b>21</b>
-                                    <v>22447</v>
+                                    <v>22451</v>
                                 </b>
                                 <b>
                                     <a>21</a>
                                     <b>27</b>
-                                    <v>22867</v>
+                                    <v>22872</v>
                                 </b>
                                 <b>
                                     <a>27</a>
                                     <b>33</b>
-                                    <v>22475</v>
+                                    <v>22479</v>
                                 </b>
                                 <b>
                                     <a>33</a>
                                     <b>38</b>
-                                    <v>19753</v>
+                                    <v>19757</v>
                                 </b>
                                 <b>
                                     <a>38</a>
                                     <b>43</b>
-                                    <v>21296</v>
+                                    <v>21300</v>
                                 </b>
                                 <b>
                                     <a>43</a>
                                     <b>47</b>
-                                    <v>19949</v>
+                                    <v>19953</v>
                                 </b>
                                 <b>
                                     <a>47</a>
                                     <b>52</b>
-                                    <v>23036</v>
+                                    <v>23040</v>
                                 </b>
                                 <b>
                                     <a>52</a>
                                     <b>66</b>
-                                    <v>19669</v>
+                                    <v>19672</v>
                                 </b>
                                 <b>
                                     <a>68</a>
@@ -9202,7 +9181,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>448</v>
+                                    <v>449</v>
                                 </b>
                                 <b>
                                     <a>2</a>
@@ -9430,7 +9409,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>448</v>
+                                    <v>449</v>
                                 </b>
                                 <b>
                                     <a>2</a>
@@ -9506,67 +9485,67 @@
                                 <b>
                                     <a>1</a>
                                     <b>5</b>
-                                    <v>22026</v>
+                                    <v>22030</v>
                                 </b>
                                 <b>
                                     <a>5</a>
                                     <b>9</b>
-                                    <v>22503</v>
+                                    <v>22507</v>
                                 </b>
                                 <b>
                                     <a>9</a>
                                     <b>15</b>
-                                    <v>21577</v>
+                                    <v>21581</v>
                                 </b>
                                 <b>
                                     <a>15</a>
                                     <b>23</b>
-                                    <v>20595</v>
+                                    <v>20598</v>
                                 </b>
                                 <b>
                                     <a>23</a>
                                     <b>32</b>
-                                    <v>21352</v>
+                                    <v>21356</v>
                                 </b>
                                 <b>
                                     <a>32</a>
                                     <b>44</b>
-                                    <v>20118</v>
+                                    <v>20121</v>
                                 </b>
                                 <b>
                                     <a>44</a>
                                     <b>60</b>
-                                    <v>19781</v>
+                                    <v>19785</v>
                                 </b>
                                 <b>
                                     <a>60</a>
                                     <b>80</b>
-                                    <v>20875</v>
+                                    <v>20879</v>
                                 </b>
                                 <b>
                                     <a>80</a>
                                     <b>103</b>
-                                    <v>19809</v>
+                                    <v>19813</v>
                                 </b>
                                 <b>
                                     <a>103</a>
                                     <b>130</b>
-                                    <v>20005</v>
+                                    <v>20009</v>
                                 </b>
                                 <b>
                                     <a>130</a>
                                     <b>159</b>
-                                    <v>19949</v>
+                                    <v>19953</v>
                                 </b>
                                 <b>
                                     <a>159</a>
                                     <b>193</b>
-                                    <v>19669</v>
+                                    <v>19672</v>
                                 </b>
                                 <b>
                                     <a>193</a>
                                     <b>296</b>
-                                    <v>13692</v>
+                                    <v>13695</v>
                                 </b>
                             </bs>
                         </hist>
@@ -9582,67 +9561,67 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>32099</v>
+                                    <v>32105</v>
                                 </b>
                                 <b>
                                     <a>2</a>
                                     <b>3</b>
-                                    <v>21240</v>
+                                    <v>21244</v>
                                 </b>
                                 <b>
                                     <a>3</a>
                                     <b>4</b>
-                                    <v>15488</v>
+                                    <v>15491</v>
                                 </b>
                                 <b>
                                     <a>4</a>
                                     <b>6</b>
-                                    <v>21913</v>
+                                    <v>21917</v>
                                 </b>
                                 <b>
                                     <a>6</a>
                                     <b>8</b>
-                                    <v>18406</v>
+                                    <v>18409</v>
                                 </b>
                                 <b>
                                     <a>8</a>
                                     <b>11</b>
-                                    <v>22503</v>
+                                    <v>22507</v>
                                 </b>
                                 <b>
                                     <a>11</a>
                                     <b>15</b>
-                                    <v>19781</v>
+                                    <v>19785</v>
                                 </b>
                                 <b>
                                     <a>15</a>
                                     <b>20</b>
-                                    <v>22811</v>
+                                    <v>22816</v>
                                 </b>
                                 <b>
                                     <a>20</a>
                                     <b>26</b>
-                                    <v>20454</v>
+                                    <v>20458</v>
                                 </b>
                                 <b>
                                     <a>26</a>
                                     <b>33</b>
-                                    <v>21913</v>
+                                    <v>21917</v>
                                 </b>
                                 <b>
                                     <a>33</a>
                                     <b>40</b>
-                                    <v>19893</v>
+                                    <v>19897</v>
                                 </b>
                                 <b>
                                     <a>40</a>
                                     <b>49</b>
-                                    <v>20033</v>
+                                    <v>20037</v>
                                 </b>
                                 <b>
                                     <a>49</a>
                                     <b>61</b>
-                                    <v>5415</v>
+                                    <v>5416</v>
                                 </b>
                             </bs>
                         </hist>
@@ -9658,22 +9637,22 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>130248</v>
+                                    <v>130273</v>
                                 </b>
                                 <b>
                                     <a>2</a>
                                     <b>3</b>
-                                    <v>68210</v>
+                                    <v>68223</v>
                                 </b>
                                 <b>
                                     <a>3</a>
                                     <b>4</b>
-                                    <v>40152</v>
+                                    <v>40159</v>
                                 </b>
                                 <b>
                                     <a>4</a>
                                     <b>6</b>
-                                    <v>21380</v>
+                                    <v>21384</v>
                                 </b>
                                 <b>
                                     <a>6</a>
@@ -9694,62 +9673,62 @@
                                 <b>
                                     <a>1</a>
                                     <b>4</b>
-                                    <v>21605</v>
+                                    <v>21609</v>
                                 </b>
                                 <b>
                                     <a>4</a>
                                     <b>7</b>
-                                    <v>23821</v>
+                                    <v>23826</v>
                                 </b>
                                 <b>
                                     <a>7</a>
                                     <b>11</b>
-                                    <v>22503</v>
+                                    <v>22507</v>
                                 </b>
                                 <b>
                                     <a>11</a>
                                     <b>16</b>
-                                    <v>23681</v>
+                                    <v>23686</v>
                                 </b>
                                 <b>
                                     <a>16</a>
                                     <b>21</b>
-                                    <v>23625</v>
+                                    <v>23629</v>
                                 </b>
                                 <b>
                                     <a>21</a>
                                     <b>26</b>
-                                    <v>20679</v>
+                                    <v>20683</v>
                                 </b>
                                 <b>
                                     <a>26</a>
                                     <b>31</b>
-                                    <v>22278</v>
+                                    <v>22282</v>
                                 </b>
                                 <b>
                                     <a>31</a>
                                     <b>36</b>
-                                    <v>24074</v>
+                                    <v>24078</v>
                                 </b>
                                 <b>
                                     <a>36</a>
                                     <b>40</b>
-                                    <v>20875</v>
+                                    <v>20879</v>
                                 </b>
                                 <b>
                                     <a>40</a>
                                     <b>44</b>
-                                    <v>22587</v>
+                                    <v>22591</v>
                                 </b>
                                 <b>
                                     <a>44</a>
                                     <b>49</b>
-                                    <v>23148</v>
+                                    <v>23152</v>
                                 </b>
                                 <b>
                                     <a>49</a>
                                     <b>63</b>
-                                    <v>13075</v>
+                                    <v>13077</v>
                                 </b>
                             </bs>
                         </hist>
@@ -9765,62 +9744,62 @@
                                 <b>
                                     <a>1</a>
                                     <b>4</b>
-                                    <v>23457</v>
+                                    <v>23461</v>
                                 </b>
                                 <b>
                                     <a>4</a>
                                     <b>7</b>
-                                    <v>22924</v>
+                                    <v>22928</v>
                                 </b>
                                 <b>
                                     <a>7</a>
                                     <b>11</b>
-                                    <v>22418</v>
+                                    <v>22423</v>
                                 </b>
                                 <b>
                                     <a>11</a>
                                     <b>16</b>
-                                    <v>23036</v>
+                                    <v>23040</v>
                                 </b>
                                 <b>
                                     <a>16</a>
                                     <b>21</b>
-                                    <v>21857</v>
+                                    <v>21861</v>
                                 </b>
                                 <b>
                                     <a>21</a>
                                     <b>26</b>
-                                    <v>19809</v>
+                                    <v>19813</v>
                                 </b>
                                 <b>
                                     <a>26</a>
                                     <b>32</b>
-                                    <v>22054</v>
+                                    <v>22058</v>
                                 </b>
                                 <b>
                                     <a>32</a>
                                     <b>38</b>
-                                    <v>23878</v>
+                                    <v>23882</v>
                                 </b>
                                 <b>
                                     <a>38</a>
                                     <b>43</b>
-                                    <v>22110</v>
+                                    <v>22114</v>
                                 </b>
                                 <b>
                                     <a>43</a>
                                     <b>47</b>
-                                    <v>19781</v>
+                                    <v>19785</v>
                                 </b>
                                 <b>
                                     <a>47</a>
                                     <b>52</b>
-                                    <v>22755</v>
+                                    <v>22759</v>
                                 </b>
                                 <b>
                                     <a>52</a>
                                     <b>69</b>
-                                    <v>17873</v>
+                                    <v>17876</v>
                                 </b>
                             </bs>
                         </hist>
@@ -9912,7 +9891,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>448</v>
+                                    <v>449</v>
                                 </b>
                                 <b>
                                     <a>2</a>
@@ -10205,23 +10184,23 @@
         </relation>
         <relation>
             <name>numlines</name>
-            <cardinality>809466</cardinality>
+            <cardinality>806371</cardinality>
             <columnsizes>
                 <e>
                     <k>element_id</k>
-                    <v>808340</v>
+                    <v>805249</v>
                 </e>
                 <e>
                     <k>num_lines</k>
-                    <v>39522</v>
+                    <v>39371</v>
                 </e>
                 <e>
                     <k>num_code</k>
-                    <v>34019</v>
+                    <v>33889</v>
                 </e>
                 <e>
                     <k>num_comment</k>
-                    <v>18385</v>
+                    <v>18315</v>
                 </e>
             </columnsizes>
             <dependencies>
@@ -10235,12 +10214,12 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>807215</v>
+                                    <v>804128</v>
                                 </b>
                                 <b>
                                     <a>2</a>
                                     <b>3</b>
-                                    <v>1125</v>
+                                    <v>1121</v>
                                 </b>
                             </bs>
                         </hist>
@@ -10256,12 +10235,12 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>807215</v>
+                                    <v>804128</v>
                                 </b>
                                 <b>
                                     <a>2</a>
                                     <b>3</b>
-                                    <v>1125</v>
+                                    <v>1121</v>
                                 </b>
                             </bs>
                         </hist>
@@ -10277,12 +10256,12 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>808090</v>
+                                    <v>805000</v>
                                 </b>
                                 <b>
                                     <a>2</a>
                                     <b>3</b>
-                                    <v>250</v>
+                                    <v>249</v>
                                 </b>
                             </bs>
                         </hist>
@@ -10298,27 +10277,27 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>26765</v>
+                                    <v>26663</v>
                                 </b>
                                 <b>
                                     <a>2</a>
                                     <b>3</b>
-                                    <v>3752</v>
+                                    <v>3737</v>
                                 </b>
                                 <b>
                                     <a>3</a>
                                     <b>5</b>
-                                    <v>3376</v>
+                                    <v>3364</v>
                                 </b>
                                 <b>
                                     <a>5</a>
                                     <b>37</b>
-                                    <v>3126</v>
+                                    <v>3114</v>
                                 </b>
                                 <b>
                                     <a>41</a>
                                     <b>1978</b>
-                                    <v>2501</v>
+                                    <v>2491</v>
                                 </b>
                             </bs>
                         </hist>
@@ -10334,27 +10313,27 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>27265</v>
+                                    <v>27161</v>
                                 </b>
                                 <b>
                                     <a>2</a>
                                     <b>3</b>
-                                    <v>4127</v>
+                                    <v>4111</v>
                                 </b>
                                 <b>
                                     <a>3</a>
                                     <b>4</b>
-                                    <v>2501</v>
+                                    <v>2491</v>
                                 </b>
                                 <b>
                                     <a>4</a>
                                     <b>7</b>
-                                    <v>3502</v>
+                                    <v>3488</v>
                                 </b>
                                 <b>
                                     <a>7</a>
                                     <b>12</b>
-                                    <v>2126</v>
+                                    <v>2118</v>
                                 </b>
                             </bs>
                         </hist>
@@ -10370,27 +10349,27 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>26890</v>
+                                    <v>26787</v>
                                 </b>
                                 <b>
                                     <a>2</a>
                                     <b>3</b>
-                                    <v>4127</v>
+                                    <v>4111</v>
                                 </b>
                                 <b>
                                     <a>3</a>
                                     <b>4</b>
-                                    <v>2501</v>
+                                    <v>2491</v>
                                 </b>
                                 <b>
                                     <a>4</a>
                                     <b>6</b>
-                                    <v>3126</v>
+                                    <v>3114</v>
                                 </b>
                                 <b>
                                     <a>6</a>
                                     <b>11</b>
-                                    <v>2876</v>
+                                    <v>2865</v>
                                 </b>
                             </bs>
                         </hist>
@@ -10406,32 +10385,32 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>21637</v>
+                                    <v>21554</v>
                                 </b>
                                 <b>
                                     <a>2</a>
                                     <b>3</b>
-                                    <v>3752</v>
+                                    <v>3737</v>
                                 </b>
                                 <b>
                                     <a>3</a>
                                     <b>4</b>
-                                    <v>2376</v>
+                                    <v>2367</v>
                                 </b>
                                 <b>
                                     <a>4</a>
                                     <b>13</b>
-                                    <v>2876</v>
+                                    <v>2865</v>
                                 </b>
                                 <b>
                                     <a>14</a>
                                     <b>197</b>
-                                    <v>2626</v>
+                                    <v>2616</v>
                                 </b>
                                 <b>
                                     <a>205</a>
                                     <b>2101</b>
-                                    <v>750</v>
+                                    <v>747</v>
                                 </b>
                             </bs>
                         </hist>
@@ -10447,32 +10426,32 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>22012</v>
+                                    <v>21928</v>
                                 </b>
                                 <b>
                                     <a>2</a>
                                     <b>3</b>
-                                    <v>3752</v>
+                                    <v>3737</v>
                                 </b>
                                 <b>
                                     <a>3</a>
                                     <b>4</b>
-                                    <v>2126</v>
+                                    <v>2118</v>
                                 </b>
                                 <b>
                                     <a>4</a>
                                     <b>6</b>
-                                    <v>1876</v>
+                                    <v>1868</v>
                                 </b>
                                 <b>
                                     <a>6</a>
                                     <b>9</b>
-                                    <v>2751</v>
+                                    <v>2741</v>
                                 </b>
                                 <b>
                                     <a>9</a>
                                     <b>13</b>
-                                    <v>1500</v>
+                                    <v>1495</v>
                                 </b>
                             </bs>
                         </hist>
@@ -10488,27 +10467,27 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>21762</v>
+                                    <v>21679</v>
                                 </b>
                                 <b>
                                     <a>2</a>
                                     <b>3</b>
-                                    <v>4377</v>
+                                    <v>4360</v>
                                 </b>
                                 <b>
                                     <a>3</a>
                                     <b>5</b>
-                                    <v>2876</v>
+                                    <v>2865</v>
                                 </b>
                                 <b>
                                     <a>5</a>
                                     <b>8</b>
-                                    <v>3126</v>
+                                    <v>3114</v>
                                 </b>
                                 <b>
                                     <a>8</a>
                                     <b>12</b>
-                                    <v>1876</v>
+                                    <v>1868</v>
                                 </b>
                             </bs>
                         </hist>
@@ -10524,32 +10503,32 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>11381</v>
+                                    <v>11338</v>
                                 </b>
                                 <b>
                                     <a>2</a>
                                     <b>3</b>
-                                    <v>1751</v>
+                                    <v>1744</v>
                                 </b>
                                 <b>
                                     <a>3</a>
                                     <b>4</b>
-                                    <v>1500</v>
+                                    <v>1495</v>
                                 </b>
                                 <b>
                                     <a>4</a>
                                     <b>7</b>
-                                    <v>1375</v>
+                                    <v>1370</v>
                                 </b>
                                 <b>
                                     <a>8</a>
                                     <b>22</b>
-                                    <v>1500</v>
+                                    <v>1495</v>
                                 </b>
                                 <b>
                                     <a>42</a>
                                     <b>3650</b>
-                                    <v>875</v>
+                                    <v>872</v>
                                 </b>
                             </bs>
                         </hist>
@@ -10565,32 +10544,32 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>11381</v>
+                                    <v>11338</v>
                                 </b>
                                 <b>
                                     <a>2</a>
                                     <b>3</b>
-                                    <v>1751</v>
+                                    <v>1744</v>
                                 </b>
                                 <b>
                                     <a>3</a>
                                     <b>4</b>
-                                    <v>1500</v>
+                                    <v>1495</v>
                                 </b>
                                 <b>
                                     <a>4</a>
                                     <b>7</b>
-                                    <v>1500</v>
+                                    <v>1495</v>
                                 </b>
                                 <b>
                                     <a>8</a>
                                     <b>27</b>
-                                    <v>1500</v>
+                                    <v>1495</v>
                                 </b>
                                 <b>
                                     <a>30</a>
                                     <b>48</b>
-                                    <v>750</v>
+                                    <v>747</v>
                                 </b>
                             </bs>
                         </hist>
@@ -10606,32 +10585,32 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>11381</v>
+                                    <v>11338</v>
                                 </b>
                                 <b>
                                     <a>2</a>
                                     <b>3</b>
-                                    <v>1751</v>
+                                    <v>1744</v>
                                 </b>
                                 <b>
                                     <a>3</a>
                                     <b>4</b>
-                                    <v>1751</v>
+                                    <v>1744</v>
                                 </b>
                                 <b>
                                     <a>4</a>
                                     <b>9</b>
-                                    <v>1500</v>
+                                    <v>1495</v>
                                 </b>
                                 <b>
                                     <a>10</a>
                                     <b>36</b>
-                                    <v>1625</v>
+                                    <v>1619</v>
                                 </b>
                                 <b>
                                     <a>36</a>
                                     <b>43</b>
-                                    <v>375</v>
+                                    <v>373</v>
                                 </b>
                             </bs>
                         </hist>
@@ -11198,15 +11177,15 @@
         </relation>
         <relation>
             <name>files</name>
-            <cardinality>83260</cardinality>
+            <cardinality>81416</cardinality>
             <columnsizes>
                 <e>
                     <k>id</k>
-                    <v>83260</v>
+                    <v>81416</v>
                 </e>
                 <e>
                     <k>name</k>
-                    <v>83260</v>
+                    <v>81416</v>
                 </e>
             </columnsizes>
             <dependencies>
@@ -11220,7 +11199,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>83260</v>
+                                    <v>81416</v>
                                 </b>
                             </bs>
                         </hist>
@@ -11236,7 +11215,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>83260</v>
+                                    <v>81416</v>
                                 </b>
                             </bs>
                         </hist>
@@ -11246,15 +11225,15 @@
         </relation>
         <relation>
             <name>folders</name>
-            <cardinality>15818</cardinality>
+            <cardinality>15468</cardinality>
             <columnsizes>
                 <e>
                     <k>id</k>
-                    <v>15818</v>
+                    <v>15468</v>
                 </e>
                 <e>
                     <k>name</k>
-                    <v>15818</v>
+                    <v>15468</v>
                 </e>
             </columnsizes>
             <dependencies>
@@ -11268,7 +11247,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>15818</v>
+                                    <v>15468</v>
                                 </b>
                             </bs>
                         </hist>
@@ -11284,7 +11263,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>15818</v>
+                                    <v>15468</v>
                                 </b>
                             </bs>
                         </hist>
@@ -11294,15 +11273,15 @@
         </relation>
         <relation>
             <name>containerparent</name>
-            <cardinality>99052</cardinality>
+            <cardinality>96859</cardinality>
             <columnsizes>
                 <e>
                     <k>parent</k>
-                    <v>15818</v>
+                    <v>15468</v>
                 </e>
                 <e>
                     <k>child</k>
-                    <v>99052</v>
+                    <v>96859</v>
                 </e>
             </columnsizes>
             <dependencies>
@@ -11316,42 +11295,42 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>7700</v>
+                                    <v>7529</v>
                                 </b>
                                 <b>
                                     <a>2</a>
                                     <b>3</b>
-                                    <v>1941</v>
+                                    <v>1898</v>
                                 </b>
                                 <b>
                                     <a>3</a>
                                     <b>4</b>
-                                    <v>849</v>
+                                    <v>830</v>
                                 </b>
                                 <b>
                                     <a>4</a>
                                     <b>6</b>
-                                    <v>1281</v>
+                                    <v>1252</v>
                                 </b>
                                 <b>
                                     <a>6</a>
                                     <b>10</b>
-                                    <v>1240</v>
+                                    <v>1213</v>
                                 </b>
                                 <b>
                                     <a>10</a>
                                     <b>16</b>
-                                    <v>1281</v>
+                                    <v>1252</v>
                                 </b>
                                 <b>
                                     <a>16</a>
                                     <b>44</b>
-                                    <v>1186</v>
+                                    <v>1160</v>
                                 </b>
                                 <b>
                                     <a>44</a>
                                     <b>151</b>
-                                    <v>337</v>
+                                    <v>329</v>
                                 </b>
                             </bs>
                         </hist>
@@ -11367,7 +11346,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>99052</v>
+                                    <v>96859</v>
                                 </b>
                             </bs>
                         </hist>
@@ -11377,11 +11356,11 @@
         </relation>
         <relation>
             <name>fileannotations</name>
-            <cardinality>5363077</cardinality>
+            <cardinality>5244314</cardinality>
             <columnsizes>
                 <e>
                     <k>id</k>
-                    <v>7363</v>
+                    <v>7200</v>
                 </e>
                 <e>
                     <k>kind</k>
@@ -11389,11 +11368,11 @@
                 </e>
                 <e>
                     <k>name</k>
-                    <v>74967</v>
+                    <v>73306</v>
                 </e>
                 <e>
                     <k>value</k>
-                    <v>50450</v>
+                    <v>49332</v>
                 </e>
             </columnsizes>
             <dependencies>
@@ -11407,12 +11386,12 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>256</v>
+                                    <v>250</v>
                                 </b>
                                 <b>
                                     <a>2</a>
                                     <b>3</b>
-                                    <v>7106</v>
+                                    <v>6949</v>
                                 </b>
                             </bs>
                         </hist>
@@ -11428,62 +11407,62 @@
                                 <b>
                                     <a>1</a>
                                     <b>86</b>
-                                    <v>552</v>
+                                    <v>540</v>
                                 </b>
                                 <b>
                                     <a>88</a>
                                     <b>206</b>
-                                    <v>552</v>
+                                    <v>540</v>
                                 </b>
                                 <b>
                                     <a>212</a>
                                     <b>291</b>
-                                    <v>566</v>
+                                    <v>553</v>
                                 </b>
                                 <b>
                                     <a>291</a>
                                     <b>359</b>
-                                    <v>552</v>
+                                    <v>540</v>
                                 </b>
                                 <b>
                                     <a>362</a>
                                     <b>401</b>
-                                    <v>552</v>
+                                    <v>540</v>
                                 </b>
                                 <b>
                                     <a>402</a>
                                     <b>479</b>
-                                    <v>552</v>
+                                    <v>540</v>
                                 </b>
                                 <b>
                                     <a>480</a>
                                     <b>549</b>
-                                    <v>323</v>
+                                    <v>316</v>
                                 </b>
                                 <b>
                                     <a>550</a>
                                     <b>551</b>
-                                    <v>1699</v>
+                                    <v>1661</v>
                                 </b>
                                 <b>
                                     <a>553</a>
                                     <b>628</b>
-                                    <v>552</v>
+                                    <v>540</v>
                                 </b>
                                 <b>
                                     <a>631</a>
                                     <b>753</b>
-                                    <v>579</v>
+                                    <v>567</v>
                                 </b>
                                 <b>
                                     <a>753</a>
                                     <b>1231</b>
-                                    <v>566</v>
+                                    <v>553</v>
                                 </b>
                                 <b>
                                     <a>1234</a>
                                     <b>2155</b>
-                                    <v>310</v>
+                                    <v>303</v>
                                 </b>
                             </bs>
                         </hist>
@@ -11499,62 +11478,62 @@
                                 <b>
                                     <a>1</a>
                                     <b>98</b>
-                                    <v>552</v>
+                                    <v>540</v>
                                 </b>
                                 <b>
                                     <a>102</a>
                                     <b>244</b>
-                                    <v>552</v>
+                                    <v>540</v>
                                 </b>
                                 <b>
                                     <a>244</a>
                                     <b>351</b>
-                                    <v>552</v>
+                                    <v>540</v>
                                 </b>
                                 <b>
                                     <a>352</a>
                                     <b>434</b>
-                                    <v>566</v>
+                                    <v>553</v>
                                 </b>
                                 <b>
                                     <a>434</a>
                                     <b>490</b>
-                                    <v>566</v>
+                                    <v>553</v>
                                 </b>
                                 <b>
                                     <a>490</a>
                                     <b>628</b>
-                                    <v>552</v>
+                                    <v>540</v>
                                 </b>
                                 <b>
                                     <a>632</a>
                                     <b>702</b>
-                                    <v>80</v>
+                                    <v>79</v>
                                 </b>
                                 <b>
                                     <a>706</a>
                                     <b>707</b>
-                                    <v>1699</v>
+                                    <v>1661</v>
                                 </b>
                                 <b>
                                     <a>710</a>
                                     <b>939</b>
-                                    <v>552</v>
+                                    <v>540</v>
                                 </b>
                                 <b>
                                     <a>939</a>
                                     <b>1038</b>
-                                    <v>552</v>
+                                    <v>540</v>
                                 </b>
                                 <b>
                                     <a>1066</a>
                                     <b>1853</b>
-                                    <v>552</v>
+                                    <v>540</v>
                                 </b>
                                 <b>
                                     <a>1853</a>
                                     <b>3292</b>
-                                    <v>552</v>
+                                    <v>540</v>
                                 </b>
                                 <b>
                                     <a>3423</a>
@@ -11638,62 +11617,62 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>14079</v>
+                                    <v>13767</v>
                                 </b>
                                 <b>
                                     <a>2</a>
                                     <b>3</b>
-                                    <v>5569</v>
+                                    <v>5446</v>
                                 </b>
                                 <b>
                                     <a>3</a>
                                     <b>5</b>
-                                    <v>6459</v>
+                                    <v>6316</v>
                                 </b>
                                 <b>
                                     <a>5</a>
                                     <b>7</b>
-                                    <v>5232</v>
+                                    <v>5116</v>
                                 </b>
                                 <b>
                                     <a>7</a>
                                     <b>9</b>
-                                    <v>5866</v>
+                                    <v>5736</v>
                                 </b>
                                 <b>
                                     <a>9</a>
                                     <b>16</b>
-                                    <v>5529</v>
+                                    <v>5406</v>
                                 </b>
                                 <b>
                                     <a>16</a>
                                     <b>19</b>
-                                    <v>6243</v>
+                                    <v>6105</v>
                                 </b>
                                 <b>
                                     <a>19</a>
                                     <b>27</b>
-                                    <v>5434</v>
+                                    <v>5314</v>
                                 </b>
                                 <b>
                                     <a>27</a>
                                     <b>47</b>
-                                    <v>6176</v>
+                                    <v>6039</v>
                                 </b>
                                 <b>
                                     <a>47</a>
                                     <b>128</b>
-                                    <v>6284</v>
+                                    <v>6145</v>
                                 </b>
                                 <b>
                                     <a>128</a>
                                     <b>459</b>
-                                    <v>5906</v>
+                                    <v>5775</v>
                                 </b>
                                 <b>
                                     <a>459</a>
                                     <b>546</b>
-                                    <v>2184</v>
+                                    <v>2136</v>
                                 </b>
                             </bs>
                         </hist>
@@ -11709,7 +11688,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>74967</v>
+                                    <v>73306</v>
                                 </b>
                             </bs>
                         </hist>
@@ -11725,57 +11704,57 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>14793</v>
+                                    <v>14466</v>
                                 </b>
                                 <b>
                                     <a>2</a>
                                     <b>3</b>
-                                    <v>9817</v>
+                                    <v>9600</v>
                                 </b>
                                 <b>
                                     <a>3</a>
                                     <b>4</b>
-                                    <v>5232</v>
+                                    <v>5116</v>
                                 </b>
                                 <b>
                                     <a>4</a>
                                     <b>6</b>
-                                    <v>5191</v>
+                                    <v>5077</v>
                                 </b>
                                 <b>
                                     <a>6</a>
                                     <b>8</b>
-                                    <v>4369</v>
+                                    <v>4272</v>
                                 </b>
                                 <b>
                                     <a>8</a>
                                     <b>11</b>
-                                    <v>6055</v>
+                                    <v>5920</v>
                                 </b>
                                 <b>
                                     <a>11</a>
                                     <b>17</b>
-                                    <v>6891</v>
+                                    <v>6738</v>
                                 </b>
                                 <b>
                                     <a>17</a>
                                     <b>23</b>
-                                    <v>6001</v>
+                                    <v>5868</v>
                                 </b>
                                 <b>
                                     <a>23</a>
                                     <b>41</b>
-                                    <v>5974</v>
+                                    <v>5841</v>
                                 </b>
                                 <b>
                                     <a>41</a>
                                     <b>95</b>
-                                    <v>5704</v>
+                                    <v>5578</v>
                                 </b>
                                 <b>
                                     <a>95</a>
                                     <b>1726</b>
-                                    <v>4935</v>
+                                    <v>4826</v>
                                 </b>
                             </bs>
                         </hist>
@@ -11791,72 +11770,72 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>4288</v>
+                                    <v>4193</v>
                                 </b>
                                 <b>
                                     <a>2</a>
                                     <b>4</b>
-                                    <v>2090</v>
+                                    <v>2043</v>
                                 </b>
                                 <b>
                                     <a>4</a>
                                     <b>5</b>
-                                    <v>4072</v>
+                                    <v>3982</v>
                                 </b>
                                 <b>
                                     <a>5</a>
                                     <b>8</b>
-                                    <v>3142</v>
+                                    <v>3072</v>
                                 </b>
                                 <b>
                                     <a>8</a>
                                     <b>14</b>
-                                    <v>3789</v>
+                                    <v>3705</v>
                                 </b>
                                 <b>
                                     <a>14</a>
                                     <b>17</b>
-                                    <v>2467</v>
+                                    <v>2413</v>
                                 </b>
                                 <b>
                                     <a>17</a>
                                     <b>24</b>
-                                    <v>3883</v>
+                                    <v>3797</v>
                                 </b>
                                 <b>
                                     <a>24</a>
                                     <b>51</b>
-                                    <v>4517</v>
+                                    <v>4417</v>
                                 </b>
                                 <b>
                                     <a>51</a>
                                     <b>58</b>
-                                    <v>3870</v>
+                                    <v>3784</v>
                                 </b>
                                 <b>
                                     <a>58</a>
                                     <b>80</b>
-                                    <v>3802</v>
+                                    <v>3718</v>
                                 </b>
                                 <b>
                                     <a>81</a>
                                     <b>151</b>
-                                    <v>3937</v>
+                                    <v>3850</v>
                                 </b>
                                 <b>
                                     <a>151</a>
                                     <b>334</b>
-                                    <v>3802</v>
+                                    <v>3718</v>
                                 </b>
                                 <b>
                                     <a>334</a>
                                     <b>473</b>
-                                    <v>3829</v>
+                                    <v>3745</v>
                                 </b>
                                 <b>
                                     <a>473</a>
                                     <b>547</b>
-                                    <v>2953</v>
+                                    <v>2887</v>
                                 </b>
                             </bs>
                         </hist>
@@ -11872,7 +11851,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>50436</v>
+                                    <v>49319</v>
                                 </b>
                                 <b>
                                     <a>2</a>
@@ -11893,72 +11872,72 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>4342</v>
+                                    <v>4246</v>
                                 </b>
                                 <b>
                                     <a>2</a>
                                     <b>4</b>
-                                    <v>2440</v>
+                                    <v>2386</v>
                                 </b>
                                 <b>
                                     <a>4</a>
                                     <b>5</b>
-                                    <v>3897</v>
+                                    <v>3811</v>
                                 </b>
                                 <b>
                                     <a>5</a>
                                     <b>8</b>
-                                    <v>3169</v>
+                                    <v>3098</v>
                                 </b>
                                 <b>
                                     <a>8</a>
                                     <b>14</b>
-                                    <v>4450</v>
+                                    <v>4351</v>
                                 </b>
                                 <b>
                                     <a>14</a>
                                     <b>18</b>
-                                    <v>4409</v>
+                                    <v>4312</v>
                                 </b>
                                 <b>
                                     <a>18</a>
                                     <b>28</b>
-                                    <v>4086</v>
+                                    <v>3995</v>
                                 </b>
                                 <b>
                                     <a>28</a>
                                     <b>34</b>
-                                    <v>4018</v>
+                                    <v>3929</v>
                                 </b>
                                 <b>
                                     <a>34</a>
                                     <b>41</b>
-                                    <v>4086</v>
+                                    <v>3995</v>
                                 </b>
                                 <b>
                                     <a>41</a>
                                     <b>66</b>
-                                    <v>3816</v>
+                                    <v>3731</v>
                                 </b>
                                 <b>
                                     <a>66</a>
                                     <b>92</b>
-                                    <v>3924</v>
+                                    <v>3837</v>
                                 </b>
                                 <b>
                                     <a>92</a>
                                     <b>113</b>
-                                    <v>3816</v>
+                                    <v>3731</v>
                                 </b>
                                 <b>
                                     <a>113</a>
                                     <b>145</b>
-                                    <v>3870</v>
+                                    <v>3784</v>
                                 </b>
                                 <b>
                                     <a>145</a>
                                     <b>172</b>
-                                    <v>121</v>
+                                    <v>118</v>
                                 </b>
                             </bs>
                         </hist>
@@ -11968,15 +11947,15 @@
         </relation>
         <relation>
             <name>inmacroexpansion</name>
-            <cardinality>149575195</cardinality>
+            <cardinality>149602958</cardinality>
             <columnsizes>
                 <e>
                     <k>id</k>
-                    <v>24600427</v>
+                    <v>24604993</v>
                 </e>
                 <e>
                     <k>inv</k>
-                    <v>3693421</v>
+                    <v>3694107</v>
                 </e>
             </columnsizes>
             <dependencies>
@@ -11990,37 +11969,37 @@
                                 <b>
                                     <a>1</a>
                                     <b>3</b>
-                                    <v>2201734</v>
+                                    <v>2202143</v>
                                 </b>
                                 <b>
                                     <a>3</a>
                                     <b>5</b>
-                                    <v>1470855</v>
+                                    <v>1471128</v>
                                 </b>
                                 <b>
                                     <a>5</a>
                                     <b>6</b>
-                                    <v>1615840</v>
+                                    <v>1616140</v>
                                 </b>
                                 <b>
                                     <a>6</a>
                                     <b>7</b>
-                                    <v>6564145</v>
+                                    <v>6565364</v>
                                 </b>
                                 <b>
                                     <a>7</a>
                                     <b>8</b>
-                                    <v>8694629</v>
+                                    <v>8696243</v>
                                 </b>
                                 <b>
                                     <a>8</a>
                                     <b>9</b>
-                                    <v>3547106</v>
+                                    <v>3547764</v>
                                 </b>
                                 <b>
                                     <a>9</a>
                                     <b>22</b>
-                                    <v>506116</v>
+                                    <v>506210</v>
                                 </b>
                             </bs>
                         </hist>
@@ -12036,57 +12015,57 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>528682</v>
+                                    <v>528780</v>
                                 </b>
                                 <b>
                                     <a>2</a>
                                     <b>3</b>
-                                    <v>741131</v>
+                                    <v>741268</v>
                                 </b>
                                 <b>
                                     <a>3</a>
                                     <b>4</b>
-                                    <v>480166</v>
+                                    <v>480255</v>
                                 </b>
                                 <b>
                                     <a>4</a>
                                     <b>7</b>
-                                    <v>274533</v>
+                                    <v>274584</v>
                                 </b>
                                 <b>
                                     <a>7</a>
                                     <b>8</b>
-                                    <v>281364</v>
+                                    <v>281416</v>
                                 </b>
                                 <b>
                                     <a>8</a>
                                     <b>9</b>
-                                    <v>329323</v>
+                                    <v>329385</v>
                                 </b>
                                 <b>
                                     <a>9</a>
                                     <b>10</b>
-                                    <v>3037</v>
+                                    <v>3038</v>
                                 </b>
                                 <b>
                                     <a>10</a>
                                     <b>11</b>
-                                    <v>443407</v>
+                                    <v>443489</v>
                                 </b>
                                 <b>
                                     <a>11</a>
                                     <b>337</b>
-                                    <v>306938</v>
+                                    <v>306995</v>
                                 </b>
                                 <b>
                                     <a>339</a>
                                     <b>423</b>
-                                    <v>280967</v>
+                                    <v>281020</v>
                                 </b>
                                 <b>
                                     <a>423</a>
                                     <b>7616</b>
-                                    <v>23868</v>
+                                    <v>23872</v>
                                 </b>
                             </bs>
                         </hist>
@@ -12096,15 +12075,15 @@
         </relation>
         <relation>
             <name>affectedbymacroexpansion</name>
-            <cardinality>48599612</cardinality>
+            <cardinality>48608633</cardinality>
             <columnsizes>
                 <e>
                     <k>id</k>
-                    <v>7025049</v>
+                    <v>7026352</v>
                 </e>
                 <e>
                     <k>inv</k>
-                    <v>3792491</v>
+                    <v>3793195</v>
                 </e>
             </columnsizes>
             <dependencies>
@@ -12118,37 +12097,37 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>3835957</v>
+                                    <v>3836669</v>
                                 </b>
                                 <b>
                                     <a>2</a>
                                     <b>3</b>
-                                    <v>764163</v>
+                                    <v>764304</v>
                                 </b>
                                 <b>
                                     <a>3</a>
                                     <b>4</b>
-                                    <v>360830</v>
+                                    <v>360897</v>
                                 </b>
                                 <b>
                                     <a>4</a>
                                     <b>5</b>
-                                    <v>770576</v>
+                                    <v>770719</v>
                                 </b>
                                 <b>
                                     <a>5</a>
                                     <b>12</b>
-                                    <v>533664</v>
+                                    <v>533763</v>
                                 </b>
                                 <b>
                                     <a>12</a>
                                     <b>50</b>
-                                    <v>554712</v>
+                                    <v>554815</v>
                                 </b>
                                 <b>
                                     <a>50</a>
                                     <b>9900</b>
-                                    <v>205144</v>
+                                    <v>205182</v>
                                 </b>
                             </bs>
                         </hist>
@@ -12164,67 +12143,67 @@
                                 <b>
                                     <a>1</a>
                                     <b>4</b>
-                                    <v>312373</v>
+                                    <v>312431</v>
                                 </b>
                                 <b>
                                     <a>4</a>
                                     <b>7</b>
-                                    <v>315722</v>
+                                    <v>315781</v>
                                 </b>
                                 <b>
                                     <a>7</a>
                                     <b>9</b>
-                                    <v>300246</v>
+                                    <v>300302</v>
                                 </b>
                                 <b>
                                     <a>9</a>
                                     <b>12</b>
-                                    <v>341980</v>
+                                    <v>342043</v>
                                 </b>
                                 <b>
                                     <a>12</a>
                                     <b>13</b>
-                                    <v>454730</v>
+                                    <v>454814</v>
                                 </b>
                                 <b>
                                     <a>13</a>
                                     <b>14</b>
-                                    <v>225467</v>
+                                    <v>225509</v>
                                 </b>
                                 <b>
                                     <a>14</a>
                                     <b>15</b>
-                                    <v>406898</v>
+                                    <v>406973</v>
                                 </b>
                                 <b>
                                     <a>15</a>
                                     <b>16</b>
-                                    <v>165963</v>
+                                    <v>165994</v>
                                 </b>
                                 <b>
                                     <a>16</a>
                                     <b>17</b>
-                                    <v>376622</v>
+                                    <v>376692</v>
                                 </b>
                                 <b>
                                     <a>17</a>
                                     <b>18</b>
-                                    <v>200076</v>
+                                    <v>200113</v>
                                 </b>
                                 <b>
                                     <a>18</a>
                                     <b>20</b>
-                                    <v>343293</v>
+                                    <v>343357</v>
                                 </b>
                                 <b>
                                     <a>20</a>
                                     <b>25</b>
-                                    <v>284595</v>
+                                    <v>284648</v>
                                 </b>
                                 <b>
                                     <a>25</a>
                                     <b>207</b>
-                                    <v>64521</v>
+                                    <v>64533</v>
                                 </b>
                             </bs>
                         </hist>
@@ -12234,19 +12213,19 @@
         </relation>
         <relation>
             <name>macroinvocations</name>
-            <cardinality>40422573</cardinality>
+            <cardinality>39527898</cardinality>
             <columnsizes>
                 <e>
                     <k>id</k>
-                    <v>40422573</v>
+                    <v>39527898</v>
                 </e>
                 <e>
                     <k>macro_id</k>
-                    <v>109396</v>
+                    <v>106973</v>
                 </e>
                 <e>
                     <k>location</k>
-                    <v>1065236</v>
+                    <v>1041646</v>
                 </e>
                 <e>
                     <k>kind</k>
@@ -12264,7 +12243,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>40422573</v>
+                                    <v>39527898</v>
                                 </b>
                             </bs>
                         </hist>
@@ -12280,7 +12259,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>40422573</v>
+                                    <v>39527898</v>
                                 </b>
                             </bs>
                         </hist>
@@ -12296,7 +12275,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>40422573</v>
+                                    <v>39527898</v>
                                 </b>
                             </bs>
                         </hist>
@@ -12312,52 +12291,52 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>23235</v>
+                                    <v>22721</v>
                                 </b>
                                 <b>
                                     <a>2</a>
                                     <b>3</b>
-                                    <v>20471</v>
+                                    <v>20017</v>
                                 </b>
                                 <b>
                                     <a>3</a>
                                     <b>4</b>
-                                    <v>7484</v>
+                                    <v>7318</v>
                                 </b>
                                 <b>
                                     <a>4</a>
                                     <b>6</b>
-                                    <v>10019</v>
+                                    <v>9797</v>
                                 </b>
                                 <b>
                                     <a>6</a>
                                     <b>11</b>
-                                    <v>9413</v>
+                                    <v>9204</v>
                                 </b>
                                 <b>
                                     <a>11</a>
                                     <b>21</b>
-                                    <v>9048</v>
+                                    <v>8848</v>
                                 </b>
                                 <b>
                                     <a>21</a>
                                     <b>48</b>
-                                    <v>8334</v>
+                                    <v>8149</v>
                                 </b>
                                 <b>
                                     <a>48</a>
                                     <b>145</b>
-                                    <v>8280</v>
+                                    <v>8096</v>
                                 </b>
                                 <b>
                                     <a>145</a>
                                     <b>955</b>
-                                    <v>8212</v>
+                                    <v>8030</v>
                                 </b>
                                 <b>
                                     <a>955</a>
                                     <b>175302</b>
-                                    <v>4895</v>
+                                    <v>4786</v>
                                 </b>
                             </bs>
                         </hist>
@@ -12373,37 +12352,37 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>59970</v>
+                                    <v>58642</v>
                                 </b>
                                 <b>
                                     <a>2</a>
                                     <b>3</b>
-                                    <v>13580</v>
+                                    <v>13279</v>
                                 </b>
                                 <b>
                                     <a>3</a>
                                     <b>4</b>
-                                    <v>6850</v>
+                                    <v>6699</v>
                                 </b>
                                 <b>
                                     <a>4</a>
                                     <b>6</b>
-                                    <v>8684</v>
+                                    <v>8492</v>
                                 </b>
                                 <b>
                                     <a>6</a>
                                     <b>13</b>
-                                    <v>9399</v>
+                                    <v>9191</v>
                                 </b>
                                 <b>
                                     <a>13</a>
                                     <b>67</b>
-                                    <v>8253</v>
+                                    <v>8070</v>
                                 </b>
                                 <b>
                                     <a>67</a>
                                     <b>4815</b>
-                                    <v>2656</v>
+                                    <v>2597</v>
                                 </b>
                             </bs>
                         </hist>
@@ -12419,12 +12398,12 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>100980</v>
+                                    <v>98744</v>
                                 </b>
                                 <b>
                                     <a>2</a>
                                     <b>3</b>
-                                    <v>8415</v>
+                                    <v>8228</v>
                                 </b>
                             </bs>
                         </hist>
@@ -12440,37 +12419,37 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>424327</v>
+                                    <v>414918</v>
                                 </b>
                                 <b>
                                     <a>2</a>
                                     <b>3</b>
-                                    <v>251670</v>
+                                    <v>246136</v>
                                 </b>
                                 <b>
                                     <a>3</a>
                                     <b>4</b>
-                                    <v>112794</v>
+                                    <v>110296</v>
                                 </b>
                                 <b>
                                     <a>4</a>
                                     <b>6</b>
-                                    <v>77246</v>
+                                    <v>75495</v>
                                 </b>
                                 <b>
                                     <a>6</a>
                                     <b>11</b>
-                                    <v>81763</v>
+                                    <v>79966</v>
                                 </b>
                                 <b>
                                     <a>11</a>
                                     <b>41</b>
-                                    <v>80374</v>
+                                    <v>78594</v>
                                 </b>
                                 <b>
                                     <a>41</a>
                                     <b>226300</b>
-                                    <v>37058</v>
+                                    <v>36238</v>
                                 </b>
                             </bs>
                         </hist>
@@ -12486,12 +12465,12 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>1005062</v>
+                                    <v>982806</v>
                                 </b>
                                 <b>
                                     <a>2</a>
                                     <b>367</b>
-                                    <v>60173</v>
+                                    <v>58840</v>
                                 </b>
                             </bs>
                         </hist>
@@ -12507,7 +12486,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>1065236</v>
+                                    <v>1041646</v>
                                 </b>
                             </bs>
                         </hist>
@@ -12526,8 +12505,8 @@
                                     <v>13</v>
                                 </b>
                                 <b>
-                                    <a>2975140</a>
-                                    <b>2975141</b>
+                                    <a>2975175</a>
+                                    <b>2975176</b>
                                     <v>13</v>
                                 </b>
                             </bs>
@@ -12580,15 +12559,15 @@
         </relation>
         <relation>
             <name>macroparent</name>
-            <cardinality>35648322</cardinality>
+            <cardinality>34858909</cardinality>
             <columnsizes>
                 <e>
                     <k>id</k>
-                    <v>35648322</v>
+                    <v>34858909</v>
                 </e>
                 <e>
                     <k>parent_id</k>
-                    <v>27932475</v>
+                    <v>27313925</v>
                 </e>
             </columnsizes>
             <dependencies>
@@ -12602,7 +12581,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>35648322</v>
+                                    <v>34858909</v>
                                 </b>
                             </bs>
                         </hist>
@@ -12618,17 +12597,17 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>21758475</v>
+                                    <v>21276645</v>
                                 </b>
                                 <b>
                                     <a>2</a>
                                     <b>3</b>
-                                    <v>5150852</v>
+                                    <v>5036789</v>
                                 </b>
                                 <b>
                                     <a>3</a>
                                     <b>91</b>
-                                    <v>1023147</v>
+                                    <v>1000490</v>
                                 </b>
                             </bs>
                         </hist>
@@ -12638,15 +12617,15 @@
         </relation>
         <relation>
             <name>macrolocationbind</name>
-            <cardinality>5543583</cardinality>
+            <cardinality>5544605</cardinality>
             <columnsizes>
                 <e>
                     <k>id</k>
-                    <v>3882063</v>
+                    <v>3882778</v>
                 </e>
                 <e>
                     <k>location</k>
-                    <v>2758591</v>
+                    <v>2759100</v>
                 </e>
             </columnsizes>
             <dependencies>
@@ -12660,22 +12639,22 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>3056719</v>
+                                    <v>3057283</v>
                                 </b>
                                 <b>
                                     <a>2</a>
                                     <b>3</b>
-                                    <v>469858</v>
+                                    <v>469944</v>
                                 </b>
                                 <b>
                                     <a>3</a>
                                     <b>7</b>
-                                    <v>314935</v>
+                                    <v>314994</v>
                                 </b>
                                 <b>
                                     <a>7</a>
                                     <b>57</b>
-                                    <v>40549</v>
+                                    <v>40556</v>
                                 </b>
                             </bs>
                         </hist>
@@ -12691,22 +12670,22 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>2198268</v>
+                                    <v>2198673</v>
                                 </b>
                                 <b>
                                     <a>2</a>
                                     <b>3</b>
-                                    <v>240004</v>
+                                    <v>240048</v>
                                 </b>
                                 <b>
                                     <a>3</a>
                                     <b>8</b>
-                                    <v>216571</v>
+                                    <v>216611</v>
                                 </b>
                                 <b>
                                     <a>8</a>
                                     <b>723</b>
-                                    <v>103748</v>
+                                    <v>103767</v>
                                 </b>
                             </bs>
                         </hist>
@@ -12716,19 +12695,19 @@
         </relation>
         <relation>
             <name>macro_argument_unexpanded</name>
-            <cardinality>102782052</cardinality>
+            <cardinality>100507131</cardinality>
             <columnsizes>
                 <e>
                     <k>invocation</k>
-                    <v>31085973</v>
+                    <v>30398157</v>
                 </e>
                 <e>
                     <k>argument_index</k>
-                    <v>890</v>
+                    <v>870</v>
                 </e>
                 <e>
                     <k>text</k>
-                    <v>438272</v>
+                    <v>428566</v>
                 </e>
             </columnsizes>
             <dependencies>
@@ -12742,22 +12721,22 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>9939829</v>
+                                    <v>9719757</v>
                                 </b>
                                 <b>
                                     <a>2</a>
                                     <b>3</b>
-                                    <v>12443923</v>
+                                    <v>12168847</v>
                                 </b>
                                 <b>
                                     <a>3</a>
                                     <b>4</b>
-                                    <v>6366751</v>
+                                    <v>6225802</v>
                                 </b>
                                 <b>
                                     <a>4</a>
                                     <b>67</b>
-                                    <v>2335468</v>
+                                    <v>2283750</v>
                                 </b>
                             </bs>
                         </hist>
@@ -12773,22 +12752,22 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>10173011</v>
+                                    <v>9947774</v>
                                 </b>
                                 <b>
                                     <a>2</a>
                                     <b>3</b>
-                                    <v>12465325</v>
+                                    <v>12189775</v>
                                 </b>
                                 <b>
                                     <a>3</a>
                                     <b>4</b>
-                                    <v>6167729</v>
+                                    <v>6031187</v>
                                 </b>
                                 <b>
                                     <a>4</a>
                                     <b>67</b>
-                                    <v>2279907</v>
+                                    <v>2229419</v>
                                 </b>
                             </bs>
                         </hist>
@@ -12804,17 +12783,17 @@
                                 <b>
                                     <a>46457</a>
                                     <b>46458</b>
-                                    <v>782</v>
+                                    <v>764</v>
                                 </b>
                                 <b>
                                     <a>46659</a>
                                     <b>173182</b>
-                                    <v>67</v>
+                                    <v>65</v>
                                 </b>
                                 <b>
-                                    <a>645292</a>
-                                    <b>2305106</b>
-                                    <v>40</v>
+                                    <a>645295</a>
+                                    <b>2305149</b>
+                                    <v>39</v>
                                 </b>
                             </bs>
                         </hist>
@@ -12830,17 +12809,17 @@
                                 <b>
                                     <a>2</a>
                                     <b>3</b>
-                                    <v>782</v>
+                                    <v>764</v>
                                 </b>
                                 <b>
                                     <a>13</a>
                                     <b>1115</b>
-                                    <v>67</v>
+                                    <v>65</v>
                                 </b>
                                 <b>
                                     <a>7702</a>
                                     <b>22873</b>
-                                    <v>40</v>
+                                    <v>39</v>
                                 </b>
                             </bs>
                         </hist>
@@ -12856,57 +12835,57 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>51717</v>
+                                    <v>50559</v>
                                 </b>
                                 <b>
                                     <a>2</a>
                                     <b>3</b>
-                                    <v>79633</v>
+                                    <v>77882</v>
                                 </b>
                                 <b>
                                     <a>3</a>
                                     <b>4</b>
-                                    <v>29533</v>
+                                    <v>28879</v>
                                 </b>
                                 <b>
                                     <a>4</a>
                                     <b>5</b>
-                                    <v>44314</v>
+                                    <v>43319</v>
                                 </b>
                                 <b>
                                     <a>5</a>
                                     <b>6</b>
-                                    <v>49964</v>
+                                    <v>48844</v>
                                 </b>
                                 <b>
                                     <a>6</a>
                                     <b>9</b>
-                                    <v>36465</v>
+                                    <v>35684</v>
                                 </b>
                                 <b>
                                     <a>9</a>
                                     <b>15</b>
-                                    <v>36654</v>
+                                    <v>35829</v>
                                 </b>
                                 <b>
                                     <a>15</a>
                                     <b>27</b>
-                                    <v>33377</v>
+                                    <v>32651</v>
                                 </b>
                                 <b>
                                     <a>27</a>
                                     <b>57</b>
-                                    <v>33970</v>
+                                    <v>33205</v>
                                 </b>
                                 <b>
                                     <a>57</a>
                                     <b>517</b>
-                                    <v>33093</v>
+                                    <v>32374</v>
                                 </b>
                                 <b>
                                     <a>518</a>
                                     <b>485092</b>
-                                    <v>9547</v>
+                                    <v>9336</v>
                                 </b>
                             </bs>
                         </hist>
@@ -12922,17 +12901,17 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>310481</v>
+                                    <v>303606</v>
                                 </b>
                                 <b>
                                     <a>2</a>
                                     <b>3</b>
-                                    <v>114749</v>
+                                    <v>112208</v>
                                 </b>
                                 <b>
                                     <a>3</a>
                                     <b>9</b>
-                                    <v>13040</v>
+                                    <v>12751</v>
                                 </b>
                             </bs>
                         </hist>
@@ -12942,19 +12921,19 @@
         </relation>
         <relation>
             <name>macro_argument_expanded</name>
-            <cardinality>102782052</cardinality>
+            <cardinality>100507131</cardinality>
             <columnsizes>
                 <e>
                     <k>invocation</k>
-                    <v>31085973</v>
+                    <v>30398157</v>
                 </e>
                 <e>
                     <k>argument_index</k>
-                    <v>890</v>
+                    <v>870</v>
                 </e>
                 <e>
                     <k>text</k>
-                    <v>265479</v>
+                    <v>259600</v>
                 </e>
             </columnsizes>
             <dependencies>
@@ -12968,22 +12947,22 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>9939829</v>
+                                    <v>9719757</v>
                                 </b>
                                 <b>
                                     <a>2</a>
                                     <b>3</b>
-                                    <v>12443923</v>
+                                    <v>12168847</v>
                                 </b>
                                 <b>
                                     <a>3</a>
                                     <b>4</b>
-                                    <v>6366751</v>
+                                    <v>6225802</v>
                                 </b>
                                 <b>
                                     <a>4</a>
                                     <b>67</b>
-                                    <v>2335468</v>
+                                    <v>2283750</v>
                                 </b>
                             </bs>
                         </hist>
@@ -12999,22 +12978,22 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>13706388</v>
+                                    <v>13402907</v>
                                 </b>
                                 <b>
                                     <a>2</a>
                                     <b>3</b>
-                                    <v>10736336</v>
+                                    <v>10499073</v>
                                 </b>
                                 <b>
                                     <a>3</a>
                                     <b>4</b>
-                                    <v>5379705</v>
+                                    <v>5260613</v>
                                 </b>
                                 <b>
                                     <a>4</a>
                                     <b>9</b>
-                                    <v>1263543</v>
+                                    <v>1235562</v>
                                 </b>
                             </bs>
                         </hist>
@@ -13030,17 +13009,17 @@
                                 <b>
                                     <a>46457</a>
                                     <b>46458</b>
-                                    <v>782</v>
+                                    <v>764</v>
                                 </b>
                                 <b>
                                     <a>46659</a>
                                     <b>173182</b>
-                                    <v>67</v>
+                                    <v>65</v>
                                 </b>
                                 <b>
-                                    <a>645292</a>
-                                    <b>2305106</b>
-                                    <v>40</v>
+                                    <a>645295</a>
+                                    <b>2305149</b>
+                                    <v>39</v>
                                 </b>
                             </bs>
                         </hist>
@@ -13056,17 +13035,17 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>768</v>
+                                    <v>751</v>
                                 </b>
                                 <b>
                                     <a>2</a>
                                     <b>96</b>
-                                    <v>67</v>
+                                    <v>65</v>
                                 </b>
                                 <b>
                                     <a>950</a>
                                     <b>16176</b>
-                                    <v>53</v>
+                                    <v>52</v>
                                 </b>
                             </bs>
                         </hist>
@@ -13082,57 +13061,57 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>28171</v>
+                                    <v>27534</v>
                                 </b>
                                 <b>
                                     <a>2</a>
                                     <b>3</b>
-                                    <v>34927</v>
+                                    <v>34167</v>
                                 </b>
                                 <b>
                                     <a>3</a>
                                     <b>4</b>
-                                    <v>58231</v>
+                                    <v>56941</v>
                                 </b>
                                 <b>
                                     <a>4</a>
                                     <b>5</b>
-                                    <v>20538</v>
+                                    <v>20070</v>
                                 </b>
                                 <b>
                                     <a>5</a>
                                     <b>6</b>
-                                    <v>3964</v>
+                                    <v>3863</v>
                                 </b>
                                 <b>
                                     <a>6</a>
                                     <b>7</b>
-                                    <v>23235</v>
+                                    <v>22734</v>
                                 </b>
                                 <b>
                                     <a>7</a>
                                     <b>10</b>
-                                    <v>21590</v>
+                                    <v>21112</v>
                                 </b>
                                 <b>
                                     <a>10</a>
                                     <b>19</b>
-                                    <v>22939</v>
+                                    <v>22444</v>
                                 </b>
                                 <b>
                                     <a>19</a>
                                     <b>51</b>
-                                    <v>19931</v>
+                                    <v>19477</v>
                                 </b>
                                 <b>
                                     <a>51</a>
                                     <b>253</b>
-                                    <v>20053</v>
+                                    <v>19622</v>
                                 </b>
                                 <b>
                                     <a>254</a>
                                     <b>990275</b>
-                                    <v>11894</v>
+                                    <v>11630</v>
                                 </b>
                             </bs>
                         </hist>
@@ -13148,17 +13127,17 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>134169</v>
+                                    <v>131198</v>
                                 </b>
                                 <b>
                                     <a>2</a>
                                     <b>3</b>
-                                    <v>113522</v>
+                                    <v>111008</v>
                                 </b>
                                 <b>
                                     <a>3</a>
                                     <b>66</b>
-                                    <v>17787</v>
+                                    <v>17393</v>
                                 </b>
                             </bs>
                         </hist>
@@ -13168,19 +13147,19 @@
         </relation>
         <relation>
             <name>functions</name>
-            <cardinality>4015439</cardinality>
+            <cardinality>4000084</cardinality>
             <columnsizes>
                 <e>
                     <k>id</k>
-                    <v>4015439</v>
+                    <v>4000084</v>
                 </e>
                 <e>
                     <k>name</k>
-                    <v>1650451</v>
+                    <v>1644139</v>
                 </e>
                 <e>
                     <k>kind</k>
-                    <v>1000</v>
+                    <v>996</v>
                 </e>
             </columnsizes>
             <dependencies>
@@ -13194,7 +13173,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>4015439</v>
+                                    <v>4000084</v>
                                 </b>
                             </bs>
                         </hist>
@@ -13210,7 +13189,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>4015439</v>
+                                    <v>4000084</v>
                                 </b>
                             </bs>
                         </hist>
@@ -13226,17 +13205,17 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>1403934</v>
+                                    <v>1398565</v>
                                 </b>
                                 <b>
                                     <a>2</a>
                                     <b>4</b>
-                                    <v>139330</v>
+                                    <v>138797</v>
                                 </b>
                                 <b>
                                     <a>4</a>
                                     <b>3162</b>
-                                    <v>107186</v>
+                                    <v>106776</v>
                                 </b>
                             </bs>
                         </hist>
@@ -13252,12 +13231,12 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>1647574</v>
+                                    <v>1641274</v>
                                 </b>
                                 <b>
                                     <a>2</a>
                                     <b>3</b>
-                                    <v>2876</v>
+                                    <v>2865</v>
                                 </b>
                             </bs>
                         </hist>
@@ -13273,42 +13252,42 @@
                                 <b>
                                     <a>8</a>
                                     <b>9</b>
-                                    <v>125</v>
+                                    <v>124</v>
                                 </b>
                                 <b>
                                     <a>13</a>
                                     <b>14</b>
-                                    <v>125</v>
+                                    <v>124</v>
                                 </b>
                                 <b>
                                     <a>47</a>
                                     <b>48</b>
-                                    <v>125</v>
+                                    <v>124</v>
                                 </b>
                                 <b>
                                     <a>83</a>
                                     <b>84</b>
-                                    <v>125</v>
+                                    <v>124</v>
                                 </b>
                                 <b>
                                     <a>690</a>
                                     <b>691</b>
-                                    <v>125</v>
+                                    <v>124</v>
                                 </b>
                                 <b>
                                     <a>4450</a>
                                     <b>4451</b>
-                                    <v>125</v>
+                                    <v>124</v>
                                 </b>
                                 <b>
                                     <a>5230</a>
                                     <b>5231</b>
-                                    <v>125</v>
+                                    <v>124</v>
                                 </b>
                                 <b>
                                     <a>21584</a>
                                     <b>21585</b>
-                                    <v>125</v>
+                                    <v>124</v>
                                 </b>
                             </bs>
                         </hist>
@@ -13324,42 +13303,42 @@
                                 <b>
                                     <a>2</a>
                                     <b>3</b>
-                                    <v>125</v>
+                                    <v>124</v>
                                 </b>
                                 <b>
                                     <a>13</a>
                                     <b>14</b>
-                                    <v>125</v>
+                                    <v>124</v>
                                 </b>
                                 <b>
                                     <a>18</a>
                                     <b>19</b>
-                                    <v>125</v>
+                                    <v>124</v>
                                 </b>
                                 <b>
                                     <a>41</a>
                                     <b>42</b>
-                                    <v>125</v>
+                                    <v>124</v>
                                 </b>
                                 <b>
                                     <a>43</a>
                                     <b>44</b>
-                                    <v>125</v>
+                                    <v>124</v>
                                 </b>
                                 <b>
                                     <a>302</a>
                                     <b>303</b>
-                                    <v>125</v>
+                                    <v>124</v>
                                 </b>
                                 <b>
                                     <a>504</a>
                                     <b>505</b>
-                                    <v>125</v>
+                                    <v>124</v>
                                 </b>
                                 <b>
                                     <a>12296</a>
                                     <b>12297</b>
-                                    <v>125</v>
+                                    <v>124</v>
                                 </b>
                             </bs>
                         </hist>
@@ -13369,15 +13348,15 @@
         </relation>
         <relation>
             <name>function_entry_point</name>
-            <cardinality>1432100</cardinality>
+            <cardinality>1430682</cardinality>
             <columnsizes>
                 <e>
                     <k>id</k>
-                    <v>1427396</v>
+                    <v>1425982</v>
                 </e>
                 <e>
                     <k>entry_point</k>
-                    <v>1432100</v>
+                    <v>1430682</v>
                 </e>
             </columnsizes>
             <dependencies>
@@ -13391,12 +13370,12 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>1423376</v>
+                                    <v>1421966</v>
                                 </b>
                                 <b>
                                     <a>2</a>
                                     <b>17</b>
-                                    <v>4020</v>
+                                    <v>4016</v>
                                 </b>
                             </bs>
                         </hist>
@@ -13412,7 +13391,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>1432100</v>
+                                    <v>1430682</v>
                                 </b>
                             </bs>
                         </hist>
@@ -13422,15 +13401,15 @@
         </relation>
         <relation>
             <name>function_return_type</name>
-            <cardinality>4032949</cardinality>
+            <cardinality>4017527</cardinality>
             <columnsizes>
                 <e>
                     <k>id</k>
-                    <v>4015439</v>
+                    <v>4000084</v>
                 </e>
                 <e>
                     <k>return_type</k>
-                    <v>623609</v>
+                    <v>621224</v>
                 </e>
             </columnsizes>
             <dependencies>
@@ -13444,12 +13423,12 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>3997929</v>
+                                    <v>3982641</v>
                                 </b>
                                 <b>
                                     <a>2</a>
                                     <b>3</b>
-                                    <v>17510</v>
+                                    <v>17443</v>
                                 </b>
                             </bs>
                         </hist>
@@ -13465,27 +13444,27 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>313305</v>
+                                    <v>312107</v>
                                 </b>
                                 <b>
                                     <a>2</a>
                                     <b>3</b>
-                                    <v>213748</v>
+                                    <v>212930</v>
                                 </b>
                                 <b>
                                     <a>3</a>
                                     <b>5</b>
-                                    <v>48527</v>
+                                    <v>48342</v>
                                 </b>
                                 <b>
                                     <a>5</a>
                                     <b>354</b>
-                                    <v>46776</v>
+                                    <v>46598</v>
                                 </b>
                                 <b>
                                     <a>358</a>
                                     <b>9897</b>
-                                    <v>1250</v>
+                                    <v>1245</v>
                                 </b>
                             </bs>
                         </hist>
@@ -13765,59 +13744,59 @@
         </relation>
         <relation>
             <name>purefunctions</name>
-            <cardinality>138705</cardinality>
+            <cardinality>138354</cardinality>
             <columnsizes>
                 <e>
                     <k>id</k>
-                    <v>138705</v>
+                    <v>138354</v>
                 </e>
             </columnsizes>
             <dependencies/>
         </relation>
         <relation>
             <name>function_deleted</name>
-            <cardinality>94271</cardinality>
+            <cardinality>94264</cardinality>
             <columnsizes>
                 <e>
                     <k>id</k>
-                    <v>94271</v>
+                    <v>94264</v>
                 </e>
             </columnsizes>
             <dependencies/>
         </relation>
         <relation>
             <name>function_defaulted</name>
-            <cardinality>55310</cardinality>
+            <cardinality>55306</cardinality>
             <columnsizes>
                 <e>
                     <k>id</k>
-                    <v>55310</v>
+                    <v>55306</v>
                 </e>
             </columnsizes>
             <dependencies/>
         </relation>
         <relation>
             <name>function_prototyped</name>
-            <cardinality>4013938</cardinality>
+            <cardinality>3998589</cardinality>
             <columnsizes>
                 <e>
                     <k>id</k>
-                    <v>4013938</v>
+                    <v>3998589</v>
                 </e>
             </columnsizes>
             <dependencies/>
         </relation>
         <relation>
             <name>deduction_guide_for_class</name>
-            <cardinality>5878</cardinality>
+            <cardinality>5855</cardinality>
             <columnsizes>
                 <e>
                     <k>id</k>
-                    <v>5878</v>
+                    <v>5855</v>
                 </e>
                 <e>
                     <k>class_template</k>
-                    <v>2251</v>
+                    <v>2242</v>
                 </e>
             </columnsizes>
             <dependencies>
@@ -13831,7 +13810,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>5878</v>
+                                    <v>5855</v>
                                 </b>
                             </bs>
                         </hist>
@@ -13847,32 +13826,32 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>1125</v>
+                                    <v>1121</v>
                                 </b>
                                 <b>
                                     <a>2</a>
                                     <b>3</b>
-                                    <v>375</v>
+                                    <v>373</v>
                                 </b>
                                 <b>
                                     <a>3</a>
                                     <b>4</b>
-                                    <v>125</v>
+                                    <v>124</v>
                                 </b>
                                 <b>
                                     <a>4</a>
                                     <b>5</b>
-                                    <v>250</v>
+                                    <v>249</v>
                                 </b>
                                 <b>
                                     <a>5</a>
                                     <b>6</b>
-                                    <v>125</v>
+                                    <v>124</v>
                                 </b>
                                 <b>
                                     <a>8</a>
                                     <b>9</b>
-                                    <v>250</v>
+                                    <v>249</v>
                                 </b>
                             </bs>
                         </hist>
@@ -13882,15 +13861,15 @@
         </relation>
         <relation>
             <name>member_function_this_type</name>
-            <cardinality>841186</cardinality>
+            <cardinality>840353</cardinality>
             <columnsizes>
                 <e>
                     <k>id</k>
-                    <v>841186</v>
+                    <v>840353</v>
                 </e>
                 <e>
                     <k>this_type</k>
-                    <v>239923</v>
+                    <v>239686</v>
                 </e>
             </columnsizes>
             <dependencies>
@@ -13904,7 +13883,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>841186</v>
+                                    <v>840353</v>
                                 </b>
                             </bs>
                         </hist>
@@ -13920,37 +13899,37 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>73730</v>
+                                    <v>73657</v>
                                 </b>
                                 <b>
                                     <a>2</a>
                                     <b>3</b>
-                                    <v>70223</v>
+                                    <v>70154</v>
                                 </b>
                                 <b>
                                     <a>3</a>
                                     <b>4</b>
-                                    <v>33743</v>
+                                    <v>33709</v>
                                 </b>
                                 <b>
                                     <a>4</a>
                                     <b>5</b>
-                                    <v>15396</v>
+                                    <v>15380</v>
                                 </b>
                                 <b>
                                     <a>5</a>
                                     <b>7</b>
-                                    <v>21854</v>
+                                    <v>21832</v>
                                 </b>
                                 <b>
                                     <a>7</a>
                                     <b>13</b>
-                                    <v>18903</v>
+                                    <v>18884</v>
                                 </b>
                                 <b>
                                     <a>13</a>
                                     <b>530</b>
-                                    <v>6072</v>
+                                    <v>6066</v>
                                 </b>
                             </bs>
                         </hist>
@@ -13960,27 +13939,27 @@
         </relation>
         <relation>
             <name>fun_decls</name>
-            <cardinality>4160522</cardinality>
+            <cardinality>4144613</cardinality>
             <columnsizes>
                 <e>
                     <k>id</k>
-                    <v>4154519</v>
+                    <v>4138632</v>
                 </e>
                 <e>
                     <k>function</k>
-                    <v>3990925</v>
+                    <v>3975663</v>
                 </e>
                 <e>
                     <k>type_id</k>
-                    <v>615604</v>
+                    <v>613250</v>
                 </e>
                 <e>
                     <k>name</k>
-                    <v>1648950</v>
+                    <v>1642644</v>
                 </e>
                 <e>
                     <k>location</k>
-                    <v>2773098</v>
+                    <v>2762493</v>
                 </e>
             </columnsizes>
             <dependencies>
@@ -13994,7 +13973,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>4154519</v>
+                                    <v>4138632</v>
                                 </b>
                             </bs>
                         </hist>
@@ -14010,12 +13989,12 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>4148516</v>
+                                    <v>4132652</v>
                                 </b>
                                 <b>
                                     <a>2</a>
                                     <b>3</b>
-                                    <v>6003</v>
+                                    <v>5980</v>
                                 </b>
                             </bs>
                         </hist>
@@ -14031,7 +14010,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>4154519</v>
+                                    <v>4138632</v>
                                 </b>
                             </bs>
                         </hist>
@@ -14047,7 +14026,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>4154519</v>
+                                    <v>4138632</v>
                                 </b>
                             </bs>
                         </hist>
@@ -14063,12 +14042,12 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>3840713</v>
+                                    <v>3826026</v>
                                 </b>
                                 <b>
                                     <a>2</a>
                                     <b>4</b>
-                                    <v>150211</v>
+                                    <v>149637</v>
                                 </b>
                             </bs>
                         </hist>
@@ -14084,12 +14063,12 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>3972414</v>
+                                    <v>3957223</v>
                                 </b>
                                 <b>
                                     <a>2</a>
                                     <b>3</b>
-                                    <v>18510</v>
+                                    <v>18439</v>
                                 </b>
                             </bs>
                         </hist>
@@ -14105,7 +14084,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>3990925</v>
+                                    <v>3975663</v>
                                 </b>
                             </bs>
                         </hist>
@@ -14121,12 +14100,12 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>3847467</v>
+                                    <v>3832754</v>
                                 </b>
                                 <b>
                                     <a>2</a>
                                     <b>4</b>
-                                    <v>143457</v>
+                                    <v>142909</v>
                                 </b>
                             </bs>
                         </hist>
@@ -14142,27 +14121,27 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>298547</v>
+                                    <v>297405</v>
                                 </b>
                                 <b>
                                     <a>2</a>
                                     <b>3</b>
-                                    <v>220627</v>
+                                    <v>219783</v>
                                 </b>
                                 <b>
                                     <a>3</a>
                                     <b>5</b>
-                                    <v>48903</v>
+                                    <v>48716</v>
                                 </b>
                                 <b>
                                     <a>5</a>
                                     <b>354</b>
-                                    <v>46276</v>
+                                    <v>46099</v>
                                 </b>
                                 <b>
                                     <a>358</a>
                                     <b>10246</b>
-                                    <v>1250</v>
+                                    <v>1245</v>
                                 </b>
                             </bs>
                         </hist>
@@ -14178,27 +14157,27 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>308677</v>
+                                    <v>307497</v>
                                 </b>
                                 <b>
                                     <a>2</a>
                                     <b>3</b>
-                                    <v>211872</v>
+                                    <v>211061</v>
                                 </b>
                                 <b>
                                     <a>3</a>
                                     <b>5</b>
-                                    <v>48527</v>
+                                    <v>48342</v>
                                 </b>
                                 <b>
                                     <a>5</a>
                                     <b>1033</b>
-                                    <v>46276</v>
+                                    <v>46099</v>
                                 </b>
                                 <b>
                                     <a>1483</a>
                                     <b>9847</b>
-                                    <v>250</v>
+                                    <v>249</v>
                                 </b>
                             </bs>
                         </hist>
@@ -14214,22 +14193,22 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>495160</v>
+                                    <v>493266</v>
                                 </b>
                                 <b>
                                     <a>2</a>
                                     <b>3</b>
-                                    <v>52780</v>
+                                    <v>52578</v>
                                 </b>
                                 <b>
                                     <a>3</a>
                                     <b>7</b>
-                                    <v>51154</v>
+                                    <v>50958</v>
                                 </b>
                                 <b>
                                     <a>7</a>
                                     <b>2211</b>
-                                    <v>16509</v>
+                                    <v>16446</v>
                                 </b>
                             </bs>
                         </hist>
@@ -14245,22 +14224,22 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>458514</v>
+                                    <v>456760</v>
                                 </b>
                                 <b>
                                     <a>2</a>
                                     <b>3</b>
-                                    <v>69540</v>
+                                    <v>69274</v>
                                 </b>
                                 <b>
                                     <a>3</a>
                                     <b>6</b>
-                                    <v>55907</v>
+                                    <v>55693</v>
                                 </b>
                                 <b>
                                     <a>6</a>
                                     <b>4728</b>
-                                    <v>31643</v>
+                                    <v>31522</v>
                                 </b>
                             </bs>
                         </hist>
@@ -14276,22 +14255,22 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>1299248</v>
+                                    <v>1294280</v>
                                 </b>
                                 <b>
                                     <a>2</a>
                                     <b>3</b>
-                                    <v>184106</v>
+                                    <v>183402</v>
                                 </b>
                                 <b>
                                     <a>3</a>
                                     <b>10</b>
-                                    <v>125697</v>
+                                    <v>125216</v>
                                 </b>
                                 <b>
                                     <a>10</a>
                                     <b>3169</b>
-                                    <v>39897</v>
+                                    <v>39745</v>
                                 </b>
                             </bs>
                         </hist>
@@ -14307,17 +14286,17 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>1403433</v>
+                                    <v>1398067</v>
                                 </b>
                                 <b>
                                     <a>2</a>
                                     <b>4</b>
-                                    <v>139705</v>
+                                    <v>139171</v>
                                 </b>
                                 <b>
                                     <a>4</a>
                                     <b>3162</b>
-                                    <v>105810</v>
+                                    <v>105406</v>
                                 </b>
                             </bs>
                         </hist>
@@ -14333,12 +14312,12 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>1558773</v>
+                                    <v>1552812</v>
                                 </b>
                                 <b>
                                     <a>2</a>
                                     <b>1596</b>
-                                    <v>90176</v>
+                                    <v>89832</v>
                                 </b>
                             </bs>
                         </hist>
@@ -14354,17 +14333,17 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>1323637</v>
+                                    <v>1318576</v>
                                 </b>
                                 <b>
                                     <a>2</a>
                                     <b>3</b>
-                                    <v>208745</v>
+                                    <v>207947</v>
                                 </b>
                                 <b>
                                     <a>3</a>
                                     <b>1592</b>
-                                    <v>116567</v>
+                                    <v>116121</v>
                                 </b>
                             </bs>
                         </hist>
@@ -14380,17 +14359,17 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>2392879</v>
+                                    <v>2383728</v>
                                 </b>
                                 <b>
                                     <a>2</a>
                                     <b>3</b>
-                                    <v>238012</v>
+                                    <v>237102</v>
                                 </b>
                                 <b>
                                     <a>3</a>
                                     <b>211</b>
-                                    <v>142206</v>
+                                    <v>141663</v>
                                 </b>
                             </bs>
                         </hist>
@@ -14406,17 +14385,17 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>2396631</v>
+                                    <v>2387466</v>
                                 </b>
                                 <b>
                                     <a>2</a>
                                     <b>3</b>
-                                    <v>234760</v>
+                                    <v>233862</v>
                                 </b>
                                 <b>
                                     <a>3</a>
                                     <b>211</b>
-                                    <v>141706</v>
+                                    <v>141164</v>
                                 </b>
                             </bs>
                         </hist>
@@ -14432,12 +14411,12 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>2657656</v>
+                                    <v>2647493</v>
                                 </b>
                                 <b>
                                     <a>2</a>
                                     <b>211</b>
-                                    <v>115441</v>
+                                    <v>115000</v>
                                 </b>
                             </bs>
                         </hist>
@@ -14453,12 +14432,12 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>2733825</v>
+                                    <v>2723371</v>
                                 </b>
                                 <b>
                                     <a>2</a>
                                     <b>8</b>
-                                    <v>39272</v>
+                                    <v>39122</v>
                                 </b>
                             </bs>
                         </hist>
@@ -14468,22 +14447,22 @@
         </relation>
         <relation>
             <name>fun_def</name>
-            <cardinality>1584950</cardinality>
+            <cardinality>1583380</cardinality>
             <columnsizes>
                 <e>
                     <k>id</k>
-                    <v>1584950</v>
+                    <v>1583380</v>
                 </e>
             </columnsizes>
             <dependencies/>
         </relation>
         <relation>
             <name>fun_specialized</name>
-            <cardinality>8434</cardinality>
+            <cardinality>8413</cardinality>
             <columnsizes>
                 <e>
                     <k>id</k>
-                    <v>8434</v>
+                    <v>8413</v>
                 </e>
             </columnsizes>
             <dependencies/>
@@ -14501,15 +14480,15 @@
         </relation>
         <relation>
             <name>fun_decl_specifiers</name>
-            <cardinality>4106992</cardinality>
+            <cardinality>4091286</cardinality>
             <columnsizes>
                 <e>
                     <k>id</k>
-                    <v>1690224</v>
+                    <v>1683760</v>
                 </e>
                 <e>
                     <k>name</k>
-                    <v>1375</v>
+                    <v>1370</v>
                 </e>
             </columnsizes>
             <dependencies>
@@ -14523,22 +14502,22 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>361958</v>
+                                    <v>360574</v>
                                 </b>
                                 <b>
                                     <a>2</a>
                                     <b>3</b>
-                                    <v>262776</v>
+                                    <v>261771</v>
                                 </b>
                                 <b>
                                     <a>3</a>
                                     <b>4</b>
-                                    <v>1042475</v>
+                                    <v>1038489</v>
                                 </b>
                                 <b>
                                     <a>4</a>
                                     <b>5</b>
-                                    <v>23013</v>
+                                    <v>22925</v>
                                 </b>
                             </bs>
                         </hist>
@@ -14554,57 +14533,57 @@
                                 <b>
                                     <a>15</a>
                                     <b>16</b>
-                                    <v>125</v>
+                                    <v>124</v>
                                 </b>
                                 <b>
                                     <a>19</a>
                                     <b>20</b>
-                                    <v>125</v>
+                                    <v>124</v>
                                 </b>
                                 <b>
                                     <a>224</a>
                                     <b>225</b>
-                                    <v>125</v>
+                                    <v>124</v>
                                 </b>
                                 <b>
                                     <a>261</a>
                                     <b>262</b>
-                                    <v>125</v>
+                                    <v>124</v>
                                 </b>
                                 <b>
                                     <a>546</a>
                                     <b>547</b>
-                                    <v>125</v>
+                                    <v>124</v>
                                 </b>
                                 <b>
                                     <a>826</a>
                                     <b>827</b>
-                                    <v>125</v>
+                                    <v>124</v>
                                 </b>
                                 <b>
                                     <a>1032</a>
                                     <b>1033</b>
-                                    <v>125</v>
+                                    <v>124</v>
                                 </b>
                                 <b>
                                     <a>1089</a>
                                     <b>1090</b>
-                                    <v>125</v>
+                                    <v>124</v>
                                 </b>
                                 <b>
                                     <a>7668</a>
                                     <b>7669</b>
-                                    <v>125</v>
+                                    <v>124</v>
                                 </b>
                                 <b>
                                     <a>10543</a>
                                     <b>10544</b>
-                                    <v>125</v>
+                                    <v>124</v>
                                 </b>
                                 <b>
                                     <a>10614</a>
                                     <b>10615</b>
-                                    <v>125</v>
+                                    <v>124</v>
                                 </b>
                             </bs>
                         </hist>
@@ -14735,26 +14714,26 @@
         </relation>
         <relation>
             <name>fun_decl_empty_throws</name>
-            <cardinality>436983</cardinality>
+            <cardinality>435875</cardinality>
             <columnsizes>
                 <e>
                     <k>fun_decl</k>
-                    <v>436983</v>
+                    <v>435875</v>
                 </e>
             </columnsizes>
             <dependencies/>
         </relation>
         <relation>
             <name>fun_decl_noexcept</name>
-            <cardinality>178039</cardinality>
+            <cardinality>177863</cardinality>
             <columnsizes>
                 <e>
                     <k>fun_decl</k>
-                    <v>178039</v>
+                    <v>177863</v>
                 </e>
                 <e>
                     <k>constant</k>
-                    <v>177440</v>
+                    <v>177265</v>
                 </e>
             </columnsizes>
             <dependencies>
@@ -14768,7 +14747,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>178039</v>
+                                    <v>177863</v>
                                 </b>
                             </bs>
                         </hist>
@@ -14784,7 +14763,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>176884</v>
+                                    <v>176709</v>
                                 </b>
                                 <b>
                                     <a>2</a>
@@ -14799,26 +14778,26 @@
         </relation>
         <relation>
             <name>fun_decl_empty_noexcept</name>
-            <cardinality>1165171</cardinality>
+            <cardinality>1160715</cardinality>
             <columnsizes>
                 <e>
                     <k>fun_decl</k>
-                    <v>1165171</v>
+                    <v>1160715</v>
                 </e>
             </columnsizes>
             <dependencies/>
         </relation>
         <relation>
             <name>fun_decl_typedef_type</name>
-            <cardinality>2796</cardinality>
+            <cardinality>2769</cardinality>
             <columnsizes>
                 <e>
                     <k>fun_decl</k>
-                    <v>2796</v>
+                    <v>2769</v>
                 </e>
                 <e>
                     <k>typedeftype_id</k>
-                    <v>125</v>
+                    <v>124</v>
                 </e>
             </columnsizes>
             <dependencies>
@@ -14832,7 +14811,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>2796</v>
+                                    <v>2769</v>
                                 </b>
                             </bs>
                         </hist>
@@ -14908,11 +14887,11 @@
         </relation>
         <relation>
             <name>fun_requires</name>
-            <cardinality>31155</cardinality>
+            <cardinality>31152</cardinality>
             <columnsizes>
                 <e>
                     <k>id</k>
-                    <v>10822</v>
+                    <v>10821</v>
                 </e>
                 <e>
                     <k>kind</k>
@@ -14920,7 +14899,7 @@
                 </e>
                 <e>
                     <k>constraint</k>
-                    <v>30901</v>
+                    <v>30899</v>
                 </e>
             </columnsizes>
             <dependencies>
@@ -14934,7 +14913,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>10753</v>
+                                    <v>10752</v>
                                 </b>
                                 <b>
                                     <a>2</a>
@@ -14955,7 +14934,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>7783</v>
+                                    <v>7782</v>
                                 </b>
                                 <b>
                                     <a>2</a>
@@ -14965,7 +14944,7 @@
                                 <b>
                                     <a>3</a>
                                     <b>6</b>
-                                    <v>921</v>
+                                    <v>920</v>
                                 </b>
                                 <b>
                                     <a>6</a>
@@ -15038,7 +15017,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>30648</v>
+                                    <v>30645</v>
                                 </b>
                                 <b>
                                     <a>2</a>
@@ -15059,7 +15038,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>30901</v>
+                                    <v>30899</v>
                                 </b>
                             </bs>
                         </hist>
@@ -15069,19 +15048,19 @@
         </relation>
         <relation>
             <name>param_decl_bind</name>
-            <cardinality>7198273</cardinality>
+            <cardinality>7170747</cardinality>
             <columnsizes>
                 <e>
                     <k>id</k>
-                    <v>7198273</v>
+                    <v>7170747</v>
                 </e>
                 <e>
                     <k>index</k>
-                    <v>8004</v>
+                    <v>7974</v>
                 </e>
                 <e>
                     <k>fun_decl</k>
-                    <v>3482131</v>
+                    <v>3468816</v>
                 </e>
             </columnsizes>
             <dependencies>
@@ -15095,7 +15074,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>7198273</v>
+                                    <v>7170747</v>
                                 </b>
                             </bs>
                         </hist>
@@ -15111,7 +15090,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>7198273</v>
+                                    <v>7170747</v>
                                 </b>
                             </bs>
                         </hist>
@@ -15127,32 +15106,32 @@
                                 <b>
                                     <a>2</a>
                                     <b>3</b>
-                                    <v>4002</v>
+                                    <v>3987</v>
                                 </b>
                                 <b>
                                     <a>6</a>
                                     <b>7</b>
-                                    <v>2001</v>
+                                    <v>1993</v>
                                 </b>
                                 <b>
                                     <a>16</a>
                                     <b>20</b>
-                                    <v>625</v>
+                                    <v>622</v>
                                 </b>
                                 <b>
                                     <a>25</a>
                                     <b>143</b>
-                                    <v>625</v>
+                                    <v>622</v>
                                 </b>
                                 <b>
                                     <a>332</a>
                                     <b>15841</b>
-                                    <v>625</v>
+                                    <v>622</v>
                                 </b>
                                 <b>
                                     <a>27841</a>
                                     <b>27842</b>
-                                    <v>125</v>
+                                    <v>124</v>
                                 </b>
                             </bs>
                         </hist>
@@ -15168,32 +15147,32 @@
                                 <b>
                                     <a>2</a>
                                     <b>3</b>
-                                    <v>4002</v>
+                                    <v>3987</v>
                                 </b>
                                 <b>
                                     <a>6</a>
                                     <b>7</b>
-                                    <v>2001</v>
+                                    <v>1993</v>
                                 </b>
                                 <b>
                                     <a>16</a>
                                     <b>20</b>
-                                    <v>625</v>
+                                    <v>622</v>
                                 </b>
                                 <b>
                                     <a>25</a>
                                     <b>143</b>
-                                    <v>625</v>
+                                    <v>622</v>
                                 </b>
                                 <b>
                                     <a>332</a>
                                     <b>15841</b>
-                                    <v>625</v>
+                                    <v>622</v>
                                 </b>
                                 <b>
                                     <a>27841</a>
                                     <b>27842</b>
-                                    <v>125</v>
+                                    <v>124</v>
                                 </b>
                             </bs>
                         </hist>
@@ -15209,27 +15188,27 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>1500990</v>
+                                    <v>1495250</v>
                                 </b>
                                 <b>
                                     <a>2</a>
                                     <b>3</b>
-                                    <v>957927</v>
+                                    <v>954263</v>
                                 </b>
                                 <b>
                                     <a>3</a>
                                     <b>4</b>
-                                    <v>580584</v>
+                                    <v>578364</v>
                                 </b>
                                 <b>
                                     <a>4</a>
                                     <b>5</b>
-                                    <v>283413</v>
+                                    <v>282329</v>
                                 </b>
                                 <b>
                                     <a>5</a>
                                     <b>65</b>
-                                    <v>159216</v>
+                                    <v>158607</v>
                                 </b>
                             </bs>
                         </hist>
@@ -15245,27 +15224,27 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>1500990</v>
+                                    <v>1495250</v>
                                 </b>
                                 <b>
                                     <a>2</a>
                                     <b>3</b>
-                                    <v>957927</v>
+                                    <v>954263</v>
                                 </b>
                                 <b>
                                     <a>3</a>
                                     <b>4</b>
-                                    <v>580584</v>
+                                    <v>578364</v>
                                 </b>
                                 <b>
                                     <a>4</a>
                                     <b>5</b>
-                                    <v>283413</v>
+                                    <v>282329</v>
                                 </b>
                                 <b>
                                     <a>5</a>
                                     <b>65</b>
-                                    <v>159216</v>
+                                    <v>158607</v>
                                 </b>
                             </bs>
                         </hist>
@@ -15275,27 +15254,27 @@
         </relation>
         <relation>
             <name>var_decls</name>
-            <cardinality>9254083</cardinality>
+            <cardinality>9244736</cardinality>
             <columnsizes>
                 <e>
                     <k>id</k>
-                    <v>9247204</v>
+                    <v>9237883</v>
                 </e>
                 <e>
                     <k>variable</k>
-                    <v>8956662</v>
+                    <v>8948452</v>
                 </e>
                 <e>
                     <k>type_id</k>
-                    <v>1464093</v>
+                    <v>1458495</v>
                 </e>
                 <e>
                     <k>name</k>
-                    <v>853366</v>
+                    <v>850103</v>
                 </e>
                 <e>
                     <k>location</k>
-                    <v>6211705</v>
+                    <v>6187951</v>
                 </e>
             </columnsizes>
             <dependencies>
@@ -15309,7 +15288,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>9247204</v>
+                                    <v>9237883</v>
                                 </b>
                             </bs>
                         </hist>
@@ -15325,12 +15304,12 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>9240325</v>
+                                    <v>9231030</v>
                                 </b>
                                 <b>
                                     <a>2</a>
                                     <b>3</b>
-                                    <v>6878</v>
+                                    <v>6852</v>
                                 </b>
                             </bs>
                         </hist>
@@ -15346,7 +15325,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>9247204</v>
+                                    <v>9237883</v>
                                 </b>
                             </bs>
                         </hist>
@@ -15362,7 +15341,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>9247204</v>
+                                    <v>9237883</v>
                                 </b>
                             </bs>
                         </hist>
@@ -15378,12 +15357,12 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>8679127</v>
+                                    <v>8671978</v>
                                 </b>
                                 <b>
                                     <a>2</a>
                                     <b>4</b>
-                                    <v>277534</v>
+                                    <v>276473</v>
                                 </b>
                             </bs>
                         </hist>
@@ -15399,12 +15378,12 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>8917889</v>
+                                    <v>8909827</v>
                                 </b>
                                 <b>
                                     <a>2</a>
                                     <b>3</b>
-                                    <v>38772</v>
+                                    <v>38624</v>
                                 </b>
                             </bs>
                         </hist>
@@ -15420,12 +15399,12 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>8850851</v>
+                                    <v>8843045</v>
                                 </b>
                                 <b>
                                     <a>2</a>
                                     <b>4</b>
-                                    <v>105810</v>
+                                    <v>105406</v>
                                 </b>
                             </bs>
                         </hist>
@@ -15441,12 +15420,12 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>8704516</v>
+                                    <v>8697270</v>
                                 </b>
                                 <b>
                                     <a>2</a>
                                     <b>4</b>
-                                    <v>252145</v>
+                                    <v>251181</v>
                                 </b>
                             </bs>
                         </hist>
@@ -15462,27 +15441,27 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>855743</v>
+                                    <v>852470</v>
                                 </b>
                                 <b>
                                     <a>2</a>
                                     <b>3</b>
-                                    <v>285289</v>
+                                    <v>284198</v>
                                 </b>
                                 <b>
                                     <a>3</a>
                                     <b>5</b>
-                                    <v>128198</v>
+                                    <v>127708</v>
                                 </b>
                                 <b>
                                     <a>5</a>
                                     <b>11</b>
-                                    <v>113065</v>
+                                    <v>112632</v>
                                 </b>
                                 <b>
                                     <a>11</a>
-                                    <b>2767</b>
-                                    <v>81797</v>
+                                    <b>2944</b>
+                                    <v>81484</v>
                                 </b>
                             </bs>
                         </hist>
@@ -15498,27 +15477,27 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>876129</v>
+                                    <v>872779</v>
                                 </b>
                                 <b>
                                     <a>2</a>
                                     <b>3</b>
-                                    <v>270781</v>
+                                    <v>269745</v>
                                 </b>
                                 <b>
                                     <a>3</a>
                                     <b>5</b>
-                                    <v>123571</v>
+                                    <v>123098</v>
                                 </b>
                                 <b>
                                     <a>5</a>
                                     <b>11</b>
-                                    <v>113065</v>
+                                    <v>112632</v>
                                 </b>
                                 <b>
                                     <a>11</a>
-                                    <b>2682</b>
-                                    <v>80546</v>
+                                    <b>2859</b>
+                                    <v>80238</v>
                                 </b>
                             </bs>
                         </hist>
@@ -15534,22 +15513,22 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>1126274</v>
+                                    <v>1121967</v>
                                 </b>
                                 <b>
                                     <a>2</a>
                                     <b>3</b>
-                                    <v>193361</v>
+                                    <v>192622</v>
                                 </b>
                                 <b>
                                     <a>3</a>
                                     <b>7</b>
-                                    <v>115316</v>
+                                    <v>114875</v>
                                 </b>
                                 <b>
                                     <a>7</a>
                                     <b>1038</b>
-                                    <v>29141</v>
+                                    <v>29030</v>
                                 </b>
                             </bs>
                         </hist>
@@ -15565,27 +15544,27 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>992071</v>
+                                    <v>988278</v>
                                 </b>
                                 <b>
                                     <a>2</a>
                                     <b>3</b>
-                                    <v>219376</v>
+                                    <v>218537</v>
                                 </b>
                                 <b>
                                     <a>3</a>
                                     <b>6</b>
-                                    <v>134202</v>
+                                    <v>133689</v>
                                 </b>
                                 <b>
                                     <a>6</a>
                                     <b>95</b>
-                                    <v>109938</v>
+                                    <v>109517</v>
                                 </b>
                                 <b>
                                     <a>97</a>
                                     <b>2570</b>
-                                    <v>8504</v>
+                                    <v>8472</v>
                                 </b>
                             </bs>
                         </hist>
@@ -15601,32 +15580,32 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>466393</v>
+                                    <v>464610</v>
                                 </b>
                                 <b>
                                     <a>2</a>
                                     <b>3</b>
-                                    <v>165970</v>
+                                    <v>165335</v>
                                 </b>
                                 <b>
                                     <a>3</a>
                                     <b>4</b>
-                                    <v>60159</v>
+                                    <v>59929</v>
                                 </b>
                                 <b>
                                     <a>4</a>
                                     <b>7</b>
-                                    <v>66038</v>
+                                    <v>65785</v>
                                 </b>
                                 <b>
                                     <a>7</a>
-                                    <b>25</b>
-                                    <v>64537</v>
+                                    <b>26</b>
+                                    <v>64165</v>
                                 </b>
                                 <b>
-                                    <a>25</a>
+                                    <a>26</a>
                                     <b>26622</b>
-                                    <v>30267</v>
+                                    <v>30276</v>
                                 </b>
                             </bs>
                         </hist>
@@ -15642,32 +15621,32 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>479276</v>
+                                    <v>477443</v>
                                 </b>
                                 <b>
                                     <a>2</a>
                                     <b>3</b>
-                                    <v>165220</v>
+                                    <v>164588</v>
                                 </b>
                                 <b>
                                     <a>3</a>
                                     <b>4</b>
-                                    <v>55031</v>
+                                    <v>54821</v>
                                 </b>
                                 <b>
                                     <a>4</a>
                                     <b>8</b>
-                                    <v>71916</v>
+                                    <v>71641</v>
                                 </b>
                                 <b>
                                     <a>8</a>
-                                    <b>45</b>
-                                    <v>64036</v>
+                                    <b>46</b>
+                                    <v>63792</v>
                                 </b>
                                 <b>
-                                    <a>45</a>
+                                    <a>46</a>
                                     <b>26187</b>
-                                    <v>17885</v>
+                                    <v>17816</v>
                                 </b>
                             </bs>
                         </hist>
@@ -15683,22 +15662,22 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>655627</v>
+                                    <v>653120</v>
                                 </b>
                                 <b>
                                     <a>2</a>
                                     <b>3</b>
-                                    <v>110563</v>
+                                    <v>110140</v>
                                 </b>
                                 <b>
                                     <a>3</a>
                                     <b>11</b>
-                                    <v>65412</v>
+                                    <v>65162</v>
                                 </b>
                                 <b>
                                     <a>11</a>
                                     <b>3460</b>
-                                    <v>21762</v>
+                                    <v>21679</v>
                                 </b>
                             </bs>
                         </hist>
@@ -15714,27 +15693,27 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>493659</v>
+                                    <v>491771</v>
                                 </b>
                                 <b>
                                     <a>2</a>
                                     <b>3</b>
-                                    <v>183480</v>
+                                    <v>182779</v>
                                 </b>
                                 <b>
                                     <a>3</a>
                                     <b>4</b>
-                                    <v>52405</v>
+                                    <v>52204</v>
                                 </b>
                                 <b>
                                     <a>4</a>
                                     <b>8</b>
-                                    <v>65287</v>
+                                    <v>65037</v>
                                 </b>
                                 <b>
                                     <a>8</a>
                                     <b>22104</b>
-                                    <v>58533</v>
+                                    <v>58309</v>
                                 </b>
                             </bs>
                         </hist>
@@ -15750,12 +15729,12 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>5763571</v>
+                                    <v>5741531</v>
                                 </b>
                                 <b>
                                     <a>2</a>
                                     <b>2943</b>
-                                    <v>448133</v>
+                                    <v>446419</v>
                                 </b>
                             </bs>
                         </hist>
@@ -15771,12 +15750,12 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>5787585</v>
+                                    <v>5765453</v>
                                 </b>
                                 <b>
                                     <a>2</a>
                                     <b>2935</b>
-                                    <v>424119</v>
+                                    <v>422497</v>
                                 </b>
                             </bs>
                         </hist>
@@ -15792,12 +15771,12 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>5927416</v>
+                                    <v>5904749</v>
                                 </b>
                                 <b>
                                     <a>2</a>
                                     <b>2555</b>
-                                    <v>284288</v>
+                                    <v>283201</v>
                                 </b>
                             </bs>
                         </hist>
@@ -15813,12 +15792,12 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>6199197</v>
+                                    <v>6175492</v>
                                 </b>
                                 <b>
                                     <a>2</a>
                                     <b>5</b>
-                                    <v>12507</v>
+                                    <v>12459</v>
                                 </b>
                             </bs>
                         </hist>
@@ -15828,11 +15807,11 @@
         </relation>
         <relation>
             <name>var_def</name>
-            <cardinality>3714015</cardinality>
+            <cardinality>3721866</cardinality>
             <columnsizes>
                 <e>
                     <k>id</k>
-                    <v>3714015</v>
+                    <v>3721866</v>
                 </e>
             </columnsizes>
             <dependencies/>
@@ -15850,15 +15829,15 @@
         </relation>
         <relation>
             <name>var_decl_specifiers</name>
-            <cardinality>489532</cardinality>
+            <cardinality>487660</cardinality>
             <columnsizes>
                 <e>
                     <k>id</k>
-                    <v>489532</v>
+                    <v>487660</v>
                 </e>
                 <e>
                     <k>name</k>
-                    <v>500</v>
+                    <v>498</v>
                 </e>
             </columnsizes>
             <dependencies>
@@ -15872,7 +15851,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>489532</v>
+                                    <v>487660</v>
                                 </b>
                             </bs>
                         </hist>
@@ -15888,22 +15867,22 @@
                                 <b>
                                     <a>16</a>
                                     <b>17</b>
-                                    <v>125</v>
+                                    <v>124</v>
                                 </b>
                                 <b>
                                     <a>77</a>
                                     <b>78</b>
-                                    <v>125</v>
+                                    <v>124</v>
                                 </b>
                                 <b>
                                     <a>651</a>
                                     <b>652</b>
-                                    <v>125</v>
+                                    <v>124</v>
                                 </b>
                                 <b>
                                     <a>3170</a>
                                     <b>3171</b>
-                                    <v>125</v>
+                                    <v>124</v>
                                 </b>
                             </bs>
                         </hist>
@@ -15982,19 +15961,19 @@
         </relation>
         <relation>
             <name>type_decls</name>
-            <cardinality>1882105</cardinality>
+            <cardinality>1840519</cardinality>
             <columnsizes>
                 <e>
                     <k>id</k>
-                    <v>1882105</v>
+                    <v>1840519</v>
                 </e>
                 <e>
                     <k>type_id</k>
-                    <v>1840893</v>
+                    <v>1800220</v>
                 </e>
                 <e>
                     <k>location</k>
-                    <v>1478788</v>
+                    <v>1446041</v>
                 </e>
             </columnsizes>
             <dependencies>
@@ -16008,7 +15987,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>1882105</v>
+                                    <v>1840519</v>
                                 </b>
                             </bs>
                         </hist>
@@ -16024,7 +16003,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>1882105</v>
+                                    <v>1840519</v>
                                 </b>
                             </bs>
                         </hist>
@@ -16040,12 +16019,12 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>1811238</v>
+                                    <v>1771221</v>
                                 </b>
                                 <b>
                                     <a>2</a>
                                     <b>24</b>
-                                    <v>29655</v>
+                                    <v>28998</v>
                                 </b>
                             </bs>
                         </hist>
@@ -16061,12 +16040,12 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>1812560</v>
+                                    <v>1772514</v>
                                 </b>
                                 <b>
                                     <a>2</a>
                                     <b>24</b>
-                                    <v>28333</v>
+                                    <v>27706</v>
                                 </b>
                             </bs>
                         </hist>
@@ -16082,12 +16061,12 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>1402608</v>
+                                    <v>1371548</v>
                                 </b>
                                 <b>
                                     <a>2</a>
                                     <b>651</b>
-                                    <v>76180</v>
+                                    <v>74493</v>
                                 </b>
                             </bs>
                         </hist>
@@ -16103,12 +16082,12 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>1403943</v>
+                                    <v>1372853</v>
                                 </b>
                                 <b>
                                     <a>2</a>
                                     <b>651</b>
-                                    <v>74845</v>
+                                    <v>73188</v>
                                 </b>
                             </bs>
                         </hist>
@@ -16118,29 +16097,29 @@
         </relation>
         <relation>
             <name>type_def</name>
-            <cardinality>1291458</cardinality>
+            <cardinality>1262886</cardinality>
             <columnsizes>
                 <e>
                     <k>id</k>
-                    <v>1291458</v>
+                    <v>1262886</v>
                 </e>
             </columnsizes>
             <dependencies/>
         </relation>
         <relation>
             <name>type_decl_top</name>
-            <cardinality>670615</cardinality>
+            <cardinality>670739</cardinality>
             <columnsizes>
                 <e>
                     <k>type_decl</k>
-                    <v>670615</v>
+                    <v>670739</v>
                 </e>
             </columnsizes>
             <dependencies/>
         </relation>
         <relation>
             <name>type_requires</name>
-            <cardinality>8220</cardinality>
+            <cardinality>8219</cardinality>
             <columnsizes>
                 <e>
                     <k>id</k>
@@ -16148,7 +16127,7 @@
                 </e>
                 <e>
                     <k>constraint</k>
-                    <v>8197</v>
+                    <v>8196</v>
                 </e>
             </columnsizes>
             <dependencies>
@@ -16198,7 +16177,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>8174</v>
+                                    <v>8173</v>
                                 </b>
                                 <b>
                                     <a>2</a>
@@ -16213,23 +16192,23 @@
         </relation>
         <relation>
             <name>namespace_decls</name>
-            <cardinality>430914</cardinality>
+            <cardinality>429821</cardinality>
             <columnsizes>
                 <e>
                     <k>id</k>
-                    <v>430914</v>
+                    <v>429821</v>
                 </e>
                 <e>
                     <k>namespace_id</k>
-                    <v>1959</v>
+                    <v>1954</v>
                 </e>
                 <e>
                     <k>location</k>
-                    <v>430914</v>
+                    <v>429821</v>
                 </e>
                 <e>
                     <k>bodylocation</k>
-                    <v>430914</v>
+                    <v>429821</v>
                 </e>
             </columnsizes>
             <dependencies>
@@ -16243,7 +16222,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>430914</v>
+                                    <v>429821</v>
                                 </b>
                             </bs>
                         </hist>
@@ -16259,7 +16238,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>430914</v>
+                                    <v>429821</v>
                                 </b>
                             </bs>
                         </hist>
@@ -16275,7 +16254,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>430914</v>
+                                    <v>429821</v>
                                 </b>
                             </bs>
                         </hist>
@@ -16291,7 +16270,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>414</v>
+                                    <v>413</v>
                                 </b>
                                 <b>
                                     <a>2</a>
@@ -16301,42 +16280,42 @@
                                 <b>
                                     <a>3</a>
                                     <b>6</b>
-                                    <v>181</v>
+                                    <v>180</v>
                                 </b>
                                 <b>
                                     <a>6</a>
                                     <b>15</b>
-                                    <v>164</v>
+                                    <v>163</v>
                                 </b>
                                 <b>
                                     <a>15</a>
                                     <b>34</b>
-                                    <v>155</v>
+                                    <v>154</v>
                                 </b>
                                 <b>
                                     <a>35</a>
                                     <b>62</b>
-                                    <v>164</v>
+                                    <v>163</v>
                                 </b>
                                 <b>
                                     <a>63</a>
                                     <b>87</b>
-                                    <v>155</v>
+                                    <v>154</v>
                                 </b>
                                 <b>
                                     <a>90</a>
                                     <b>142</b>
-                                    <v>155</v>
+                                    <v>154</v>
                                 </b>
                                 <b>
                                     <a>143</a>
                                     <b>219</b>
-                                    <v>155</v>
+                                    <v>154</v>
                                 </b>
                                 <b>
                                     <a>263</a>
                                     <b>1505</b>
-                                    <v>155</v>
+                                    <v>154</v>
                                 </b>
                                 <b>
                                     <a>1854</a>
@@ -16357,7 +16336,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>414</v>
+                                    <v>413</v>
                                 </b>
                                 <b>
                                     <a>2</a>
@@ -16367,42 +16346,42 @@
                                 <b>
                                     <a>3</a>
                                     <b>6</b>
-                                    <v>181</v>
+                                    <v>180</v>
                                 </b>
                                 <b>
                                     <a>6</a>
                                     <b>15</b>
-                                    <v>164</v>
+                                    <v>163</v>
                                 </b>
                                 <b>
                                     <a>15</a>
                                     <b>34</b>
-                                    <v>155</v>
+                                    <v>154</v>
                                 </b>
                                 <b>
                                     <a>35</a>
                                     <b>62</b>
-                                    <v>164</v>
+                                    <v>163</v>
                                 </b>
                                 <b>
                                     <a>63</a>
                                     <b>87</b>
-                                    <v>155</v>
+                                    <v>154</v>
                                 </b>
                                 <b>
                                     <a>90</a>
                                     <b>142</b>
-                                    <v>155</v>
+                                    <v>154</v>
                                 </b>
                                 <b>
                                     <a>143</a>
                                     <b>219</b>
-                                    <v>155</v>
+                                    <v>154</v>
                                 </b>
                                 <b>
                                     <a>263</a>
                                     <b>1505</b>
-                                    <v>155</v>
+                                    <v>154</v>
                                 </b>
                                 <b>
                                     <a>1854</a>
@@ -16423,7 +16402,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>414</v>
+                                    <v>413</v>
                                 </b>
                                 <b>
                                     <a>2</a>
@@ -16433,42 +16412,42 @@
                                 <b>
                                     <a>3</a>
                                     <b>6</b>
-                                    <v>181</v>
+                                    <v>180</v>
                                 </b>
                                 <b>
                                     <a>6</a>
                                     <b>15</b>
-                                    <v>164</v>
+                                    <v>163</v>
                                 </b>
                                 <b>
                                     <a>15</a>
                                     <b>34</b>
-                                    <v>155</v>
+                                    <v>154</v>
                                 </b>
                                 <b>
                                     <a>35</a>
                                     <b>62</b>
-                                    <v>164</v>
+                                    <v>163</v>
                                 </b>
                                 <b>
                                     <a>63</a>
                                     <b>87</b>
-                                    <v>155</v>
+                                    <v>154</v>
                                 </b>
                                 <b>
                                     <a>90</a>
                                     <b>142</b>
-                                    <v>155</v>
+                                    <v>154</v>
                                 </b>
                                 <b>
                                     <a>143</a>
                                     <b>219</b>
-                                    <v>155</v>
+                                    <v>154</v>
                                 </b>
                                 <b>
                                     <a>263</a>
                                     <b>1505</b>
-                                    <v>155</v>
+                                    <v>154</v>
                                 </b>
                                 <b>
                                     <a>1854</a>
@@ -16489,7 +16468,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>430914</v>
+                                    <v>429821</v>
                                 </b>
                             </bs>
                         </hist>
@@ -16505,7 +16484,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>430914</v>
+                                    <v>429821</v>
                                 </b>
                             </bs>
                         </hist>
@@ -16521,7 +16500,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>430914</v>
+                                    <v>429821</v>
                                 </b>
                             </bs>
                         </hist>
@@ -16537,7 +16516,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>430914</v>
+                                    <v>429821</v>
                                 </b>
                             </bs>
                         </hist>
@@ -16553,7 +16532,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>430914</v>
+                                    <v>429821</v>
                                 </b>
                             </bs>
                         </hist>
@@ -16569,7 +16548,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>430914</v>
+                                    <v>429821</v>
                                 </b>
                             </bs>
                         </hist>
@@ -16579,19 +16558,19 @@
         </relation>
         <relation>
             <name>usings</name>
-            <cardinality>347162</cardinality>
+            <cardinality>339699</cardinality>
             <columnsizes>
                 <e>
                     <k>id</k>
-                    <v>347162</v>
+                    <v>339699</v>
                 </e>
                 <e>
                     <k>element_id</k>
-                    <v>75169</v>
+                    <v>73728</v>
                 </e>
                 <e>
                     <k>location</k>
-                    <v>34280</v>
+                    <v>33521</v>
                 </e>
                 <e>
                     <k>kind</k>
@@ -16609,7 +16588,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>347162</v>
+                                    <v>339699</v>
                                 </b>
                             </bs>
                         </hist>
@@ -16625,7 +16604,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>347162</v>
+                                    <v>339699</v>
                                 </b>
                             </bs>
                         </hist>
@@ -16641,7 +16620,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>347162</v>
+                                    <v>339699</v>
                                 </b>
                             </bs>
                         </hist>
@@ -16657,17 +16636,17 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>65297</v>
+                                    <v>64075</v>
                                 </b>
                                 <b>
                                     <a>2</a>
                                     <b>5</b>
-                                    <v>6877</v>
+                                    <v>6725</v>
                                 </b>
                                 <b>
                                     <a>5</a>
                                     <b>134</b>
-                                    <v>2993</v>
+                                    <v>2927</v>
                                 </b>
                             </bs>
                         </hist>
@@ -16683,17 +16662,17 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>65297</v>
+                                    <v>64075</v>
                                 </b>
                                 <b>
                                     <a>2</a>
                                     <b>5</b>
-                                    <v>6877</v>
+                                    <v>6725</v>
                                 </b>
                                 <b>
                                     <a>5</a>
                                     <b>134</b>
-                                    <v>2993</v>
+                                    <v>2927</v>
                                 </b>
                             </bs>
                         </hist>
@@ -16709,7 +16688,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>75169</v>
+                                    <v>73728</v>
                                 </b>
                             </bs>
                         </hist>
@@ -16725,22 +16704,22 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>27038</v>
+                                    <v>26440</v>
                                 </b>
                                 <b>
                                     <a>2</a>
                                     <b>4</b>
-                                    <v>2926</v>
+                                    <v>2874</v>
                                 </b>
                                 <b>
                                     <a>4</a>
                                     <b>132</b>
-                                    <v>2494</v>
+                                    <v>2426</v>
                                 </b>
                                 <b>
                                     <a>145</a>
-                                    <b>365</b>
-                                    <v>1820</v>
+                                    <b>367</b>
+                                    <v>1780</v>
                                 </b>
                             </bs>
                         </hist>
@@ -16756,22 +16735,22 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>27038</v>
+                                    <v>26440</v>
                                 </b>
                                 <b>
                                     <a>2</a>
                                     <b>4</b>
-                                    <v>2926</v>
+                                    <v>2874</v>
                                 </b>
                                 <b>
                                     <a>4</a>
                                     <b>132</b>
-                                    <v>2494</v>
+                                    <v>2426</v>
                                 </b>
                                 <b>
                                     <a>145</a>
-                                    <b>365</b>
-                                    <v>1820</v>
+                                    <b>367</b>
+                                    <v>1780</v>
                                 </b>
                             </bs>
                         </hist>
@@ -16787,7 +16766,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>34280</v>
+                                    <v>33521</v>
                                 </b>
                             </bs>
                         </hist>
@@ -16806,8 +16785,8 @@
                                     <v>13</v>
                                 </b>
                                 <b>
-                                    <a>25350</a>
-                                    <b>25351</b>
+                                    <a>25367</a>
+                                    <b>25368</b>
                                     <v>13</v>
                                 </b>
                             </bs>
@@ -16827,8 +16806,8 @@
                                     <v>13</v>
                                 </b>
                                 <b>
-                                    <a>5360</a>
-                                    <b>5361</b>
+                                    <a>5377</a>
+                                    <b>5378</b>
                                     <v>13</v>
                                 </b>
                             </bs>
@@ -16860,15 +16839,15 @@
         </relation>
         <relation>
             <name>using_container</name>
-            <cardinality>738908</cardinality>
+            <cardinality>722770</cardinality>
             <columnsizes>
                 <e>
                     <k>parent</k>
-                    <v>27038</v>
+                    <v>26479</v>
                 </e>
                 <e>
                     <k>child</k>
-                    <v>347162</v>
+                    <v>339699</v>
                 </e>
             </columnsizes>
             <dependencies>
@@ -16882,42 +16861,42 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>12528</v>
+                                    <v>12250</v>
                                 </b>
                                 <b>
                                     <a>2</a>
                                     <b>3</b>
-                                    <v>1995</v>
+                                    <v>1951</v>
                                 </b>
                                 <b>
                                     <a>3</a>
                                     <b>6</b>
-                                    <v>2292</v>
+                                    <v>2241</v>
                                 </b>
                                 <b>
                                     <a>6</a>
                                     <b>7</b>
-                                    <v>2885</v>
+                                    <v>2861</v>
                                 </b>
                                 <b>
                                     <a>7</a>
                                     <b>27</b>
-                                    <v>2063</v>
+                                    <v>2017</v>
                                 </b>
                                 <b>
                                     <a>27</a>
                                     <b>136</b>
-                                    <v>1051</v>
+                                    <v>1028</v>
                                 </b>
                                 <b>
                                     <a>145</a>
                                     <b>146</b>
-                                    <v>3344</v>
+                                    <v>3270</v>
                                 </b>
                                 <b>
                                     <a>146</a>
                                     <b>437</b>
-                                    <v>876</v>
+                                    <v>857</v>
                                 </b>
                             </bs>
                         </hist>
@@ -16933,27 +16912,27 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>123785</v>
+                                    <v>121268</v>
                                 </b>
                                 <b>
                                     <a>2</a>
                                     <b>3</b>
-                                    <v>153561</v>
+                                    <v>150161</v>
                                 </b>
                                 <b>
                                     <a>3</a>
                                     <b>4</b>
-                                    <v>25123</v>
+                                    <v>24567</v>
                                 </b>
                                 <b>
                                     <a>4</a>
                                     <b>5</b>
-                                    <v>34078</v>
+                                    <v>33323</v>
                                 </b>
                                 <b>
                                     <a>5</a>
                                     <b>65</b>
-                                    <v>10613</v>
+                                    <v>10378</v>
                                 </b>
                             </bs>
                         </hist>
@@ -16963,27 +16942,27 @@
         </relation>
         <relation>
             <name>static_asserts</name>
-            <cardinality>183493</cardinality>
+            <cardinality>183028</cardinality>
             <columnsizes>
                 <e>
                     <k>id</k>
-                    <v>183493</v>
+                    <v>183028</v>
                 </e>
                 <e>
                     <k>condition</k>
-                    <v>183493</v>
+                    <v>183028</v>
                 </e>
                 <e>
                     <k>message</k>
-                    <v>41092</v>
+                    <v>40988</v>
                 </e>
                 <e>
                     <k>location</k>
-                    <v>23921</v>
+                    <v>23861</v>
                 </e>
                 <e>
                     <k>enclosing</k>
-                    <v>6647</v>
+                    <v>6630</v>
                 </e>
             </columnsizes>
             <dependencies>
@@ -16997,7 +16976,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>183493</v>
+                                    <v>183028</v>
                                 </b>
                             </bs>
                         </hist>
@@ -17013,7 +16992,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>183493</v>
+                                    <v>183028</v>
                                 </b>
                             </bs>
                         </hist>
@@ -17029,7 +17008,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>183493</v>
+                                    <v>183028</v>
                                 </b>
                             </bs>
                         </hist>
@@ -17045,7 +17024,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>183493</v>
+                                    <v>183028</v>
                                 </b>
                             </bs>
                         </hist>
@@ -17061,7 +17040,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>183493</v>
+                                    <v>183028</v>
                                 </b>
                             </bs>
                         </hist>
@@ -17077,7 +17056,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>183493</v>
+                                    <v>183028</v>
                                 </b>
                             </bs>
                         </hist>
@@ -17093,7 +17072,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>183493</v>
+                                    <v>183028</v>
                                 </b>
                             </bs>
                         </hist>
@@ -17109,7 +17088,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>183493</v>
+                                    <v>183028</v>
                                 </b>
                             </bs>
                         </hist>
@@ -17125,32 +17104,32 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>30232</v>
+                                    <v>30155</v>
                                 </b>
                                 <b>
                                     <a>2</a>
                                     <b>3</b>
-                                    <v>673</v>
+                                    <v>671</v>
                                 </b>
                                 <b>
                                     <a>3</a>
                                     <b>4</b>
-                                    <v>3876</v>
+                                    <v>3866</v>
                                 </b>
                                 <b>
                                     <a>4</a>
                                     <b>12</b>
-                                    <v>2184</v>
+                                    <v>2178</v>
                                 </b>
                                 <b>
                                     <a>12</a>
                                     <b>17</b>
-                                    <v>3315</v>
+                                    <v>3306</v>
                                 </b>
                                 <b>
                                     <a>17</a>
                                     <b>513</b>
-                                    <v>811</v>
+                                    <v>809</v>
                                 </b>
                             </bs>
                         </hist>
@@ -17166,32 +17145,32 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>30232</v>
+                                    <v>30155</v>
                                 </b>
                                 <b>
                                     <a>2</a>
                                     <b>3</b>
-                                    <v>673</v>
+                                    <v>671</v>
                                 </b>
                                 <b>
                                     <a>3</a>
                                     <b>4</b>
-                                    <v>3876</v>
+                                    <v>3866</v>
                                 </b>
                                 <b>
                                     <a>4</a>
                                     <b>12</b>
-                                    <v>2184</v>
+                                    <v>2178</v>
                                 </b>
                                 <b>
                                     <a>12</a>
                                     <b>17</b>
-                                    <v>3315</v>
+                                    <v>3306</v>
                                 </b>
                                 <b>
                                     <a>17</a>
                                     <b>513</b>
-                                    <v>811</v>
+                                    <v>809</v>
                                 </b>
                             </bs>
                         </hist>
@@ -17207,12 +17186,12 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>38079</v>
+                                    <v>37983</v>
                                 </b>
                                 <b>
                                     <a>2</a>
                                     <b>33</b>
-                                    <v>3012</v>
+                                    <v>3005</v>
                                 </b>
                             </bs>
                         </hist>
@@ -17228,7 +17207,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>32166</v>
+                                    <v>32084</v>
                                 </b>
                                 <b>
                                     <a>2</a>
@@ -17238,17 +17217,17 @@
                                 <b>
                                     <a>3</a>
                                     <b>4</b>
-                                    <v>3625</v>
+                                    <v>3616</v>
                                 </b>
                                 <b>
                                     <a>4</a>
                                     <b>12</b>
-                                    <v>1985</v>
+                                    <v>1980</v>
                                 </b>
                                 <b>
                                     <a>12</a>
                                     <b>43</b>
-                                    <v>2961</v>
+                                    <v>2953</v>
                                 </b>
                             </bs>
                         </hist>
@@ -17264,37 +17243,37 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>4489</v>
+                                    <v>4477</v>
                                 </b>
                                 <b>
                                     <a>2</a>
                                     <b>3</b>
-                                    <v>3893</v>
+                                    <v>3883</v>
                                 </b>
                                 <b>
                                     <a>3</a>
                                     <b>4</b>
-                                    <v>1873</v>
+                                    <v>1868</v>
                                 </b>
                                 <b>
                                     <a>4</a>
                                     <b>5</b>
-                                    <v>112</v>
+                                    <v>111</v>
                                 </b>
                                 <b>
                                     <a>5</a>
                                     <b>6</b>
-                                    <v>5024</v>
+                                    <v>5011</v>
                                 </b>
                                 <b>
                                     <a>6</a>
                                     <b>13</b>
-                                    <v>457</v>
+                                    <v>456</v>
                                 </b>
                                 <b>
                                     <a>14</a>
                                     <b>15</b>
-                                    <v>2814</v>
+                                    <v>2807</v>
                                 </b>
                                 <b>
                                     <a>16</a>
@@ -17304,12 +17283,12 @@
                                 <b>
                                     <a>17</a>
                                     <b>18</b>
-                                    <v>4670</v>
+                                    <v>4658</v>
                                 </b>
                                 <b>
                                     <a>19</a>
                                     <b>52</b>
-                                    <v>526</v>
+                                    <v>525</v>
                                 </b>
                             </bs>
                         </hist>
@@ -17325,37 +17304,37 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>4489</v>
+                                    <v>4477</v>
                                 </b>
                                 <b>
                                     <a>2</a>
                                     <b>3</b>
-                                    <v>3893</v>
+                                    <v>3883</v>
                                 </b>
                                 <b>
                                     <a>3</a>
                                     <b>4</b>
-                                    <v>1873</v>
+                                    <v>1868</v>
                                 </b>
                                 <b>
                                     <a>4</a>
                                     <b>5</b>
-                                    <v>112</v>
+                                    <v>111</v>
                                 </b>
                                 <b>
                                     <a>5</a>
                                     <b>6</b>
-                                    <v>5024</v>
+                                    <v>5011</v>
                                 </b>
                                 <b>
                                     <a>6</a>
                                     <b>13</b>
-                                    <v>457</v>
+                                    <v>456</v>
                                 </b>
                                 <b>
                                     <a>14</a>
                                     <b>15</b>
-                                    <v>2814</v>
+                                    <v>2807</v>
                                 </b>
                                 <b>
                                     <a>16</a>
@@ -17365,12 +17344,12 @@
                                 <b>
                                     <a>17</a>
                                     <b>18</b>
-                                    <v>4670</v>
+                                    <v>4658</v>
                                 </b>
                                 <b>
                                     <a>19</a>
                                     <b>52</b>
-                                    <v>526</v>
+                                    <v>525</v>
                                 </b>
                             </bs>
                         </hist>
@@ -17386,22 +17365,22 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>7243</v>
+                                    <v>7224</v>
                                 </b>
                                 <b>
                                     <a>2</a>
                                     <b>3</b>
-                                    <v>8158</v>
+                                    <v>8137</v>
                                 </b>
                                 <b>
                                     <a>3</a>
                                     <b>4</b>
-                                    <v>8270</v>
+                                    <v>8249</v>
                                 </b>
                                 <b>
                                     <a>4</a>
                                     <b>7</b>
-                                    <v>250</v>
+                                    <v>249</v>
                                 </b>
                             </bs>
                         </hist>
@@ -17417,32 +17396,32 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>5326</v>
+                                    <v>5313</v>
                                 </b>
                                 <b>
                                     <a>2</a>
                                     <b>3</b>
-                                    <v>8537</v>
+                                    <v>8516</v>
                                 </b>
                                 <b>
                                     <a>3</a>
                                     <b>4</b>
-                                    <v>1597</v>
+                                    <v>1593</v>
                                 </b>
                                 <b>
                                     <a>4</a>
                                     <b>5</b>
-                                    <v>5041</v>
+                                    <v>5028</v>
                                 </b>
                                 <b>
                                     <a>5</a>
                                     <b>13</b>
-                                    <v>517</v>
+                                    <v>516</v>
                                 </b>
                                 <b>
                                     <a>13</a>
                                     <b>14</b>
-                                    <v>2814</v>
+                                    <v>2807</v>
                                 </b>
                                 <b>
                                     <a>16</a>
@@ -17463,17 +17442,17 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>5481</v>
+                                    <v>5468</v>
                                 </b>
                                 <b>
                                     <a>2</a>
                                     <b>3</b>
-                                    <v>561</v>
+                                    <v>559</v>
                                 </b>
                                 <b>
                                     <a>3</a>
                                     <b>210</b>
-                                    <v>500</v>
+                                    <v>499</v>
                                 </b>
                                 <b>
                                     <a>223</a>
@@ -17494,17 +17473,17 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>5481</v>
+                                    <v>5468</v>
                                 </b>
                                 <b>
                                     <a>2</a>
                                     <b>3</b>
-                                    <v>561</v>
+                                    <v>559</v>
                                 </b>
                                 <b>
                                     <a>3</a>
                                     <b>210</b>
-                                    <v>500</v>
+                                    <v>499</v>
                                 </b>
                                 <b>
                                     <a>223</a>
@@ -17525,17 +17504,17 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>5645</v>
+                                    <v>5631</v>
                                 </b>
                                 <b>
                                     <a>2</a>
                                     <b>3</b>
-                                    <v>552</v>
+                                    <v>551</v>
                                 </b>
                                 <b>
                                     <a>3</a>
                                     <b>2936</b>
-                                    <v>448</v>
+                                    <v>447</v>
                                 </b>
                             </bs>
                         </hist>
@@ -17551,17 +17530,17 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>5628</v>
+                                    <v>5614</v>
                                 </b>
                                 <b>
                                     <a>2</a>
                                     <b>3</b>
-                                    <v>569</v>
+                                    <v>568</v>
                                 </b>
                                 <b>
                                     <a>3</a>
                                     <b>1929</b>
-                                    <v>448</v>
+                                    <v>447</v>
                                 </b>
                             </bs>
                         </hist>
@@ -17571,23 +17550,23 @@
         </relation>
         <relation>
             <name>params</name>
-            <cardinality>6992280</cardinality>
+            <cardinality>6965541</cardinality>
             <columnsizes>
                 <e>
                     <k>id</k>
-                    <v>6965639</v>
+                    <v>6939003</v>
                 </e>
                 <e>
                     <k>function</k>
-                    <v>3369817</v>
+                    <v>3356931</v>
                 </e>
                 <e>
                     <k>index</k>
-                    <v>8004</v>
+                    <v>7974</v>
                 </e>
                 <e>
                     <k>type_id</k>
-                    <v>1226832</v>
+                    <v>1222140</v>
                 </e>
             </columnsizes>
             <dependencies>
@@ -17601,7 +17580,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>6965639</v>
+                                    <v>6939003</v>
                                 </b>
                             </bs>
                         </hist>
@@ -17617,7 +17596,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>6965639</v>
+                                    <v>6939003</v>
                                 </b>
                             </bs>
                         </hist>
@@ -17633,12 +17612,12 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>6938999</v>
+                                    <v>6912464</v>
                                 </b>
                                 <b>
                                     <a>2</a>
                                     <b>3</b>
-                                    <v>26640</v>
+                                    <v>26538</v>
                                 </b>
                             </bs>
                         </hist>
@@ -17654,27 +17633,27 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>1464594</v>
+                                    <v>1458993</v>
                                 </b>
                                 <b>
                                     <a>2</a>
                                     <b>3</b>
-                                    <v>909774</v>
+                                    <v>906295</v>
                                 </b>
                                 <b>
                                     <a>3</a>
                                     <b>4</b>
-                                    <v>561823</v>
+                                    <v>559675</v>
                                 </b>
                                 <b>
                                     <a>4</a>
                                     <b>5</b>
-                                    <v>277660</v>
+                                    <v>276598</v>
                                 </b>
                                 <b>
                                     <a>5</a>
                                     <b>65</b>
-                                    <v>155964</v>
+                                    <v>155368</v>
                                 </b>
                             </bs>
                         </hist>
@@ -17690,27 +17669,27 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>1464594</v>
+                                    <v>1458993</v>
                                 </b>
                                 <b>
                                     <a>2</a>
                                     <b>3</b>
-                                    <v>909774</v>
+                                    <v>906295</v>
                                 </b>
                                 <b>
                                     <a>3</a>
                                     <b>4</b>
-                                    <v>561823</v>
+                                    <v>559675</v>
                                 </b>
                                 <b>
                                     <a>4</a>
                                     <b>5</b>
-                                    <v>277660</v>
+                                    <v>276598</v>
                                 </b>
                                 <b>
                                     <a>5</a>
                                     <b>65</b>
-                                    <v>155964</v>
+                                    <v>155368</v>
                                 </b>
                             </bs>
                         </hist>
@@ -17726,22 +17705,22 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>1765517</v>
+                                    <v>1758766</v>
                                 </b>
                                 <b>
                                     <a>2</a>
                                     <b>3</b>
-                                    <v>1009581</v>
+                                    <v>1005721</v>
                                 </b>
                                 <b>
                                     <a>3</a>
                                     <b>4</b>
-                                    <v>437502</v>
+                                    <v>435829</v>
                                 </b>
                                 <b>
                                     <a>4</a>
                                     <b>11</b>
-                                    <v>157215</v>
+                                    <v>156614</v>
                                 </b>
                             </bs>
                         </hist>
@@ -17757,32 +17736,32 @@
                                 <b>
                                     <a>2</a>
                                     <b>3</b>
-                                    <v>4002</v>
+                                    <v>3987</v>
                                 </b>
                                 <b>
                                     <a>6</a>
                                     <b>7</b>
-                                    <v>2001</v>
+                                    <v>1993</v>
                                 </b>
                                 <b>
                                     <a>14</a>
                                     <b>18</b>
-                                    <v>625</v>
+                                    <v>622</v>
                                 </b>
                                 <b>
                                     <a>23</a>
                                     <b>138</b>
-                                    <v>625</v>
+                                    <v>622</v>
                                 </b>
                                 <b>
                                     <a>323</a>
                                     <b>15234</b>
-                                    <v>625</v>
+                                    <v>622</v>
                                 </b>
                                 <b>
                                     <a>26943</a>
                                     <b>26944</b>
-                                    <v>125</v>
+                                    <v>124</v>
                                 </b>
                             </bs>
                         </hist>
@@ -17798,32 +17777,32 @@
                                 <b>
                                     <a>2</a>
                                     <b>3</b>
-                                    <v>4002</v>
+                                    <v>3987</v>
                                 </b>
                                 <b>
                                     <a>6</a>
                                     <b>7</b>
-                                    <v>2001</v>
+                                    <v>1993</v>
                                 </b>
                                 <b>
                                     <a>14</a>
                                     <b>18</b>
-                                    <v>625</v>
+                                    <v>622</v>
                                 </b>
                                 <b>
                                     <a>23</a>
                                     <b>138</b>
-                                    <v>625</v>
+                                    <v>622</v>
                                 </b>
                                 <b>
                                     <a>323</a>
                                     <b>15234</b>
-                                    <v>625</v>
+                                    <v>622</v>
                                 </b>
                                 <b>
                                     <a>26943</a>
                                     <b>26944</b>
-                                    <v>125</v>
+                                    <v>124</v>
                                 </b>
                             </bs>
                         </hist>
@@ -17839,32 +17818,32 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>4002</v>
+                                    <v>3987</v>
                                 </b>
                                 <b>
                                     <a>2</a>
                                     <b>3</b>
-                                    <v>2001</v>
+                                    <v>1993</v>
                                 </b>
                                 <b>
                                     <a>4</a>
                                     <b>7</b>
-                                    <v>625</v>
+                                    <v>622</v>
                                 </b>
                                 <b>
                                     <a>9</a>
                                     <b>54</b>
-                                    <v>625</v>
+                                    <v>622</v>
                                 </b>
                                 <b>
                                     <a>115</a>
                                     <b>2700</b>
-                                    <v>625</v>
+                                    <v>622</v>
                                 </b>
                                 <b>
                                     <a>7528</a>
                                     <b>7529</b>
-                                    <v>125</v>
+                                    <v>124</v>
                                 </b>
                             </bs>
                         </hist>
@@ -17880,27 +17859,27 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>741677</v>
+                                    <v>738841</v>
                                 </b>
                                 <b>
                                     <a>2</a>
                                     <b>3</b>
-                                    <v>242264</v>
+                                    <v>241338</v>
                                 </b>
                                 <b>
                                     <a>3</a>
                                     <b>5</b>
-                                    <v>93929</v>
+                                    <v>93569</v>
                                 </b>
                                 <b>
                                     <a>5</a>
                                     <b>13</b>
-                                    <v>93804</v>
+                                    <v>93445</v>
                                 </b>
                                 <b>
                                     <a>13</a>
                                     <b>2570</b>
-                                    <v>55156</v>
+                                    <v>54945</v>
                                 </b>
                             </bs>
                         </hist>
@@ -17916,27 +17895,27 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>824099</v>
+                                    <v>820948</v>
                                 </b>
                                 <b>
                                     <a>2</a>
                                     <b>3</b>
-                                    <v>181354</v>
+                                    <v>180661</v>
                                 </b>
                                 <b>
                                     <a>3</a>
                                     <b>6</b>
-                                    <v>106686</v>
+                                    <v>106278</v>
                                 </b>
                                 <b>
                                     <a>6</a>
                                     <b>27</b>
-                                    <v>92553</v>
+                                    <v>92199</v>
                                 </b>
                                 <b>
                                     <a>27</a>
                                     <b>2558</b>
-                                    <v>22137</v>
+                                    <v>22053</v>
                                 </b>
                             </bs>
                         </hist>
@@ -17952,17 +17931,17 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>1001202</v>
+                                    <v>997373</v>
                                 </b>
                                 <b>
                                     <a>2</a>
                                     <b>3</b>
-                                    <v>167221</v>
+                                    <v>166581</v>
                                 </b>
                                 <b>
                                     <a>3</a>
                                     <b>65</b>
-                                    <v>58408</v>
+                                    <v>58185</v>
                                 </b>
                             </bs>
                         </hist>
@@ -17972,15 +17951,15 @@
         </relation>
         <relation>
             <name>overrides</name>
-            <cardinality>169801</cardinality>
+            <cardinality>169371</cardinality>
             <columnsizes>
                 <e>
                     <k>new</k>
-                    <v>160547</v>
+                    <v>160140</v>
                 </e>
                 <e>
                     <k>old</k>
-                    <v>19122</v>
+                    <v>19073</v>
                 </e>
             </columnsizes>
             <dependencies>
@@ -17994,12 +17973,12 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>151301</v>
+                                    <v>150917</v>
                                 </b>
                                 <b>
                                     <a>2</a>
                                     <b>4</b>
-                                    <v>9245</v>
+                                    <v>9222</v>
                                 </b>
                             </bs>
                         </hist>
@@ -18015,32 +17994,32 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>10463</v>
+                                    <v>10436</v>
                                 </b>
                                 <b>
                                     <a>2</a>
                                     <b>3</b>
-                                    <v>2589</v>
+                                    <v>2583</v>
                                 </b>
                                 <b>
                                     <a>3</a>
                                     <b>4</b>
-                                    <v>1735</v>
+                                    <v>1730</v>
                                 </b>
                                 <b>
                                     <a>4</a>
                                     <b>6</b>
-                                    <v>1579</v>
+                                    <v>1575</v>
                                 </b>
                                 <b>
                                     <a>6</a>
                                     <b>18</b>
-                                    <v>1441</v>
+                                    <v>1438</v>
                                 </b>
                                 <b>
                                     <a>18</a>
                                     <b>230</b>
-                                    <v>1312</v>
+                                    <v>1308</v>
                                 </b>
                             </bs>
                         </hist>
@@ -18050,19 +18029,19 @@
         </relation>
         <relation>
             <name>membervariables</name>
-            <cardinality>1491583</cardinality>
+            <cardinality>1491860</cardinality>
             <columnsizes>
                 <e>
                     <k>id</k>
-                    <v>1489139</v>
+                    <v>1489415</v>
                 </e>
                 <e>
                     <k>type_id</k>
-                    <v>453830</v>
+                    <v>453914</v>
                 </e>
                 <e>
                     <k>name</k>
-                    <v>638893</v>
+                    <v>639011</v>
                 </e>
             </columnsizes>
             <dependencies>
@@ -18076,12 +18055,12 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>1486803</v>
+                                    <v>1487079</v>
                                 </b>
                                 <b>
                                     <a>2</a>
                                     <b>4</b>
-                                    <v>2335</v>
+                                    <v>2336</v>
                                 </b>
                             </bs>
                         </hist>
@@ -18097,7 +18076,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>1489139</v>
+                                    <v>1489415</v>
                                 </b>
                             </bs>
                         </hist>
@@ -18113,22 +18092,22 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>336774</v>
+                                    <v>336836</v>
                                 </b>
                                 <b>
                                     <a>2</a>
                                     <b>3</b>
-                                    <v>71917</v>
+                                    <v>71930</v>
                                 </b>
                                 <b>
                                     <a>3</a>
                                     <b>10</b>
-                                    <v>35035</v>
+                                    <v>35041</v>
                                 </b>
                                 <b>
                                     <a>10</a>
                                     <b>4422</b>
-                                    <v>10103</v>
+                                    <v>10105</v>
                                 </b>
                             </bs>
                         </hist>
@@ -18144,22 +18123,22 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>354264</v>
+                                    <v>354330</v>
                                 </b>
                                 <b>
                                     <a>2</a>
                                     <b>3</b>
-                                    <v>63932</v>
+                                    <v>63944</v>
                                 </b>
                                 <b>
                                     <a>3</a>
                                     <b>49</b>
-                                    <v>34111</v>
+                                    <v>34118</v>
                                 </b>
                                 <b>
                                     <a>56</a>
                                     <b>2175</b>
-                                    <v>1520</v>
+                                    <v>1521</v>
                                 </b>
                             </bs>
                         </hist>
@@ -18175,22 +18154,22 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>419772</v>
+                                    <v>419850</v>
                                 </b>
                                 <b>
                                     <a>2</a>
                                     <b>3</b>
-                                    <v>121781</v>
+                                    <v>121804</v>
                                 </b>
                                 <b>
                                     <a>3</a>
                                     <b>5</b>
-                                    <v>57305</v>
+                                    <v>57316</v>
                                 </b>
                                 <b>
                                     <a>5</a>
                                     <b>654</b>
-                                    <v>40032</v>
+                                    <v>40040</v>
                                 </b>
                             </bs>
                         </hist>
@@ -18206,17 +18185,17 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>522217</v>
+                                    <v>522314</v>
                                 </b>
                                 <b>
                                     <a>2</a>
                                     <b>3</b>
-                                    <v>72297</v>
+                                    <v>72311</v>
                                 </b>
                                 <b>
                                     <a>3</a>
                                     <b>658</b>
-                                    <v>44378</v>
+                                    <v>44386</v>
                                 </b>
                             </bs>
                         </hist>
@@ -18226,19 +18205,19 @@
         </relation>
         <relation>
             <name>globalvariables</name>
-            <cardinality>466518</cardinality>
+            <cardinality>486788</cardinality>
             <columnsizes>
                 <e>
                     <k>id</k>
-                    <v>466518</v>
+                    <v>486788</v>
                 </e>
                 <e>
                     <k>type_id</k>
-                    <v>10380</v>
+                    <v>10341</v>
                 </e>
                 <e>
                     <k>name</k>
-                    <v>112564</v>
+                    <v>112134</v>
                 </e>
             </columnsizes>
             <dependencies>
@@ -18252,7 +18231,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>466518</v>
+                                    <v>486788</v>
                                 </b>
                             </bs>
                         </hist>
@@ -18268,7 +18247,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>466518</v>
+                                    <v>486788</v>
                                 </b>
                             </bs>
                         </hist>
@@ -18284,32 +18263,32 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>7004</v>
+                                    <v>6977</v>
                                 </b>
                                 <b>
                                     <a>2</a>
                                     <b>3</b>
-                                    <v>375</v>
+                                    <v>373</v>
                                 </b>
                                 <b>
                                     <a>3</a>
                                     <b>5</b>
-                                    <v>750</v>
+                                    <v>747</v>
                                 </b>
                                 <b>
                                     <a>5</a>
                                     <b>20</b>
-                                    <v>875</v>
+                                    <v>872</v>
                                 </b>
                                 <b>
                                     <a>20</a>
                                     <b>74</b>
-                                    <v>875</v>
+                                    <v>872</v>
                                 </b>
                                 <b>
                                     <a>152</a>
-                                    <b>2037</b>
-                                    <v>500</v>
+                                    <b>2214</b>
+                                    <v>498</v>
                                 </b>
                             </bs>
                         </hist>
@@ -18325,32 +18304,32 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>7129</v>
+                                    <v>7101</v>
                                 </b>
                                 <b>
                                     <a>2</a>
                                     <b>3</b>
-                                    <v>375</v>
+                                    <v>373</v>
                                 </b>
                                 <b>
                                     <a>3</a>
                                     <b>5</b>
-                                    <v>750</v>
+                                    <v>747</v>
                                 </b>
                                 <b>
                                     <a>5</a>
                                     <b>20</b>
-                                    <v>750</v>
+                                    <v>747</v>
                                 </b>
                                 <b>
                                     <a>20</a>
                                     <b>74</b>
-                                    <v>875</v>
+                                    <v>872</v>
                                 </b>
                                 <b>
                                     <a>124</a>
                                     <b>226</b>
-                                    <v>500</v>
+                                    <v>498</v>
                                 </b>
                             </bs>
                         </hist>
@@ -18366,17 +18345,17 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>95430</v>
+                                    <v>95065</v>
                                 </b>
                                 <b>
                                     <a>2</a>
                                     <b>7</b>
-                                    <v>8755</v>
+                                    <v>8721</v>
                                 </b>
                                 <b>
                                     <a>7</a>
-                                    <b>500</b>
-                                    <v>8379</v>
+                                    <b>604</b>
+                                    <v>8347</v>
                                 </b>
                             </bs>
                         </hist>
@@ -18392,17 +18371,17 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>97055</v>
+                                    <v>96684</v>
                                 </b>
                                 <b>
                                     <a>2</a>
                                     <b>3</b>
-                                    <v>15258</v>
+                                    <v>15200</v>
                                 </b>
                                 <b>
                                     <a>3</a>
                                     <b>4</b>
-                                    <v>250</v>
+                                    <v>249</v>
                                 </b>
                             </bs>
                         </hist>
@@ -18412,19 +18391,19 @@
         </relation>
         <relation>
             <name>localvariables</name>
-            <cardinality>734804</cardinality>
+            <cardinality>727548</cardinality>
             <columnsizes>
                 <e>
                     <k>id</k>
-                    <v>734804</v>
+                    <v>727548</v>
                 </e>
                 <e>
                     <k>type_id</k>
-                    <v>54064</v>
+                    <v>53530</v>
                 </e>
                 <e>
                     <k>name</k>
-                    <v>102754</v>
+                    <v>101739</v>
                 </e>
             </columnsizes>
             <dependencies>
@@ -18438,7 +18417,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>734804</v>
+                                    <v>727548</v>
                                 </b>
                             </bs>
                         </hist>
@@ -18454,7 +18433,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>734804</v>
+                                    <v>727548</v>
                                 </b>
                             </bs>
                         </hist>
@@ -18470,37 +18449,37 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>29233</v>
+                                    <v>28944</v>
                                 </b>
                                 <b>
                                     <a>2</a>
                                     <b>3</b>
-                                    <v>7920</v>
+                                    <v>7842</v>
                                 </b>
                                 <b>
                                     <a>3</a>
                                     <b>4</b>
-                                    <v>4073</v>
+                                    <v>4033</v>
                                 </b>
                                 <b>
                                     <a>4</a>
                                     <b>6</b>
-                                    <v>4098</v>
+                                    <v>4057</v>
                                 </b>
                                 <b>
                                     <a>6</a>
                                     <b>12</b>
-                                    <v>4199</v>
+                                    <v>4157</v>
                                 </b>
                                 <b>
                                     <a>12</a>
                                     <b>166</b>
-                                    <v>4057</v>
+                                    <v>4017</v>
                                 </b>
                                 <b>
                                     <a>168</a>
                                     <b>19320</b>
-                                    <v>482</v>
+                                    <v>477</v>
                                 </b>
                             </bs>
                         </hist>
@@ -18516,22 +18495,22 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>38827</v>
+                                    <v>38444</v>
                                 </b>
                                 <b>
                                     <a>2</a>
                                     <b>3</b>
-                                    <v>6781</v>
+                                    <v>6714</v>
                                 </b>
                                 <b>
                                     <a>3</a>
                                     <b>5</b>
-                                    <v>4519</v>
+                                    <v>4474</v>
                                 </b>
                                 <b>
                                     <a>5</a>
                                     <b>3502</b>
-                                    <v>3935</v>
+                                    <v>3897</v>
                                 </b>
                             </bs>
                         </hist>
@@ -18547,32 +18526,32 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>63217</v>
+                                    <v>62592</v>
                                 </b>
                                 <b>
                                     <a>2</a>
                                     <b>3</b>
-                                    <v>16238</v>
+                                    <v>16077</v>
                                 </b>
                                 <b>
                                     <a>3</a>
                                     <b>4</b>
-                                    <v>6611</v>
+                                    <v>6545</v>
                                 </b>
                                 <b>
                                     <a>4</a>
                                     <b>8</b>
-                                    <v>8228</v>
+                                    <v>8147</v>
                                 </b>
                                 <b>
                                     <a>8</a>
                                     <b>135</b>
-                                    <v>7709</v>
+                                    <v>7633</v>
                                 </b>
                                 <b>
                                     <a>135</a>
                                     <b>7544</b>
-                                    <v>749</v>
+                                    <v>742</v>
                                 </b>
                             </bs>
                         </hist>
@@ -18588,22 +18567,22 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>85502</v>
+                                    <v>84658</v>
                                 </b>
                                 <b>
                                     <a>2</a>
                                     <b>3</b>
-                                    <v>8520</v>
+                                    <v>8436</v>
                                 </b>
                                 <b>
                                     <a>3</a>
                                     <b>15</b>
-                                    <v>7766</v>
+                                    <v>7689</v>
                                 </b>
                                 <b>
                                     <a>15</a>
                                     <b>1509</b>
-                                    <v>964</v>
+                                    <v>955</v>
                                 </b>
                             </bs>
                         </hist>
@@ -18613,15 +18592,15 @@
         </relation>
         <relation>
             <name>autoderivation</name>
-            <cardinality>229507</cardinality>
+            <cardinality>228629</cardinality>
             <columnsizes>
                 <e>
                     <k>var</k>
-                    <v>229507</v>
+                    <v>228629</v>
                 </e>
                 <e>
                     <k>derivation_type</k>
-                    <v>625</v>
+                    <v>622</v>
                 </e>
             </columnsizes>
             <dependencies>
@@ -18635,7 +18614,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>229507</v>
+                                    <v>228629</v>
                                 </b>
                             </bs>
                         </hist>
@@ -18651,27 +18630,27 @@
                                 <b>
                                     <a>38</a>
                                     <b>39</b>
-                                    <v>125</v>
+                                    <v>124</v>
                                 </b>
                                 <b>
                                     <a>79</a>
                                     <b>80</b>
-                                    <v>125</v>
+                                    <v>124</v>
                                 </b>
                                 <b>
                                     <a>454</a>
                                     <b>455</b>
-                                    <v>125</v>
+                                    <v>124</v>
                                 </b>
                                 <b>
                                     <a>530</a>
                                     <b>531</b>
-                                    <v>125</v>
+                                    <v>124</v>
                                 </b>
                                 <b>
                                     <a>734</a>
                                     <b>735</b>
-                                    <v>125</v>
+                                    <v>124</v>
                                 </b>
                             </bs>
                         </hist>
@@ -18681,15 +18660,15 @@
         </relation>
         <relation>
             <name>orphaned_variables</name>
-            <cardinality>55640</cardinality>
+            <cardinality>55584</cardinality>
             <columnsizes>
                 <e>
                     <k>var</k>
-                    <v>55640</v>
+                    <v>55584</v>
                 </e>
                 <e>
                     <k>function</k>
-                    <v>51534</v>
+                    <v>51483</v>
                 </e>
             </columnsizes>
             <dependencies>
@@ -18703,7 +18682,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>55640</v>
+                                    <v>55584</v>
                                 </b>
                             </bs>
                         </hist>
@@ -18719,12 +18698,12 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>50465</v>
+                                    <v>50415</v>
                                 </b>
                                 <b>
                                     <a>2</a>
                                     <b>47</b>
-                                    <v>1069</v>
+                                    <v>1068</v>
                                 </b>
                             </bs>
                         </hist>
@@ -18734,19 +18713,19 @@
         </relation>
         <relation>
             <name>enumconstants</name>
-            <cardinality>343781</cardinality>
+            <cardinality>343845</cardinality>
             <columnsizes>
                 <e>
                     <k>id</k>
-                    <v>343781</v>
+                    <v>343845</v>
                 </e>
                 <e>
                     <k>parent</k>
-                    <v>41173</v>
+                    <v>41180</v>
                 </e>
                 <e>
                     <k>index</k>
-                    <v>13905</v>
+                    <v>13908</v>
                 </e>
                 <e>
                     <k>type_id</k>
@@ -18754,11 +18733,11 @@
                 </e>
                 <e>
                     <k>name</k>
-                    <v>343400</v>
+                    <v>343464</v>
                 </e>
                 <e>
                     <k>location</k>
-                    <v>316459</v>
+                    <v>316517</v>
                 </e>
             </columnsizes>
             <dependencies>
@@ -18772,7 +18751,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>343781</v>
+                                    <v>343845</v>
                                 </b>
                             </bs>
                         </hist>
@@ -18788,7 +18767,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>343781</v>
+                                    <v>343845</v>
                                 </b>
                             </bs>
                         </hist>
@@ -18804,7 +18783,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>343781</v>
+                                    <v>343845</v>
                                 </b>
                             </bs>
                         </hist>
@@ -18820,7 +18799,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>343781</v>
+                                    <v>343845</v>
                                 </b>
                             </bs>
                         </hist>
@@ -18836,7 +18815,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>343781</v>
+                                    <v>343845</v>
                                 </b>
                             </bs>
                         </hist>
@@ -18852,22 +18831,22 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>1520</v>
+                                    <v>1521</v>
                                 </b>
                                 <b>
                                     <a>2</a>
                                     <b>3</b>
-                                    <v>5703</v>
+                                    <v>5704</v>
                                 </b>
                                 <b>
                                     <a>3</a>
                                     <b>4</b>
-                                    <v>8690</v>
+                                    <v>8692</v>
                                 </b>
                                 <b>
                                     <a>4</a>
                                     <b>5</b>
-                                    <v>5486</v>
+                                    <v>5487</v>
                                 </b>
                                 <b>
                                     <a>5</a>
@@ -18877,7 +18856,7 @@
                                 <b>
                                     <a>6</a>
                                     <b>7</b>
-                                    <v>2661</v>
+                                    <v>2662</v>
                                 </b>
                                 <b>
                                     <a>7</a>
@@ -18892,7 +18871,7 @@
                                 <b>
                                     <a>11</a>
                                     <b>17</b>
-                                    <v>3150</v>
+                                    <v>3151</v>
                                 </b>
                                 <b>
                                     <a>17</a>
@@ -18918,22 +18897,22 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>1520</v>
+                                    <v>1521</v>
                                 </b>
                                 <b>
                                     <a>2</a>
                                     <b>3</b>
-                                    <v>5703</v>
+                                    <v>5704</v>
                                 </b>
                                 <b>
                                     <a>3</a>
                                     <b>4</b>
-                                    <v>8690</v>
+                                    <v>8692</v>
                                 </b>
                                 <b>
                                     <a>4</a>
                                     <b>5</b>
-                                    <v>5486</v>
+                                    <v>5487</v>
                                 </b>
                                 <b>
                                     <a>5</a>
@@ -18943,7 +18922,7 @@
                                 <b>
                                     <a>6</a>
                                     <b>7</b>
-                                    <v>2661</v>
+                                    <v>2662</v>
                                 </b>
                                 <b>
                                     <a>7</a>
@@ -18958,7 +18937,7 @@
                                 <b>
                                     <a>11</a>
                                     <b>17</b>
-                                    <v>3150</v>
+                                    <v>3151</v>
                                 </b>
                                 <b>
                                     <a>17</a>
@@ -18984,7 +18963,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>41173</v>
+                                    <v>41180</v>
                                 </b>
                             </bs>
                         </hist>
@@ -19000,22 +18979,22 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>1520</v>
+                                    <v>1521</v>
                                 </b>
                                 <b>
                                     <a>2</a>
                                     <b>3</b>
-                                    <v>5703</v>
+                                    <v>5704</v>
                                 </b>
                                 <b>
                                     <a>3</a>
                                     <b>4</b>
-                                    <v>8690</v>
+                                    <v>8692</v>
                                 </b>
                                 <b>
                                     <a>4</a>
                                     <b>5</b>
-                                    <v>5486</v>
+                                    <v>5487</v>
                                 </b>
                                 <b>
                                     <a>5</a>
@@ -19025,7 +19004,7 @@
                                 <b>
                                     <a>6</a>
                                     <b>7</b>
-                                    <v>2661</v>
+                                    <v>2662</v>
                                 </b>
                                 <b>
                                     <a>7</a>
@@ -19040,7 +19019,7 @@
                                 <b>
                                     <a>11</a>
                                     <b>17</b>
-                                    <v>3150</v>
+                                    <v>3151</v>
                                 </b>
                                 <b>
                                     <a>17</a>
@@ -19071,17 +19050,17 @@
                                 <b>
                                     <a>2</a>
                                     <b>3</b>
-                                    <v>5920</v>
+                                    <v>5921</v>
                                 </b>
                                 <b>
                                     <a>3</a>
                                     <b>4</b>
-                                    <v>8745</v>
+                                    <v>8746</v>
                                 </b>
                                 <b>
                                     <a>4</a>
                                     <b>5</b>
-                                    <v>5431</v>
+                                    <v>5432</v>
                                 </b>
                                 <b>
                                     <a>5</a>
@@ -19096,12 +19075,12 @@
                                 <b>
                                     <a>7</a>
                                     <b>8</b>
-                                    <v>1846</v>
+                                    <v>1847</v>
                                 </b>
                                 <b>
                                     <a>8</a>
                                     <b>11</b>
-                                    <v>3693</v>
+                                    <v>3694</v>
                                 </b>
                                 <b>
                                     <a>11</a>
@@ -19239,7 +19218,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>13905</v>
+                                    <v>13908</v>
                                 </b>
                             </bs>
                         </hist>
@@ -19447,7 +19426,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>343020</v>
+                                    <v>343084</v>
                                 </b>
                                 <b>
                                     <a>2</a>
@@ -19468,7 +19447,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>343020</v>
+                                    <v>343084</v>
                                 </b>
                                 <b>
                                     <a>2</a>
@@ -19489,7 +19468,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>343400</v>
+                                    <v>343464</v>
                                 </b>
                             </bs>
                         </hist>
@@ -19505,7 +19484,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>343400</v>
+                                    <v>343464</v>
                                 </b>
                             </bs>
                         </hist>
@@ -19521,7 +19500,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>343020</v>
+                                    <v>343084</v>
                                 </b>
                                 <b>
                                     <a>2</a>
@@ -19542,7 +19521,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>315427</v>
+                                    <v>315485</v>
                                 </b>
                                 <b>
                                     <a>2</a>
@@ -19563,7 +19542,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>316459</v>
+                                    <v>316517</v>
                                 </b>
                             </bs>
                         </hist>
@@ -19579,7 +19558,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>315427</v>
+                                    <v>315485</v>
                                 </b>
                                 <b>
                                     <a>2</a>
@@ -19600,7 +19579,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>316459</v>
+                                    <v>316517</v>
                                 </b>
                             </bs>
                         </hist>
@@ -19616,7 +19595,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>315427</v>
+                                    <v>315485</v>
                                 </b>
                                 <b>
                                     <a>2</a>
@@ -19631,31 +19610,31 @@
         </relation>
         <relation>
             <name>builtintypes</name>
-            <cardinality>7004</cardinality>
+            <cardinality>7101</cardinality>
             <columnsizes>
                 <e>
                     <k>id</k>
-                    <v>7004</v>
+                    <v>7101</v>
                 </e>
                 <e>
                     <k>name</k>
-                    <v>7004</v>
+                    <v>7101</v>
                 </e>
                 <e>
                     <k>kind</k>
-                    <v>7004</v>
+                    <v>7101</v>
                 </e>
                 <e>
                     <k>size</k>
-                    <v>875</v>
+                    <v>872</v>
                 </e>
                 <e>
                     <k>sign</k>
-                    <v>375</v>
+                    <v>373</v>
                 </e>
                 <e>
                     <k>alignment</k>
-                    <v>625</v>
+                    <v>622</v>
                 </e>
             </columnsizes>
             <dependencies>
@@ -19669,7 +19648,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>7004</v>
+                                    <v>7101</v>
                                 </b>
                             </bs>
                         </hist>
@@ -19685,7 +19664,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>7004</v>
+                                    <v>7101</v>
                                 </b>
                             </bs>
                         </hist>
@@ -19701,7 +19680,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>7004</v>
+                                    <v>7101</v>
                                 </b>
                             </bs>
                         </hist>
@@ -19717,7 +19696,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>7004</v>
+                                    <v>7101</v>
                                 </b>
                             </bs>
                         </hist>
@@ -19733,7 +19712,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>7004</v>
+                                    <v>7101</v>
                                 </b>
                             </bs>
                         </hist>
@@ -19749,7 +19728,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>7004</v>
+                                    <v>7101</v>
                                 </b>
                             </bs>
                         </hist>
@@ -19765,7 +19744,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>7004</v>
+                                    <v>7101</v>
                                 </b>
                             </bs>
                         </hist>
@@ -19781,7 +19760,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>7004</v>
+                                    <v>7101</v>
                                 </b>
                             </bs>
                         </hist>
@@ -19797,7 +19776,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>7004</v>
+                                    <v>7101</v>
                                 </b>
                             </bs>
                         </hist>
@@ -19813,7 +19792,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>7004</v>
+                                    <v>7101</v>
                                 </b>
                             </bs>
                         </hist>
@@ -19829,7 +19808,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>7004</v>
+                                    <v>7101</v>
                                 </b>
                             </bs>
                         </hist>
@@ -19845,7 +19824,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>7004</v>
+                                    <v>7101</v>
                                 </b>
                             </bs>
                         </hist>
@@ -19861,7 +19840,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>7004</v>
+                                    <v>7101</v>
                                 </b>
                             </bs>
                         </hist>
@@ -19877,7 +19856,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>7004</v>
+                                    <v>7101</v>
                                 </b>
                             </bs>
                         </hist>
@@ -19893,7 +19872,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>7004</v>
+                                    <v>7101</v>
                                 </b>
                             </bs>
                         </hist>
@@ -19909,37 +19888,37 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>125</v>
+                                    <v>124</v>
                                 </b>
                                 <b>
                                     <a>2</a>
                                     <b>3</b>
-                                    <v>125</v>
+                                    <v>124</v>
                                 </b>
                                 <b>
-                                    <a>7</a>
-                                    <b>8</b>
-                                    <v>125</v>
+                                    <a>8</a>
+                                    <b>9</b>
+                                    <v>124</v>
                                 </b>
                                 <b>
                                     <a>9</a>
                                     <b>10</b>
-                                    <v>125</v>
+                                    <v>124</v>
                                 </b>
                                 <b>
                                     <a>11</a>
                                     <b>12</b>
-                                    <v>125</v>
+                                    <v>124</v>
                                 </b>
                                 <b>
                                     <a>12</a>
                                     <b>13</b>
-                                    <v>125</v>
+                                    <v>124</v>
                                 </b>
                                 <b>
                                     <a>14</a>
                                     <b>15</b>
-                                    <v>125</v>
+                                    <v>124</v>
                                 </b>
                             </bs>
                         </hist>
@@ -19955,37 +19934,37 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>125</v>
+                                    <v>124</v>
                                 </b>
                                 <b>
                                     <a>2</a>
                                     <b>3</b>
-                                    <v>125</v>
+                                    <v>124</v>
                                 </b>
                                 <b>
-                                    <a>7</a>
-                                    <b>8</b>
-                                    <v>125</v>
+                                    <a>8</a>
+                                    <b>9</b>
+                                    <v>124</v>
                                 </b>
                                 <b>
                                     <a>9</a>
                                     <b>10</b>
-                                    <v>125</v>
+                                    <v>124</v>
                                 </b>
                                 <b>
                                     <a>11</a>
                                     <b>12</b>
-                                    <v>125</v>
+                                    <v>124</v>
                                 </b>
                                 <b>
                                     <a>12</a>
                                     <b>13</b>
-                                    <v>125</v>
+                                    <v>124</v>
                                 </b>
                                 <b>
                                     <a>14</a>
                                     <b>15</b>
-                                    <v>125</v>
+                                    <v>124</v>
                                 </b>
                             </bs>
                         </hist>
@@ -20001,37 +19980,37 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>125</v>
+                                    <v>124</v>
                                 </b>
                                 <b>
                                     <a>2</a>
                                     <b>3</b>
-                                    <v>125</v>
+                                    <v>124</v>
                                 </b>
                                 <b>
-                                    <a>7</a>
-                                    <b>8</b>
-                                    <v>125</v>
+                                    <a>8</a>
+                                    <b>9</b>
+                                    <v>124</v>
                                 </b>
                                 <b>
                                     <a>9</a>
                                     <b>10</b>
-                                    <v>125</v>
+                                    <v>124</v>
                                 </b>
                                 <b>
                                     <a>11</a>
                                     <b>12</b>
-                                    <v>125</v>
+                                    <v>124</v>
                                 </b>
                                 <b>
                                     <a>12</a>
                                     <b>13</b>
-                                    <v>125</v>
+                                    <v>124</v>
                                 </b>
                                 <b>
                                     <a>14</a>
                                     <b>15</b>
-                                    <v>125</v>
+                                    <v>124</v>
                                 </b>
                             </bs>
                         </hist>
@@ -20047,12 +20026,12 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>250</v>
+                                    <v>249</v>
                                 </b>
                                 <b>
                                     <a>3</a>
                                     <b>4</b>
-                                    <v>625</v>
+                                    <v>622</v>
                                 </b>
                             </bs>
                         </hist>
@@ -20068,12 +20047,12 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>500</v>
+                                    <v>498</v>
                                 </b>
                                 <b>
                                     <a>2</a>
                                     <b>3</b>
-                                    <v>375</v>
+                                    <v>373</v>
                                 </b>
                             </bs>
                         </hist>
@@ -20089,17 +20068,17 @@
                                 <b>
                                     <a>6</a>
                                     <b>7</b>
-                                    <v>125</v>
+                                    <v>124</v>
                                 </b>
                                 <b>
                                     <a>12</a>
                                     <b>13</b>
-                                    <v>125</v>
+                                    <v>124</v>
                                 </b>
                                 <b>
-                                    <a>38</a>
-                                    <b>39</b>
-                                    <v>125</v>
+                                    <a>39</a>
+                                    <b>40</b>
+                                    <v>124</v>
                                 </b>
                             </bs>
                         </hist>
@@ -20115,17 +20094,17 @@
                                 <b>
                                     <a>6</a>
                                     <b>7</b>
-                                    <v>125</v>
+                                    <v>124</v>
                                 </b>
                                 <b>
                                     <a>12</a>
                                     <b>13</b>
-                                    <v>125</v>
+                                    <v>124</v>
                                 </b>
                                 <b>
-                                    <a>38</a>
-                                    <b>39</b>
-                                    <v>125</v>
+                                    <a>39</a>
+                                    <b>40</b>
+                                    <v>124</v>
                                 </b>
                             </bs>
                         </hist>
@@ -20141,17 +20120,17 @@
                                 <b>
                                     <a>6</a>
                                     <b>7</b>
-                                    <v>125</v>
+                                    <v>124</v>
                                 </b>
                                 <b>
                                     <a>12</a>
                                     <b>13</b>
-                                    <v>125</v>
+                                    <v>124</v>
                                 </b>
                                 <b>
-                                    <a>38</a>
-                                    <b>39</b>
-                                    <v>125</v>
+                                    <a>39</a>
+                                    <b>40</b>
+                                    <v>124</v>
                                 </b>
                             </bs>
                         </hist>
@@ -20167,12 +20146,12 @@
                                 <b>
                                     <a>5</a>
                                     <b>6</b>
-                                    <v>250</v>
+                                    <v>249</v>
                                 </b>
                                 <b>
                                     <a>7</a>
                                     <b>8</b>
-                                    <v>125</v>
+                                    <v>124</v>
                                 </b>
                             </bs>
                         </hist>
@@ -20188,7 +20167,7 @@
                                 <b>
                                     <a>5</a>
                                     <b>6</b>
-                                    <v>375</v>
+                                    <v>373</v>
                                 </b>
                             </bs>
                         </hist>
@@ -20204,22 +20183,27 @@
                                 <b>
                                     <a>8</a>
                                     <b>9</b>
-                                    <v>250</v>
+                                    <v>124</v>
+                                </b>
+                                <b>
+                                    <a>9</a>
+                                    <b>10</b>
+                                    <v>124</v>
                                 </b>
                                 <b>
                                     <a>10</a>
                                     <b>11</b>
-                                    <v>125</v>
+                                    <v>124</v>
                                 </b>
                                 <b>
                                     <a>13</a>
                                     <b>14</b>
-                                    <v>125</v>
+                                    <v>124</v>
                                 </b>
                                 <b>
                                     <a>17</a>
                                     <b>18</b>
-                                    <v>125</v>
+                                    <v>124</v>
                                 </b>
                             </bs>
                         </hist>
@@ -20235,22 +20219,27 @@
                                 <b>
                                     <a>8</a>
                                     <b>9</b>
-                                    <v>250</v>
+                                    <v>124</v>
+                                </b>
+                                <b>
+                                    <a>9</a>
+                                    <b>10</b>
+                                    <v>124</v>
                                 </b>
                                 <b>
                                     <a>10</a>
                                     <b>11</b>
-                                    <v>125</v>
+                                    <v>124</v>
                                 </b>
                                 <b>
                                     <a>13</a>
                                     <b>14</b>
-                                    <v>125</v>
+                                    <v>124</v>
                                 </b>
                                 <b>
                                     <a>17</a>
                                     <b>18</b>
-                                    <v>125</v>
+                                    <v>124</v>
                                 </b>
                             </bs>
                         </hist>
@@ -20266,22 +20255,27 @@
                                 <b>
                                     <a>8</a>
                                     <b>9</b>
-                                    <v>250</v>
+                                    <v>124</v>
+                                </b>
+                                <b>
+                                    <a>9</a>
+                                    <b>10</b>
+                                    <v>124</v>
                                 </b>
                                 <b>
                                     <a>10</a>
                                     <b>11</b>
-                                    <v>125</v>
+                                    <v>124</v>
                                 </b>
                                 <b>
                                     <a>13</a>
                                     <b>14</b>
-                                    <v>125</v>
+                                    <v>124</v>
                                 </b>
                                 <b>
                                     <a>17</a>
                                     <b>18</b>
-                                    <v>125</v>
+                                    <v>124</v>
                                 </b>
                             </bs>
                         </hist>
@@ -20297,7 +20291,7 @@
                                 <b>
                                     <a>2</a>
                                     <b>3</b>
-                                    <v>625</v>
+                                    <v>622</v>
                                 </b>
                             </bs>
                         </hist>
@@ -20313,7 +20307,7 @@
                                 <b>
                                     <a>3</a>
                                     <b>4</b>
-                                    <v>625</v>
+                                    <v>622</v>
                                 </b>
                             </bs>
                         </hist>
@@ -20323,23 +20317,23 @@
         </relation>
         <relation>
             <name>derivedtypes</name>
-            <cardinality>3047881</cardinality>
+            <cardinality>3036226</cardinality>
             <columnsizes>
                 <e>
                     <k>id</k>
-                    <v>3047881</v>
+                    <v>3036226</v>
                 </e>
                 <e>
                     <k>name</k>
-                    <v>1475975</v>
+                    <v>1470331</v>
                 </e>
                 <e>
                     <k>kind</k>
-                    <v>750</v>
+                    <v>747</v>
                 </e>
                 <e>
                     <k>type_id</k>
-                    <v>1949998</v>
+                    <v>1942542</v>
                 </e>
             </columnsizes>
             <dependencies>
@@ -20353,7 +20347,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>3047881</v>
+                                    <v>3036226</v>
                                 </b>
                             </bs>
                         </hist>
@@ -20369,7 +20363,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>3047881</v>
+                                    <v>3036226</v>
                                 </b>
                             </bs>
                         </hist>
@@ -20385,7 +20379,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>3047881</v>
+                                    <v>3036226</v>
                                 </b>
                             </bs>
                         </hist>
@@ -20401,17 +20395,17 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>1358908</v>
+                                    <v>1353711</v>
                                 </b>
                                 <b>
                                     <a>2</a>
                                     <b>30</b>
-                                    <v>110938</v>
+                                    <v>110514</v>
                                 </b>
                                 <b>
                                     <a>30</a>
                                     <b>4274</b>
-                                    <v>6128</v>
+                                    <v>6105</v>
                                 </b>
                             </bs>
                         </hist>
@@ -20427,7 +20421,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>1475975</v>
+                                    <v>1470331</v>
                                 </b>
                             </bs>
                         </hist>
@@ -20443,17 +20437,17 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>1359033</v>
+                                    <v>1353836</v>
                                 </b>
                                 <b>
                                     <a>2</a>
                                     <b>30</b>
-                                    <v>110813</v>
+                                    <v>110390</v>
                                 </b>
                                 <b>
                                     <a>30</a>
                                     <b>4274</b>
-                                    <v>6128</v>
+                                    <v>6105</v>
                                 </b>
                             </bs>
                         </hist>
@@ -20469,32 +20463,32 @@
                                 <b>
                                     <a>787</a>
                                     <b>788</b>
-                                    <v>125</v>
+                                    <v>124</v>
                                 </b>
                                 <b>
                                     <a>2333</a>
                                     <b>2334</b>
-                                    <v>125</v>
+                                    <v>124</v>
                                 </b>
                                 <b>
                                     <a>3647</a>
                                     <b>3648</b>
-                                    <v>125</v>
+                                    <v>124</v>
                                 </b>
                                 <b>
                                     <a>4273</a>
                                     <b>4274</b>
-                                    <v>125</v>
+                                    <v>124</v>
                                 </b>
                                 <b>
                                     <a>5569</a>
                                     <b>5570</b>
-                                    <v>125</v>
+                                    <v>124</v>
                                 </b>
                                 <b>
                                     <a>7760</a>
                                     <b>7761</b>
-                                    <v>125</v>
+                                    <v>124</v>
                                 </b>
                             </bs>
                         </hist>
@@ -20510,32 +20504,32 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>125</v>
+                                    <v>124</v>
                                 </b>
                                 <b>
                                     <a>733</a>
                                     <b>734</b>
-                                    <v>125</v>
+                                    <v>124</v>
                                 </b>
                                 <b>
                                     <a>1613</a>
                                     <b>1614</b>
-                                    <v>125</v>
+                                    <v>124</v>
                                 </b>
                                 <b>
                                     <a>2433</a>
                                     <b>2434</b>
-                                    <v>125</v>
+                                    <v>124</v>
                                 </b>
                                 <b>
                                     <a>2678</a>
                                     <b>2679</b>
-                                    <v>125</v>
+                                    <v>124</v>
                                 </b>
                                 <b>
                                     <a>4343</a>
                                     <b>4344</b>
-                                    <v>125</v>
+                                    <v>124</v>
                                 </b>
                             </bs>
                         </hist>
@@ -20551,32 +20545,32 @@
                                 <b>
                                     <a>208</a>
                                     <b>209</b>
-                                    <v>125</v>
+                                    <v>124</v>
                                 </b>
                                 <b>
                                     <a>2333</a>
                                     <b>2334</b>
-                                    <v>125</v>
+                                    <v>124</v>
                                 </b>
                                 <b>
                                     <a>3643</a>
                                     <b>3644</b>
-                                    <v>125</v>
+                                    <v>124</v>
                                 </b>
                                 <b>
                                     <a>4273</a>
                                     <b>4274</b>
-                                    <v>125</v>
+                                    <v>124</v>
                                 </b>
                                 <b>
                                     <a>5502</a>
                                     <b>5503</b>
-                                    <v>125</v>
+                                    <v>124</v>
                                 </b>
                                 <b>
                                     <a>7760</a>
                                     <b>7761</b>
-                                    <v>125</v>
+                                    <v>124</v>
                                 </b>
                             </bs>
                         </hist>
@@ -20592,22 +20586,22 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>1317134</v>
+                                    <v>1312097</v>
                                 </b>
                                 <b>
                                     <a>2</a>
                                     <b>3</b>
-                                    <v>378593</v>
+                                    <v>377145</v>
                                 </b>
                                 <b>
                                     <a>3</a>
                                     <b>4</b>
-                                    <v>122945</v>
+                                    <v>122475</v>
                                 </b>
                                 <b>
                                     <a>4</a>
                                     <b>135</b>
-                                    <v>131325</v>
+                                    <v>130823</v>
                                 </b>
                             </bs>
                         </hist>
@@ -20623,22 +20617,22 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>1318635</v>
+                                    <v>1313592</v>
                                 </b>
                                 <b>
                                     <a>2</a>
                                     <b>3</b>
-                                    <v>378593</v>
+                                    <v>377145</v>
                                 </b>
                                 <b>
                                     <a>3</a>
                                     <b>4</b>
-                                    <v>121444</v>
+                                    <v>120980</v>
                                 </b>
                                 <b>
                                     <a>4</a>
                                     <b>135</b>
-                                    <v>131325</v>
+                                    <v>130823</v>
                                 </b>
                             </bs>
                         </hist>
@@ -20654,22 +20648,22 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>1319010</v>
+                                    <v>1313966</v>
                                 </b>
                                 <b>
                                     <a>2</a>
                                     <b>3</b>
-                                    <v>379468</v>
+                                    <v>378017</v>
                                 </b>
                                 <b>
                                     <a>3</a>
                                     <b>4</b>
-                                    <v>122945</v>
+                                    <v>122475</v>
                                 </b>
                                 <b>
                                     <a>4</a>
                                     <b>6</b>
-                                    <v>128574</v>
+                                    <v>128082</v>
                                 </b>
                             </bs>
                         </hist>
@@ -20679,19 +20673,19 @@
         </relation>
         <relation>
             <name>pointerishsize</name>
-            <cardinality>2252923</cardinality>
+            <cardinality>2244308</cardinality>
             <columnsizes>
                 <e>
                     <k>id</k>
-                    <v>2252923</v>
+                    <v>2244308</v>
                 </e>
                 <e>
                     <k>size</k>
-                    <v>250</v>
+                    <v>249</v>
                 </e>
                 <e>
                     <k>alignment</k>
-                    <v>250</v>
+                    <v>249</v>
                 </e>
             </columnsizes>
             <dependencies>
@@ -20705,7 +20699,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>2252923</v>
+                                    <v>2244308</v>
                                 </b>
                             </bs>
                         </hist>
@@ -20721,7 +20715,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>2252923</v>
+                                    <v>2244308</v>
                                 </b>
                             </bs>
                         </hist>
@@ -20737,12 +20731,12 @@
                                 <b>
                                     <a>3</a>
                                     <b>4</b>
-                                    <v>125</v>
+                                    <v>124</v>
                                 </b>
                                 <b>
                                     <a>18010</a>
                                     <b>18011</b>
-                                    <v>125</v>
+                                    <v>124</v>
                                 </b>
                             </bs>
                         </hist>
@@ -20758,7 +20752,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>250</v>
+                                    <v>249</v>
                                 </b>
                             </bs>
                         </hist>
@@ -20774,12 +20768,12 @@
                                 <b>
                                     <a>3</a>
                                     <b>4</b>
-                                    <v>125</v>
+                                    <v>124</v>
                                 </b>
                                 <b>
                                     <a>18010</a>
                                     <b>18011</b>
-                                    <v>125</v>
+                                    <v>124</v>
                                 </b>
                             </bs>
                         </hist>
@@ -20795,7 +20789,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>250</v>
+                                    <v>249</v>
                                 </b>
                             </bs>
                         </hist>
@@ -20805,23 +20799,23 @@
         </relation>
         <relation>
             <name>arraysizes</name>
-            <cardinality>88676</cardinality>
+            <cardinality>88337</cardinality>
             <columnsizes>
                 <e>
                     <k>id</k>
-                    <v>88676</v>
+                    <v>88337</v>
                 </e>
                 <e>
                     <k>num_elements</k>
-                    <v>18510</v>
+                    <v>18439</v>
                 </e>
                 <e>
                     <k>bytesize</k>
-                    <v>22888</v>
+                    <v>22800</v>
                 </e>
                 <e>
                     <k>alignment</k>
-                    <v>625</v>
+                    <v>622</v>
                 </e>
             </columnsizes>
             <dependencies>
@@ -20835,7 +20829,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>88676</v>
+                                    <v>88337</v>
                                 </b>
                             </bs>
                         </hist>
@@ -20851,7 +20845,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>88676</v>
+                                    <v>88337</v>
                                 </b>
                             </bs>
                         </hist>
@@ -20867,7 +20861,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>88676</v>
+                                    <v>88337</v>
                                 </b>
                             </bs>
                         </hist>
@@ -20883,37 +20877,37 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>250</v>
+                                    <v>249</v>
                                 </b>
                                 <b>
                                     <a>2</a>
                                     <b>3</b>
-                                    <v>8880</v>
+                                    <v>8846</v>
                                 </b>
                                 <b>
                                     <a>3</a>
                                     <b>4</b>
-                                    <v>250</v>
+                                    <v>249</v>
                                 </b>
                                 <b>
                                     <a>4</a>
                                     <b>5</b>
-                                    <v>5628</v>
+                                    <v>5606</v>
                                 </b>
                                 <b>
                                     <a>6</a>
                                     <b>7</b>
-                                    <v>1625</v>
+                                    <v>1619</v>
                                 </b>
                                 <b>
                                     <a>8</a>
                                     <b>27</b>
-                                    <v>1500</v>
+                                    <v>1495</v>
                                 </b>
                                 <b>
                                     <a>34</a>
                                     <b>57</b>
-                                    <v>375</v>
+                                    <v>373</v>
                                 </b>
                             </bs>
                         </hist>
@@ -20929,22 +20923,22 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>9505</v>
+                                    <v>9469</v>
                                 </b>
                                 <b>
                                     <a>2</a>
                                     <b>3</b>
-                                    <v>6628</v>
+                                    <v>6603</v>
                                 </b>
                                 <b>
                                     <a>3</a>
                                     <b>5</b>
-                                    <v>1250</v>
+                                    <v>1245</v>
                                 </b>
                                 <b>
                                     <a>5</a>
                                     <b>11</b>
-                                    <v>1125</v>
+                                    <v>1121</v>
                                 </b>
                             </bs>
                         </hist>
@@ -20960,22 +20954,22 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>9505</v>
+                                    <v>9469</v>
                                 </b>
                                 <b>
                                     <a>2</a>
                                     <b>3</b>
-                                    <v>6628</v>
+                                    <v>6603</v>
                                 </b>
                                 <b>
                                     <a>3</a>
                                     <b>4</b>
-                                    <v>1000</v>
+                                    <v>996</v>
                                 </b>
                                 <b>
                                     <a>4</a>
                                     <b>6</b>
-                                    <v>1375</v>
+                                    <v>1370</v>
                                 </b>
                             </bs>
                         </hist>
@@ -20991,37 +20985,37 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>625</v>
+                                    <v>622</v>
                                 </b>
                                 <b>
                                     <a>2</a>
                                     <b>3</b>
-                                    <v>14758</v>
+                                    <v>14702</v>
                                 </b>
                                 <b>
                                     <a>3</a>
                                     <b>4</b>
-                                    <v>375</v>
+                                    <v>373</v>
                                 </b>
                                 <b>
                                     <a>4</a>
                                     <b>5</b>
-                                    <v>3251</v>
+                                    <v>3239</v>
                                 </b>
                                 <b>
                                     <a>5</a>
                                     <b>7</b>
-                                    <v>1500</v>
+                                    <v>1495</v>
                                 </b>
                                 <b>
                                     <a>7</a>
                                     <b>17</b>
-                                    <v>1751</v>
+                                    <v>1744</v>
                                 </b>
                                 <b>
                                     <a>17</a>
                                     <b>45</b>
-                                    <v>625</v>
+                                    <v>622</v>
                                 </b>
                             </bs>
                         </hist>
@@ -21037,22 +21031,22 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>16509</v>
+                                    <v>16446</v>
                                 </b>
                                 <b>
                                     <a>2</a>
                                     <b>3</b>
-                                    <v>4002</v>
+                                    <v>3987</v>
                                 </b>
                                 <b>
                                     <a>3</a>
                                     <b>5</b>
-                                    <v>1751</v>
+                                    <v>1744</v>
                                 </b>
                                 <b>
                                     <a>5</a>
                                     <b>7</b>
-                                    <v>625</v>
+                                    <v>622</v>
                                 </b>
                             </bs>
                         </hist>
@@ -21068,22 +21062,22 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>16634</v>
+                                    <v>16570</v>
                                 </b>
                                 <b>
                                     <a>2</a>
                                     <b>3</b>
-                                    <v>4002</v>
+                                    <v>3987</v>
                                 </b>
                                 <b>
                                     <a>3</a>
                                     <b>5</b>
-                                    <v>1876</v>
+                                    <v>1868</v>
                                 </b>
                                 <b>
                                     <a>5</a>
                                     <b>6</b>
-                                    <v>375</v>
+                                    <v>373</v>
                                 </b>
                             </bs>
                         </hist>
@@ -21099,27 +21093,27 @@
                                 <b>
                                     <a>10</a>
                                     <b>11</b>
-                                    <v>125</v>
+                                    <v>124</v>
                                 </b>
                                 <b>
                                     <a>86</a>
                                     <b>87</b>
-                                    <v>125</v>
+                                    <v>124</v>
                                 </b>
                                 <b>
                                     <a>91</a>
                                     <b>92</b>
-                                    <v>125</v>
+                                    <v>124</v>
                                 </b>
                                 <b>
                                     <a>187</a>
                                     <b>188</b>
-                                    <v>125</v>
+                                    <v>124</v>
                                 </b>
                                 <b>
                                     <a>335</a>
                                     <b>336</b>
-                                    <v>125</v>
+                                    <v>124</v>
                                 </b>
                             </bs>
                         </hist>
@@ -21135,22 +21129,22 @@
                                 <b>
                                     <a>4</a>
                                     <b>5</b>
-                                    <v>125</v>
+                                    <v>124</v>
                                 </b>
                                 <b>
                                     <a>16</a>
                                     <b>17</b>
-                                    <v>250</v>
+                                    <v>249</v>
                                 </b>
                                 <b>
                                     <a>80</a>
                                     <b>81</b>
-                                    <v>125</v>
+                                    <v>124</v>
                                 </b>
                                 <b>
                                     <a>137</a>
                                     <b>138</b>
-                                    <v>125</v>
+                                    <v>124</v>
                                 </b>
                             </bs>
                         </hist>
@@ -21166,27 +21160,27 @@
                                 <b>
                                     <a>4</a>
                                     <b>5</b>
-                                    <v>125</v>
+                                    <v>124</v>
                                 </b>
                                 <b>
                                     <a>19</a>
                                     <b>20</b>
-                                    <v>125</v>
+                                    <v>124</v>
                                 </b>
                                 <b>
                                     <a>20</a>
                                     <b>21</b>
-                                    <v>125</v>
+                                    <v>124</v>
                                 </b>
                                 <b>
                                     <a>80</a>
                                     <b>81</b>
-                                    <v>125</v>
+                                    <v>124</v>
                                 </b>
                                 <b>
                                     <a>138</a>
                                     <b>139</b>
-                                    <v>125</v>
+                                    <v>124</v>
                                 </b>
                             </bs>
                         </hist>
@@ -21196,15 +21190,15 @@
         </relation>
         <relation>
             <name>typedefbase</name>
-            <cardinality>2164787</cardinality>
+            <cardinality>2162643</cardinality>
             <columnsizes>
                 <e>
                     <k>id</k>
-                    <v>2164787</v>
+                    <v>2162643</v>
                 </e>
                 <e>
                     <k>type_id</k>
-                    <v>901360</v>
+                    <v>900467</v>
                 </e>
             </columnsizes>
             <dependencies>
@@ -21218,7 +21212,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>2164787</v>
+                                    <v>2162643</v>
                                 </b>
                             </bs>
                         </hist>
@@ -21234,22 +21228,22 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>727340</v>
+                                    <v>726620</v>
                                 </b>
                                 <b>
                                     <a>2</a>
                                     <b>3</b>
-                                    <v>81343</v>
+                                    <v>81262</v>
                                 </b>
                                 <b>
                                     <a>3</a>
                                     <b>6</b>
-                                    <v>69667</v>
+                                    <v>69598</v>
                                 </b>
                                 <b>
                                     <a>6</a>
                                     <b>2848</b>
-                                    <v>23008</v>
+                                    <v>22985</v>
                                 </b>
                             </bs>
                         </hist>
@@ -21259,15 +21253,15 @@
         </relation>
         <relation>
             <name>decltypes</name>
-            <cardinality>812151</cardinality>
+            <cardinality>812301</cardinality>
             <columnsizes>
                 <e>
                     <k>id</k>
-                    <v>27485</v>
+                    <v>27490</v>
                 </e>
                 <e>
                     <k>expr</k>
-                    <v>812151</v>
+                    <v>812301</v>
                 </e>
                 <e>
                     <k>kind</k>
@@ -21275,7 +21269,7 @@
                 </e>
                 <e>
                     <k>base_type</k>
-                    <v>3331</v>
+                    <v>3332</v>
                 </e>
                 <e>
                     <k>parentheses_would_change_meaning</k>
@@ -21293,27 +21287,27 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>9709</v>
+                                    <v>9711</v>
                                 </b>
                                 <b>
                                     <a>2</a>
                                     <b>3</b>
-                                    <v>3638</v>
+                                    <v>3639</v>
                                 </b>
                                 <b>
                                     <a>4</a>
                                     <b>5</b>
-                                    <v>3616</v>
+                                    <v>3617</v>
                                 </b>
                                 <b>
                                     <a>6</a>
                                     <b>9</b>
-                                    <v>547</v>
+                                    <v>548</v>
                                 </b>
                                 <b>
                                     <a>23</a>
                                     <b>24</b>
-                                    <v>3243</v>
+                                    <v>3244</v>
                                 </b>
                                 <b>
                                     <a>29</a>
@@ -21328,7 +21322,7 @@
                                 <b>
                                     <a>171</a>
                                     <b>172</b>
-                                    <v>3068</v>
+                                    <v>3069</v>
                                 </b>
                                 <b>
                                     <a>173</a>
@@ -21349,7 +21343,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>27485</v>
+                                    <v>27490</v>
                                 </b>
                             </bs>
                         </hist>
@@ -21365,7 +21359,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>27485</v>
+                                    <v>27490</v>
                                 </b>
                             </bs>
                         </hist>
@@ -21381,7 +21375,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>27485</v>
+                                    <v>27490</v>
                                 </b>
                             </bs>
                         </hist>
@@ -21397,7 +21391,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>812151</v>
+                                    <v>812301</v>
                                 </b>
                             </bs>
                         </hist>
@@ -21413,7 +21407,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>812151</v>
+                                    <v>812301</v>
                                 </b>
                             </bs>
                         </hist>
@@ -21429,7 +21423,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>812151</v>
+                                    <v>812301</v>
                                 </b>
                             </bs>
                         </hist>
@@ -21445,7 +21439,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>812151</v>
+                                    <v>812301</v>
                                 </b>
                             </bs>
                         </hist>
@@ -21617,7 +21611,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>3331</v>
+                                    <v>3332</v>
                                 </b>
                             </bs>
                         </hist>
@@ -21633,7 +21627,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>3331</v>
+                                    <v>3332</v>
                                 </b>
                             </bs>
                         </hist>
@@ -22003,7 +21997,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>4375</v>
+                                    <v>4374</v>
                                 </b>
                                 <b>
                                     <a>2</a>
@@ -22023,19 +22017,19 @@
         </relation>
         <relation>
             <name>usertypes</name>
-            <cardinality>4962767</cardinality>
+            <cardinality>4863327</cardinality>
             <columnsizes>
                 <e>
                     <k>id</k>
-                    <v>4962767</v>
+                    <v>4863327</v>
                 </e>
                 <e>
                     <k>name</k>
-                    <v>1069983</v>
+                    <v>1051154</v>
                 </e>
                 <e>
                     <k>kind</k>
-                    <v>161</v>
+                    <v>158</v>
                 </e>
             </columnsizes>
             <dependencies>
@@ -22049,7 +22043,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>4962767</v>
+                                    <v>4863327</v>
                                 </b>
                             </bs>
                         </hist>
@@ -22065,7 +22059,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>4962767</v>
+                                    <v>4863327</v>
                                 </b>
                             </bs>
                         </hist>
@@ -22081,22 +22075,22 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>740028</v>
+                                    <v>727675</v>
                                 </b>
                                 <b>
                                     <a>2</a>
                                     <b>3</b>
-                                    <v>195960</v>
+                                    <v>192465</v>
                                 </b>
                                 <b>
                                     <a>3</a>
                                     <b>7</b>
-                                    <v>85634</v>
+                                    <v>83711</v>
                                 </b>
                                 <b>
                                     <a>7</a>
-                                    <b>30188</b>
-                                    <v>48359</v>
+                                    <b>30282</b>
+                                    <v>47302</v>
                                 </b>
                             </bs>
                         </hist>
@@ -22112,12 +22106,12 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>1003916</v>
+                                    <v>986551</v>
                                 </b>
                                 <b>
                                     <a>2</a>
                                     <b>10</b>
-                                    <v>66066</v>
+                                    <v>64603</v>
                                 </b>
                             </bs>
                         </hist>
@@ -22151,8 +22145,8 @@
                                     <v>13</v>
                                 </b>
                                 <b>
-                                    <a>1426</a>
-                                    <b>1427</b>
+                                    <a>1563</a>
+                                    <b>1564</b>
                                     <v>13</v>
                                 </b>
                                 <b>
@@ -22166,13 +22160,13 @@
                                     <v>13</v>
                                 </b>
                                 <b>
-                                    <a>19665</a>
-                                    <b>19666</b>
+                                    <a>19666</a>
+                                    <b>19667</b>
                                     <v>13</v>
                                 </b>
                                 <b>
-                                    <a>20058</a>
-                                    <b>20059</b>
+                                    <a>20075</a>
+                                    <b>20076</b>
                                     <v>13</v>
                                 </b>
                                 <b>
@@ -22181,13 +22175,13 @@
                                     <v>13</v>
                                 </b>
                                 <b>
-                                    <a>85546</a>
-                                    <b>85547</b>
+                                    <a>86007</a>
+                                    <b>86008</b>
                                     <v>13</v>
                                 </b>
                                 <b>
-                                    <a>151042</a>
-                                    <b>151043</b>
+                                    <a>151219</a>
+                                    <b>151220</b>
                                     <v>13</v>
                                 </b>
                             </bs>
@@ -22247,8 +22241,8 @@
                                     <v>13</v>
                                 </b>
                                 <b>
-                                    <a>10827</a>
-                                    <b>10828</b>
+                                    <a>10840</a>
+                                    <b>10841</b>
                                     <v>13</v>
                                 </b>
                                 <b>
@@ -22257,8 +22251,8 @@
                                     <v>13</v>
                                 </b>
                                 <b>
-                                    <a>51351</a>
-                                    <b>51352</b>
+                                    <a>51707</a>
+                                    <b>51708</b>
                                     <v>13</v>
                                 </b>
                             </bs>
@@ -22269,19 +22263,19 @@
         </relation>
         <relation>
             <name>usertypesize</name>
-            <cardinality>1624097</cardinality>
+            <cardinality>1595570</cardinality>
             <columnsizes>
                 <e>
                     <k>id</k>
-                    <v>1624097</v>
+                    <v>1595570</v>
                 </e>
                 <e>
                     <k>size</k>
-                    <v>1887</v>
+                    <v>1846</v>
                 </e>
                 <e>
                     <k>alignment</k>
-                    <v>107</v>
+                    <v>105</v>
                 </e>
             </columnsizes>
             <dependencies>
@@ -22295,7 +22289,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>1624097</v>
+                                    <v>1595570</v>
                                 </b>
                             </bs>
                         </hist>
@@ -22311,7 +22305,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>1624097</v>
+                                    <v>1595570</v>
                                 </b>
                             </bs>
                         </hist>
@@ -22327,52 +22321,52 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>593</v>
+                                    <v>580</v>
                                 </b>
                                 <b>
                                     <a>2</a>
                                     <b>3</b>
-                                    <v>256</v>
+                                    <v>250</v>
                                 </b>
                                 <b>
                                     <a>3</a>
                                     <b>4</b>
-                                    <v>107</v>
+                                    <v>105</v>
                                 </b>
                                 <b>
                                     <a>4</a>
                                     <b>6</b>
-                                    <v>121</v>
+                                    <v>118</v>
                                 </b>
                                 <b>
                                     <a>6</a>
                                     <b>8</b>
-                                    <v>148</v>
+                                    <v>145</v>
                                 </b>
                                 <b>
                                     <a>8</a>
                                     <b>14</b>
-                                    <v>148</v>
+                                    <v>145</v>
                                 </b>
                                 <b>
                                     <a>14</a>
                                     <b>26</b>
-                                    <v>148</v>
+                                    <v>145</v>
                                 </b>
                                 <b>
                                     <a>26</a>
                                     <b>86</b>
-                                    <v>148</v>
+                                    <v>145</v>
                                 </b>
                                 <b>
                                     <a>96</a>
-                                    <b>1588</b>
-                                    <v>148</v>
+                                    <b>1592</b>
+                                    <v>145</v>
                                 </b>
                                 <b>
                                     <a>1733</a>
-                                    <b>92740</b>
-                                    <v>67</v>
+                                    <b>93158</b>
+                                    <v>65</v>
                                 </b>
                             </bs>
                         </hist>
@@ -22388,17 +22382,17 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>1550</v>
+                                    <v>1516</v>
                                 </b>
                                 <b>
                                     <a>2</a>
                                     <b>3</b>
-                                    <v>215</v>
+                                    <v>210</v>
                                 </b>
                                 <b>
                                     <a>3</a>
                                     <b>6</b>
-                                    <v>121</v>
+                                    <v>118</v>
                                 </b>
                             </bs>
                         </hist>
@@ -22437,18 +22431,18 @@
                                     <v>13</v>
                                 </b>
                                 <b>
-                                    <a>1909</a>
-                                    <b>1910</b>
+                                    <a>2046</a>
+                                    <b>2047</b>
                                     <v>13</v>
                                 </b>
                                 <b>
-                                    <a>10475</a>
-                                    <b>10476</b>
+                                    <a>10484</a>
+                                    <b>10485</b>
                                     <v>13</v>
                                 </b>
                                 <b>
-                                    <a>107926</a>
-                                    <b>107927</b>
+                                    <a>108344</a>
+                                    <b>108345</b>
                                     <v>13</v>
                                 </b>
                             </bs>
@@ -22505,26 +22499,26 @@
         </relation>
         <relation>
             <name>usertype_final</name>
-            <cardinality>11506</cardinality>
+            <cardinality>11462</cardinality>
             <columnsizes>
                 <e>
                     <k>id</k>
-                    <v>11506</v>
+                    <v>11462</v>
                 </e>
             </columnsizes>
             <dependencies/>
         </relation>
         <relation>
             <name>usertype_uuid</name>
-            <cardinality>50407</cardinality>
+            <cardinality>50280</cardinality>
             <columnsizes>
                 <e>
                     <k>id</k>
-                    <v>50407</v>
+                    <v>50280</v>
                 </e>
                 <e>
                     <k>uuid</k>
-                    <v>49898</v>
+                    <v>49771</v>
                 </e>
             </columnsizes>
             <dependencies>
@@ -22538,7 +22532,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>50407</v>
+                                    <v>50280</v>
                                 </b>
                             </bs>
                         </hist>
@@ -22554,12 +22548,12 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>49389</v>
+                                    <v>49263</v>
                                 </b>
                                 <b>
                                     <a>2</a>
                                     <b>3</b>
-                                    <v>509</v>
+                                    <v>508</v>
                                 </b>
                             </bs>
                         </hist>
@@ -22569,11 +22563,11 @@
         </relation>
         <relation>
             <name>usertype_alias_kind</name>
-            <cardinality>2164830</cardinality>
+            <cardinality>2162685</cardinality>
             <columnsizes>
                 <e>
                     <k>id</k>
-                    <v>2164787</v>
+                    <v>2162643</v>
                 </e>
                 <e>
                     <k>alias_kind</k>
@@ -22591,7 +22585,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>2164744</v>
+                                    <v>2162600</v>
                                 </b>
                                 <b>
                                     <a>2</a>
@@ -22627,26 +22621,26 @@
         </relation>
         <relation>
             <name>nontype_template_parameters</name>
-            <cardinality>961918</cardinality>
+            <cardinality>960965</cardinality>
             <columnsizes>
                 <e>
                     <k>id</k>
-                    <v>961918</v>
+                    <v>960965</v>
                 </e>
             </columnsizes>
             <dependencies/>
         </relation>
         <relation>
             <name>type_template_type_constraint</name>
-            <cardinality>29059</cardinality>
+            <cardinality>29057</cardinality>
             <columnsizes>
                 <e>
                     <k>id</k>
-                    <v>14322</v>
+                    <v>14321</v>
                 </e>
                 <e>
                     <k>constraint</k>
-                    <v>27839</v>
+                    <v>27836</v>
                 </e>
             </columnsizes>
             <dependencies>
@@ -22660,7 +22654,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>10937</v>
+                                    <v>10936</v>
                                 </b>
                                 <b>
                                     <a>2</a>
@@ -22696,7 +22690,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>26618</v>
+                                    <v>26616</v>
                                 </b>
                                 <b>
                                     <a>2</a>
@@ -22711,19 +22705,19 @@
         </relation>
         <relation>
             <name>mangled_name</name>
-            <cardinality>7827011</cardinality>
+            <cardinality>7805179</cardinality>
             <columnsizes>
                 <e>
                     <k>id</k>
-                    <v>7827011</v>
+                    <v>7805179</v>
                 </e>
                 <e>
                     <k>mangled_name</k>
-                    <v>6329773</v>
+                    <v>6313666</v>
                 </e>
                 <e>
                     <k>is_complete</k>
-                    <v>250</v>
+                    <v>249</v>
                 </e>
             </columnsizes>
             <dependencies>
@@ -22737,7 +22731,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>7827011</v>
+                                    <v>7805179</v>
                                 </b>
                             </bs>
                         </hist>
@@ -22753,7 +22747,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>7827011</v>
+                                    <v>7805179</v>
                                 </b>
                             </bs>
                         </hist>
@@ -22769,12 +22763,12 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>6000083</v>
+                                    <v>5984988</v>
                                 </b>
                                 <b>
                                     <a>2</a>
                                     <b>1127</b>
-                                    <v>329690</v>
+                                    <v>328678</v>
                                 </b>
                             </bs>
                         </hist>
@@ -22790,7 +22784,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>6329773</v>
+                                    <v>6313666</v>
                                 </b>
                             </bs>
                         </hist>
@@ -22806,12 +22800,12 @@
                                 <b>
                                     <a>6</a>
                                     <b>7</b>
-                                    <v>125</v>
+                                    <v>124</v>
                                 </b>
                                 <b>
-                                    <a>62574</a>
-                                    <b>62575</b>
-                                    <v>125</v>
+                                    <a>62639</a>
+                                    <b>62640</b>
+                                    <v>124</v>
                                 </b>
                             </bs>
                         </hist>
@@ -22827,12 +22821,12 @@
                                 <b>
                                     <a>6</a>
                                     <b>7</b>
-                                    <v>125</v>
+                                    <v>124</v>
                                 </b>
                                 <b>
-                                    <a>50603</a>
-                                    <b>50604</b>
-                                    <v>125</v>
+                                    <a>50668</a>
+                                    <b>50669</b>
+                                    <v>124</v>
                                 </b>
                             </bs>
                         </hist>
@@ -22842,59 +22836,59 @@
         </relation>
         <relation>
             <name>is_pod_class</name>
-            <cardinality>742865</cardinality>
+            <cardinality>744607</cardinality>
             <columnsizes>
                 <e>
                     <k>id</k>
-                    <v>742865</v>
+                    <v>744607</v>
                 </e>
             </columnsizes>
             <dependencies/>
         </relation>
         <relation>
             <name>is_standard_layout_class</name>
-            <cardinality>1338834</cardinality>
+            <cardinality>1314777</cardinality>
             <columnsizes>
                 <e>
                     <k>id</k>
-                    <v>1338834</v>
+                    <v>1314777</v>
                 </e>
             </columnsizes>
             <dependencies/>
         </relation>
         <relation>
             <name>is_complete</name>
-            <cardinality>1604003</cardinality>
+            <cardinality>1574114</cardinality>
             <columnsizes>
                 <e>
                     <k>id</k>
-                    <v>1604003</v>
+                    <v>1574114</v>
                 </e>
             </columnsizes>
             <dependencies/>
         </relation>
         <relation>
             <name>is_class_template</name>
-            <cardinality>290846</cardinality>
+            <cardinality>284418</cardinality>
             <columnsizes>
                 <e>
                     <k>id</k>
-                    <v>290846</v>
+                    <v>284418</v>
                 </e>
             </columnsizes>
             <dependencies/>
         </relation>
         <relation>
             <name>class_instantiation</name>
-            <cardinality>1320911</cardinality>
+            <cardinality>1297977</cardinality>
             <columnsizes>
                 <e>
                     <k>to</k>
-                    <v>1317027</v>
+                    <v>1294166</v>
                 </e>
                 <e>
                     <k>from</k>
-                    <v>91190</v>
+                    <v>89302</v>
                 </e>
             </columnsizes>
             <dependencies>
@@ -22908,12 +22902,12 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>1314303</v>
+                                    <v>1291489</v>
                                 </b>
                                 <b>
                                     <a>2</a>
                                     <b>8</b>
-                                    <v>2724</v>
+                                    <v>2676</v>
                                 </b>
                             </bs>
                         </hist>
@@ -22929,47 +22923,47 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>26607</v>
+                                    <v>25952</v>
                                 </b>
                                 <b>
                                     <a>2</a>
                                     <b>3</b>
-                                    <v>16533</v>
+                                    <v>16154</v>
                                 </b>
                                 <b>
                                     <a>3</a>
                                     <b>4</b>
-                                    <v>9021</v>
+                                    <v>8835</v>
                                 </b>
                                 <b>
                                     <a>4</a>
                                     <b>5</b>
-                                    <v>5974</v>
+                                    <v>5841</v>
                                 </b>
                                 <b>
                                     <a>5</a>
                                     <b>7</b>
-                                    <v>7700</v>
+                                    <v>7516</v>
                                 </b>
                                 <b>
                                     <a>7</a>
                                     <b>10</b>
-                                    <v>6904</v>
+                                    <v>6844</v>
                                 </b>
                                 <b>
                                     <a>10</a>
                                     <b>17</b>
-                                    <v>7336</v>
+                                    <v>7239</v>
                                 </b>
                                 <b>
                                     <a>17</a>
                                     <b>53</b>
-                                    <v>6904</v>
+                                    <v>6751</v>
                                 </b>
                                 <b>
                                     <a>53</a>
                                     <b>4219</b>
-                                    <v>4207</v>
+                                    <v>4167</v>
                                 </b>
                             </bs>
                         </hist>
@@ -22979,19 +22973,19 @@
         </relation>
         <relation>
             <name>class_template_argument</name>
-            <cardinality>3486149</cardinality>
+            <cardinality>3419896</cardinality>
             <columnsizes>
                 <e>
                     <k>type_id</k>
-                    <v>1623773</v>
+                    <v>1594040</v>
                 </e>
                 <e>
                     <k>index</k>
-                    <v>1510</v>
+                    <v>1476</v>
                 </e>
                 <e>
                     <k>arg_type</k>
-                    <v>1029795</v>
+                    <v>1008969</v>
                 </e>
             </columnsizes>
             <dependencies>
@@ -23005,27 +22999,27 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>675431</v>
+                                    <v>663402</v>
                                 </b>
                                 <b>
                                     <a>2</a>
                                     <b>3</b>
-                                    <v>488142</v>
+                                    <v>479231</v>
                                 </b>
                                 <b>
                                     <a>3</a>
                                     <b>4</b>
-                                    <v>307433</v>
+                                    <v>302010</v>
                                 </b>
                                 <b>
                                     <a>4</a>
                                     <b>7</b>
-                                    <v>123542</v>
+                                    <v>120819</v>
                                 </b>
                                 <b>
                                     <a>7</a>
                                     <b>113</b>
-                                    <v>29223</v>
+                                    <v>28576</v>
                                 </b>
                             </bs>
                         </hist>
@@ -23041,22 +23035,22 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>709847</v>
+                                    <v>697648</v>
                                 </b>
                                 <b>
                                     <a>2</a>
                                     <b>3</b>
-                                    <v>503407</v>
+                                    <v>493644</v>
                                 </b>
                                 <b>
                                     <a>3</a>
                                     <b>4</b>
-                                    <v>305505</v>
+                                    <v>300045</v>
                                 </b>
                                 <b>
                                     <a>4</a>
                                     <b>113</b>
-                                    <v>105013</v>
+                                    <v>102700</v>
                                 </b>
                             </bs>
                         </hist>
@@ -23077,32 +23071,32 @@
                                 <b>
                                     <a>4</a>
                                     <b>5</b>
-                                    <v>957</v>
+                                    <v>936</v>
                                 </b>
                                 <b>
                                     <a>5</a>
                                     <b>30</b>
-                                    <v>121</v>
+                                    <v>118</v>
                                 </b>
                                 <b>
                                     <a>33</a>
                                     <b>90</b>
-                                    <v>121</v>
+                                    <v>118</v>
                                 </b>
                                 <b>
                                     <a>95</a>
                                     <b>453</b>
-                                    <v>121</v>
+                                    <v>118</v>
                                 </b>
                                 <b>
                                     <a>643</a>
-                                    <b>6818</b>
-                                    <v>121</v>
+                                    <b>6819</b>
+                                    <v>118</v>
                                 </b>
                                 <b>
-                                    <a>11328</a>
-                                    <b>120405</b>
-                                    <v>53</v>
+                                    <a>11329</a>
+                                    <b>120877</b>
+                                    <v>52</v>
                                 </b>
                             </bs>
                         </hist>
@@ -23123,32 +23117,32 @@
                                 <b>
                                     <a>4</a>
                                     <b>5</b>
-                                    <v>957</v>
+                                    <v>936</v>
                                 </b>
                                 <b>
                                     <a>5</a>
                                     <b>16</b>
-                                    <v>134</v>
+                                    <v>131</v>
                                 </b>
                                 <b>
                                     <a>16</a>
                                     <b>35</b>
-                                    <v>121</v>
+                                    <v>118</v>
                                 </b>
                                 <b>
                                     <a>37</a>
                                     <b>155</b>
-                                    <v>121</v>
+                                    <v>118</v>
                                 </b>
                                 <b>
                                     <a>196</a>
                                     <b>3251</b>
-                                    <v>121</v>
+                                    <v>118</v>
                                 </b>
                                 <b>
-                                    <a>10040</a>
-                                    <b>43709</b>
-                                    <v>40</v>
+                                    <a>10075</a>
+                                    <b>43772</b>
+                                    <v>39</v>
                                 </b>
                             </bs>
                         </hist>
@@ -23164,27 +23158,27 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>646113</v>
+                                    <v>633045</v>
                                 </b>
                                 <b>
                                     <a>2</a>
                                     <b>3</b>
-                                    <v>211415</v>
+                                    <v>206957</v>
                                 </b>
                                 <b>
                                     <a>3</a>
                                     <b>4</b>
-                                    <v>61737</v>
+                                    <v>60607</v>
                                 </b>
                                 <b>
                                     <a>4</a>
                                     <b>11</b>
-                                    <v>78284</v>
+                                    <v>76761</v>
                                 </b>
                                 <b>
                                     <a>11</a>
-                                    <b>11552</b>
-                                    <v>32244</v>
+                                    <b>11634</b>
+                                    <v>31596</v>
                                 </b>
                             </bs>
                         </hist>
@@ -23200,17 +23194,17 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>908181</v>
+                                    <v>889441</v>
                                 </b>
                                 <b>
                                     <a>2</a>
                                     <b>3</b>
-                                    <v>98486</v>
+                                    <v>96885</v>
                                 </b>
                                 <b>
                                     <a>3</a>
                                     <b>22</b>
-                                    <v>23127</v>
+                                    <v>22642</v>
                                 </b>
                             </bs>
                         </hist>
@@ -23220,11 +23214,11 @@
         </relation>
         <relation>
             <name>class_template_argument_value</name>
-            <cardinality>640309</cardinality>
+            <cardinality>639675</cardinality>
             <columnsizes>
                 <e>
                     <k>type_id</k>
-                    <v>258356</v>
+                    <v>258100</v>
                 </e>
                 <e>
                     <k>index</k>
@@ -23232,7 +23226,7 @@
                 </e>
                 <e>
                     <k>arg_value</k>
-                    <v>640138</v>
+                    <v>639504</v>
                 </e>
             </columnsizes>
             <dependencies>
@@ -23246,17 +23240,17 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>195574</v>
+                                    <v>195380</v>
                                 </b>
                                 <b>
                                     <a>2</a>
                                     <b>3</b>
-                                    <v>54442</v>
+                                    <v>54388</v>
                                 </b>
                                 <b>
                                     <a>3</a>
                                     <b>8</b>
-                                    <v>8339</v>
+                                    <v>8331</v>
                                 </b>
                             </bs>
                         </hist>
@@ -23272,22 +23266,22 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>185694</v>
+                                    <v>185511</v>
                                 </b>
                                 <b>
                                     <a>2</a>
                                     <b>3</b>
-                                    <v>50807</v>
+                                    <v>50757</v>
                                 </b>
                                 <b>
                                     <a>3</a>
                                     <b>45</b>
-                                    <v>19501</v>
+                                    <v>19482</v>
                                 </b>
                                 <b>
                                     <a>45</a>
                                     <b>154</b>
-                                    <v>2352</v>
+                                    <v>2349</v>
                                 </b>
                             </bs>
                         </hist>
@@ -23415,12 +23409,12 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>639967</v>
+                                    <v>639333</v>
                                 </b>
                                 <b>
                                     <a>2</a>
                                     <b>3</b>
-                                    <v>171</v>
+                                    <v>170</v>
                                 </b>
                             </bs>
                         </hist>
@@ -23436,7 +23430,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>640138</v>
+                                    <v>639504</v>
                                 </b>
                             </bs>
                         </hist>
@@ -23446,15 +23440,15 @@
         </relation>
         <relation>
             <name>is_proxy_class_for</name>
-            <cardinality>61845</cardinality>
+            <cardinality>60475</cardinality>
             <columnsizes>
                 <e>
                     <k>id</k>
-                    <v>61845</v>
+                    <v>60475</v>
                 </e>
                 <e>
                     <k>templ_param_id</k>
-                    <v>58433</v>
+                    <v>57139</v>
                 </e>
             </columnsizes>
             <dependencies>
@@ -23468,7 +23462,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>61845</v>
+                                    <v>60475</v>
                                 </b>
                             </bs>
                         </hist>
@@ -23484,12 +23478,12 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>57516</v>
+                                    <v>56242</v>
                                 </b>
                                 <b>
                                     <a>2</a>
                                     <b>79</b>
-                                    <v>917</v>
+                                    <v>896</v>
                                 </b>
                             </bs>
                         </hist>
@@ -23499,19 +23493,19 @@
         </relation>
         <relation>
             <name>type_mentions</name>
-            <cardinality>5812069</cardinality>
+            <cardinality>5813148</cardinality>
             <columnsizes>
                 <e>
                     <k>id</k>
-                    <v>5812069</v>
+                    <v>5813148</v>
                 </e>
                 <e>
                     <k>type_id</k>
-                    <v>275231</v>
+                    <v>275282</v>
                 </e>
                 <e>
                     <k>location</k>
-                    <v>5766496</v>
+                    <v>5767566</v>
                 </e>
                 <e>
                     <k>kind</k>
@@ -23529,7 +23523,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>5812069</v>
+                                    <v>5813148</v>
                                 </b>
                             </bs>
                         </hist>
@@ -23545,7 +23539,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>5812069</v>
+                                    <v>5813148</v>
                                 </b>
                             </bs>
                         </hist>
@@ -23561,7 +23555,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>5812069</v>
+                                    <v>5813148</v>
                                 </b>
                             </bs>
                         </hist>
@@ -23577,42 +23571,42 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>136121</v>
+                                    <v>136147</v>
                                 </b>
                                 <b>
                                     <a>2</a>
                                     <b>3</b>
-                                    <v>30907</v>
+                                    <v>30912</v>
                                 </b>
                                 <b>
                                     <a>3</a>
                                     <b>4</b>
-                                    <v>11135</v>
+                                    <v>11137</v>
                                 </b>
                                 <b>
                                     <a>4</a>
                                     <b>5</b>
-                                    <v>14665</v>
+                                    <v>14668</v>
                                 </b>
                                 <b>
                                     <a>5</a>
                                     <b>7</b>
-                                    <v>19934</v>
+                                    <v>19938</v>
                                 </b>
                                 <b>
                                     <a>7</a>
                                     <b>12</b>
-                                    <v>21781</v>
+                                    <v>21785</v>
                                 </b>
                                 <b>
                                     <a>12</a>
                                     <b>28</b>
-                                    <v>21021</v>
+                                    <v>21025</v>
                                 </b>
                                 <b>
                                     <a>28</a>
                                     <b>8907</b>
-                                    <v>19663</v>
+                                    <v>19666</v>
                                 </b>
                             </bs>
                         </hist>
@@ -23628,42 +23622,42 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>136121</v>
+                                    <v>136147</v>
                                 </b>
                                 <b>
                                     <a>2</a>
                                     <b>3</b>
-                                    <v>30907</v>
+                                    <v>30912</v>
                                 </b>
                                 <b>
                                     <a>3</a>
                                     <b>4</b>
-                                    <v>11135</v>
+                                    <v>11137</v>
                                 </b>
                                 <b>
                                     <a>4</a>
                                     <b>5</b>
-                                    <v>14665</v>
+                                    <v>14668</v>
                                 </b>
                                 <b>
                                     <a>5</a>
                                     <b>7</b>
-                                    <v>19934</v>
+                                    <v>19938</v>
                                 </b>
                                 <b>
                                     <a>7</a>
                                     <b>12</b>
-                                    <v>21781</v>
+                                    <v>21785</v>
                                 </b>
                                 <b>
                                     <a>12</a>
                                     <b>28</b>
-                                    <v>21021</v>
+                                    <v>21025</v>
                                 </b>
                                 <b>
                                     <a>28</a>
                                     <b>8907</b>
-                                    <v>19663</v>
+                                    <v>19666</v>
                                 </b>
                             </bs>
                         </hist>
@@ -23679,7 +23673,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>275231</v>
+                                    <v>275282</v>
                                 </b>
                             </bs>
                         </hist>
@@ -23695,12 +23689,12 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>5720923</v>
+                                    <v>5721985</v>
                                 </b>
                                 <b>
                                     <a>2</a>
                                     <b>3</b>
-                                    <v>45573</v>
+                                    <v>45581</v>
                                 </b>
                             </bs>
                         </hist>
@@ -23716,12 +23710,12 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>5720923</v>
+                                    <v>5721985</v>
                                 </b>
                                 <b>
                                     <a>2</a>
                                     <b>3</b>
-                                    <v>45573</v>
+                                    <v>45581</v>
                                 </b>
                             </bs>
                         </hist>
@@ -23737,7 +23731,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>5766496</v>
+                                    <v>5767566</v>
                                 </b>
                             </bs>
                         </hist>
@@ -23795,26 +23789,26 @@
         </relation>
         <relation>
             <name>is_function_template</name>
-            <cardinality>1383517</cardinality>
+            <cardinality>1382146</cardinality>
             <columnsizes>
                 <e>
                     <k>id</k>
-                    <v>1383517</v>
+                    <v>1382146</v>
                 </e>
             </columnsizes>
             <dependencies/>
         </relation>
         <relation>
             <name>function_instantiation</name>
-            <cardinality>1221386</cardinality>
+            <cardinality>1220177</cardinality>
             <columnsizes>
                 <e>
                     <k>to</k>
-                    <v>1221386</v>
+                    <v>1220177</v>
                 </e>
                 <e>
                     <k>from</k>
-                    <v>229146</v>
+                    <v>228919</v>
                 </e>
             </columnsizes>
             <dependencies>
@@ -23828,7 +23822,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>1221386</v>
+                                    <v>1220177</v>
                                 </b>
                             </bs>
                         </hist>
@@ -23844,27 +23838,27 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>139378</v>
+                                    <v>139240</v>
                                 </b>
                                 <b>
                                     <a>2</a>
                                     <b>3</b>
-                                    <v>53031</v>
+                                    <v>52978</v>
                                 </b>
                                 <b>
                                     <a>3</a>
                                     <b>9</b>
-                                    <v>18047</v>
+                                    <v>18029</v>
                                 </b>
                                 <b>
                                     <a>9</a>
                                     <b>103</b>
-                                    <v>17192</v>
+                                    <v>17175</v>
                                 </b>
                                 <b>
                                     <a>103</a>
                                     <b>1532</b>
-                                    <v>1496</v>
+                                    <v>1495</v>
                                 </b>
                             </bs>
                         </hist>
@@ -23874,11 +23868,11 @@
         </relation>
         <relation>
             <name>function_template_argument</name>
-            <cardinality>3119179</cardinality>
+            <cardinality>3116089</cardinality>
             <columnsizes>
                 <e>
                     <k>function_id</k>
-                    <v>1824318</v>
+                    <v>1822511</v>
                 </e>
                 <e>
                     <k>index</k>
@@ -23886,7 +23880,7 @@
                 </e>
                 <e>
                     <k>arg_type</k>
-                    <v>374084</v>
+                    <v>373713</v>
                 </e>
             </columnsizes>
             <dependencies>
@@ -23900,22 +23894,22 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>982917</v>
+                                    <v>981943</v>
                                 </b>
                                 <b>
                                     <a>2</a>
                                     <b>3</b>
-                                    <v>518637</v>
+                                    <v>518123</v>
                                 </b>
                                 <b>
                                     <a>3</a>
                                     <b>4</b>
-                                    <v>215674</v>
+                                    <v>215461</v>
                                 </b>
                                 <b>
                                     <a>4</a>
                                     <b>15</b>
-                                    <v>107088</v>
+                                    <v>106982</v>
                                 </b>
                             </bs>
                         </hist>
@@ -23931,22 +23925,22 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>1006952</v>
+                                    <v>1005955</v>
                                 </b>
                                 <b>
                                     <a>2</a>
                                     <b>3</b>
-                                    <v>516242</v>
+                                    <v>515730</v>
                                 </b>
                                 <b>
                                     <a>3</a>
                                     <b>4</b>
-                                    <v>212937</v>
+                                    <v>212726</v>
                                 </b>
                                 <b>
                                     <a>4</a>
                                     <b>9</b>
-                                    <v>88185</v>
+                                    <v>88098</v>
                                 </b>
                             </bs>
                         </hist>
@@ -24084,37 +24078,37 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>219395</v>
+                                    <v>219178</v>
                                 </b>
                                 <b>
                                     <a>2</a>
                                     <b>3</b>
-                                    <v>33059</v>
+                                    <v>33026</v>
                                 </b>
                                 <b>
                                     <a>3</a>
                                     <b>4</b>
-                                    <v>25104</v>
+                                    <v>25079</v>
                                 </b>
                                 <b>
                                     <a>4</a>
                                     <b>6</b>
-                                    <v>28440</v>
+                                    <v>28411</v>
                                 </b>
                                 <b>
                                     <a>6</a>
                                     <b>11</b>
-                                    <v>29167</v>
+                                    <v>29138</v>
                                 </b>
                                 <b>
                                     <a>11</a>
                                     <b>76</b>
-                                    <v>29338</v>
+                                    <v>29309</v>
                                 </b>
                                 <b>
                                     <a>79</a>
                                     <b>2452</b>
-                                    <v>9579</v>
+                                    <v>9570</v>
                                 </b>
                             </bs>
                         </hist>
@@ -24130,17 +24124,17 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>322378</v>
+                                    <v>322059</v>
                                 </b>
                                 <b>
                                     <a>2</a>
                                     <b>3</b>
-                                    <v>40329</v>
+                                    <v>40289</v>
                                 </b>
                                 <b>
                                     <a>3</a>
                                     <b>15</b>
-                                    <v>11376</v>
+                                    <v>11364</v>
                                 </b>
                             </bs>
                         </hist>
@@ -24150,11 +24144,11 @@
         </relation>
         <relation>
             <name>function_template_argument_value</name>
-            <cardinality>568375</cardinality>
+            <cardinality>567812</cardinality>
             <columnsizes>
                 <e>
                     <k>function_id</k>
-                    <v>247023</v>
+                    <v>246778</v>
                 </e>
                 <e>
                     <k>index</k>
@@ -24162,7 +24156,7 @@
                 </e>
                 <e>
                     <k>arg_value</k>
-                    <v>564996</v>
+                    <v>564437</v>
                 </e>
             </columnsizes>
             <dependencies>
@@ -24176,17 +24170,17 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>190057</v>
+                                    <v>189868</v>
                                 </b>
                                 <b>
                                     <a>2</a>
                                     <b>3</b>
-                                    <v>53843</v>
+                                    <v>53790</v>
                                 </b>
                                 <b>
                                     <a>3</a>
                                     <b>8</b>
-                                    <v>3122</v>
+                                    <v>3118</v>
                                 </b>
                             </bs>
                         </hist>
@@ -24202,22 +24196,22 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>181375</v>
+                                    <v>181195</v>
                                 </b>
                                 <b>
                                     <a>2</a>
                                     <b>3</b>
-                                    <v>46060</v>
+                                    <v>46014</v>
                                 </b>
                                 <b>
                                     <a>3</a>
                                     <b>54</b>
-                                    <v>18646</v>
+                                    <v>18628</v>
                                 </b>
                                 <b>
                                     <a>54</a>
                                     <b>113</b>
-                                    <v>940</v>
+                                    <v>939</v>
                                 </b>
                             </bs>
                         </hist>
@@ -24355,12 +24349,12 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>561618</v>
+                                    <v>561061</v>
                                 </b>
                                 <b>
                                     <a>2</a>
                                     <b>3</b>
-                                    <v>3378</v>
+                                    <v>3375</v>
                                 </b>
                             </bs>
                         </hist>
@@ -24376,7 +24370,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>564996</v>
+                                    <v>564437</v>
                                 </b>
                             </bs>
                         </hist>
@@ -24386,26 +24380,26 @@
         </relation>
         <relation>
             <name>is_variable_template</name>
-            <cardinality>58783</cardinality>
+            <cardinality>58559</cardinality>
             <columnsizes>
                 <e>
                     <k>id</k>
-                    <v>58783</v>
+                    <v>58559</v>
                 </e>
             </columnsizes>
             <dependencies/>
         </relation>
         <relation>
             <name>variable_instantiation</name>
-            <cardinality>395853</cardinality>
+            <cardinality>420379</cardinality>
             <columnsizes>
                 <e>
                     <k>to</k>
-                    <v>395853</v>
+                    <v>420379</v>
                 </e>
                 <e>
                     <k>from</k>
-                    <v>35145</v>
+                    <v>35010</v>
                 </e>
             </columnsizes>
             <dependencies>
@@ -24419,7 +24413,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>395853</v>
+                                    <v>420379</v>
                                 </b>
                             </bs>
                         </hist>
@@ -24435,47 +24429,47 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>15383</v>
+                                    <v>15075</v>
                                 </b>
                                 <b>
                                     <a>2</a>
                                     <b>3</b>
-                                    <v>3752</v>
+                                    <v>3987</v>
                                 </b>
                                 <b>
                                     <a>3</a>
                                     <b>4</b>
-                                    <v>2251</v>
+                                    <v>2242</v>
                                 </b>
                                 <b>
                                     <a>4</a>
                                     <b>6</b>
-                                    <v>2876</v>
+                                    <v>2865</v>
                                 </b>
                                 <b>
                                     <a>6</a>
                                     <b>8</b>
-                                    <v>2251</v>
+                                    <v>2242</v>
                                 </b>
                                 <b>
                                     <a>8</a>
                                     <b>11</b>
-                                    <v>2751</v>
+                                    <v>2741</v>
                                 </b>
                                 <b>
                                     <a>11</a>
-                                    <b>25</b>
-                                    <v>2876</v>
+                                    <b>30</b>
+                                    <v>2741</v>
                                 </b>
                                 <b>
-                                    <a>26</a>
-                                    <b>181</b>
-                                    <v>2751</v>
+                                    <a>30</a>
+                                    <b>105</b>
+                                    <v>2741</v>
                                 </b>
                                 <b>
-                                    <a>388</a>
-                                    <b>447</b>
-                                    <v>250</v>
+                                    <a>180</a>
+                                    <b>546</b>
+                                    <v>373</v>
                                 </b>
                             </bs>
                         </hist>
@@ -24485,19 +24479,19 @@
         </relation>
         <relation>
             <name>variable_template_argument</name>
-            <cardinality>719414</cardinality>
+            <cardinality>766874</cardinality>
             <columnsizes>
                 <e>
                     <k>variable_id</k>
-                    <v>379093</v>
+                    <v>399696</v>
                 </e>
                 <e>
                     <k>index</k>
-                    <v>2001</v>
+                    <v>1993</v>
                 </e>
                 <e>
                     <k>arg_type</k>
-                    <v>255397</v>
+                    <v>256164</v>
                 </e>
             </columnsizes>
             <dependencies>
@@ -24511,22 +24505,22 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>151962</v>
+                                    <v>155493</v>
                                 </b>
                                 <b>
                                     <a>2</a>
                                     <b>3</b>
-                                    <v>173725</v>
+                                    <v>189631</v>
                                 </b>
                                 <b>
                                     <a>3</a>
                                     <b>4</b>
-                                    <v>36521</v>
+                                    <v>36381</v>
                                 </b>
                                 <b>
                                     <a>4</a>
                                     <b>17</b>
-                                    <v>16884</v>
+                                    <v>18190</v>
                                 </b>
                             </bs>
                         </hist>
@@ -24542,22 +24536,22 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>165470</v>
+                                    <v>170444</v>
                                 </b>
                                 <b>
                                     <a>2</a>
                                     <b>3</b>
-                                    <v>165345</v>
+                                    <v>179788</v>
                                 </b>
                                 <b>
                                     <a>3</a>
                                     <b>4</b>
-                                    <v>33769</v>
+                                    <v>33640</v>
                                 </b>
                                 <b>
                                     <a>4</a>
                                     <b>17</b>
-                                    <v>14508</v>
+                                    <v>15823</v>
                                 </b>
                             </bs>
                         </hist>
@@ -24571,44 +24565,44 @@
                             <budget>12</budget>
                             <bs>
                                 <b>
-                                    <a>23</a>
-                                    <b>24</b>
-                                    <v>875</v>
+                                    <a>28</a>
+                                    <b>29</b>
+                                    <v>872</v>
                                 </b>
                                 <b>
-                                    <a>29</a>
-                                    <b>30</b>
-                                    <v>375</v>
+                                    <a>34</a>
+                                    <b>35</b>
+                                    <v>373</v>
                                 </b>
                                 <b>
-                                    <a>32</a>
-                                    <b>33</b>
-                                    <v>125</v>
+                                    <a>37</a>
+                                    <b>38</b>
+                                    <v>124</v>
                                 </b>
                                 <b>
-                                    <a>61</a>
-                                    <b>62</b>
-                                    <v>125</v>
+                                    <a>66</a>
+                                    <b>67</b>
+                                    <v>124</v>
                                 </b>
                                 <b>
-                                    <a>135</a>
-                                    <b>136</b>
-                                    <v>125</v>
+                                    <a>146</a>
+                                    <b>147</b>
+                                    <v>124</v>
                                 </b>
                                 <b>
-                                    <a>427</a>
-                                    <b>428</b>
-                                    <v>125</v>
+                                    <a>438</a>
+                                    <b>439</b>
+                                    <v>124</v>
                                 </b>
                                 <b>
-                                    <a>1816</a>
-                                    <b>1817</b>
-                                    <v>125</v>
+                                    <a>1960</a>
+                                    <b>1961</b>
+                                    <v>124</v>
                                 </b>
                                 <b>
-                                    <a>3031</a>
-                                    <b>3032</b>
-                                    <v>125</v>
+                                    <a>3208</a>
+                                    <b>3209</b>
+                                    <v>124</v>
                                 </b>
                             </bs>
                         </hist>
@@ -24624,42 +24618,42 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>875</v>
+                                    <v>872</v>
                                 </b>
                                 <b>
                                     <a>2</a>
                                     <b>3</b>
-                                    <v>375</v>
+                                    <v>373</v>
                                 </b>
                                 <b>
                                     <a>5</a>
                                     <b>6</b>
-                                    <v>125</v>
+                                    <v>124</v>
                                 </b>
                                 <b>
                                     <a>28</a>
                                     <b>29</b>
-                                    <v>125</v>
+                                    <v>124</v>
                                 </b>
                                 <b>
                                     <a>54</a>
                                     <b>55</b>
-                                    <v>125</v>
+                                    <v>124</v>
                                 </b>
                                 <b>
                                     <a>161</a>
                                     <b>162</b>
-                                    <v>125</v>
+                                    <v>124</v>
                                 </b>
                                 <b>
-                                    <a>731</a>
-                                    <b>732</b>
-                                    <v>125</v>
+                                    <a>748</a>
+                                    <b>749</b>
+                                    <v>124</v>
                                 </b>
                                 <b>
-                                    <a>1321</a>
-                                    <b>1322</b>
-                                    <v>125</v>
+                                    <a>1326</a>
+                                    <b>1327</b>
+                                    <v>124</v>
                                 </b>
                             </bs>
                         </hist>
@@ -24675,22 +24669,22 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>176226</v>
+                                    <v>175552</v>
                                 </b>
                                 <b>
                                     <a>2</a>
                                     <b>3</b>
-                                    <v>44150</v>
+                                    <v>44604</v>
                                 </b>
                                 <b>
                                     <a>3</a>
                                     <b>6</b>
-                                    <v>21137</v>
+                                    <v>21679</v>
                                 </b>
                                 <b>
                                     <a>6</a>
-                                    <b>190</b>
-                                    <v>13883</v>
+                                    <b>206</b>
+                                    <v>14328</v>
                                 </b>
                             </bs>
                         </hist>
@@ -24706,17 +24700,17 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>227756</v>
+                                    <v>227757</v>
                                 </b>
                                 <b>
                                     <a>2</a>
                                     <b>3</b>
-                                    <v>24138</v>
+                                    <v>24794</v>
                                 </b>
                                 <b>
                                     <a>3</a>
                                     <b>7</b>
-                                    <v>3502</v>
+                                    <v>3613</v>
                                 </b>
                             </bs>
                         </hist>
@@ -24726,19 +24720,19 @@
         </relation>
         <relation>
             <name>variable_template_argument_value</name>
-            <cardinality>20011</cardinality>
+            <cardinality>19935</cardinality>
             <columnsizes>
                 <e>
                     <k>variable_id</k>
-                    <v>14883</v>
+                    <v>14826</v>
                 </e>
                 <e>
                     <k>index</k>
-                    <v>500</v>
+                    <v>498</v>
                 </e>
                 <e>
                     <k>arg_value</k>
-                    <v>20011</v>
+                    <v>19935</v>
                 </e>
             </columnsizes>
             <dependencies>
@@ -24752,12 +24746,12 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>13382</v>
+                                    <v>13331</v>
                                 </b>
                                 <b>
                                     <a>2</a>
                                     <b>3</b>
-                                    <v>1500</v>
+                                    <v>1495</v>
                                 </b>
                             </bs>
                         </hist>
@@ -24773,17 +24767,17 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>10506</v>
+                                    <v>10465</v>
                                 </b>
                                 <b>
                                     <a>2</a>
                                     <b>3</b>
-                                    <v>4002</v>
+                                    <v>3987</v>
                                 </b>
                                 <b>
                                     <a>4</a>
                                     <b>5</b>
-                                    <v>375</v>
+                                    <v>373</v>
                                 </b>
                             </bs>
                         </hist>
@@ -24799,22 +24793,22 @@
                                 <b>
                                     <a>17</a>
                                     <b>18</b>
-                                    <v>125</v>
+                                    <v>124</v>
                                 </b>
                                 <b>
                                     <a>27</a>
                                     <b>28</b>
-                                    <v>125</v>
+                                    <v>124</v>
                                 </b>
                                 <b>
                                     <a>41</a>
                                     <b>42</b>
-                                    <v>125</v>
+                                    <v>124</v>
                                 </b>
                                 <b>
                                     <a>46</a>
                                     <b>47</b>
-                                    <v>125</v>
+                                    <v>124</v>
                                 </b>
                             </bs>
                         </hist>
@@ -24830,22 +24824,22 @@
                                 <b>
                                     <a>22</a>
                                     <b>23</b>
-                                    <v>125</v>
+                                    <v>124</v>
                                 </b>
                                 <b>
                                     <a>29</a>
                                     <b>30</b>
-                                    <v>125</v>
+                                    <v>124</v>
                                 </b>
                                 <b>
                                     <a>50</a>
                                     <b>51</b>
-                                    <v>125</v>
+                                    <v>124</v>
                                 </b>
                                 <b>
                                     <a>59</a>
                                     <b>60</b>
-                                    <v>125</v>
+                                    <v>124</v>
                                 </b>
                             </bs>
                         </hist>
@@ -24861,7 +24855,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>20011</v>
+                                    <v>19935</v>
                                 </b>
                             </bs>
                         </hist>
@@ -24877,7 +24871,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>20011</v>
+                                    <v>19935</v>
                                 </b>
                             </bs>
                         </hist>
@@ -24887,15 +24881,15 @@
         </relation>
         <relation>
             <name>template_template_instantiation</name>
-            <cardinality>7403</cardinality>
+            <cardinality>7239</cardinality>
             <columnsizes>
                 <e>
                     <k>to</k>
-                    <v>6945</v>
+                    <v>6791</v>
                 </e>
                 <e>
                     <k>from</k>
-                    <v>4908</v>
+                    <v>4800</v>
                 </e>
             </columnsizes>
             <dependencies>
@@ -24909,12 +24903,12 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>6796</v>
+                                    <v>6646</v>
                                 </b>
                                 <b>
                                     <a>2</a>
                                     <b>15</b>
-                                    <v>148</v>
+                                    <v>145</v>
                                 </b>
                             </bs>
                         </hist>
@@ -24930,17 +24924,17 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>3209</v>
+                                    <v>3138</v>
                                 </b>
                                 <b>
                                     <a>2</a>
                                     <b>3</b>
-                                    <v>1523</v>
+                                    <v>1490</v>
                                 </b>
                                 <b>
                                     <a>3</a>
                                     <b>20</b>
-                                    <v>175</v>
+                                    <v>171</v>
                                 </b>
                             </bs>
                         </hist>
@@ -24950,19 +24944,19 @@
         </relation>
         <relation>
             <name>template_template_argument</name>
-            <cardinality>12352</cardinality>
+            <cardinality>12079</cardinality>
             <columnsizes>
                 <e>
                     <k>type_id</k>
-                    <v>7808</v>
+                    <v>7635</v>
                 </e>
                 <e>
                     <k>index</k>
-                    <v>134</v>
+                    <v>131</v>
                 </e>
                 <e>
                     <k>arg_type</k>
-                    <v>11597</v>
+                    <v>11340</v>
                 </e>
             </columnsizes>
             <dependencies>
@@ -24976,22 +24970,22 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>6405</v>
+                                    <v>6263</v>
                                 </b>
                                 <b>
                                     <a>2</a>
                                     <b>3</b>
-                                    <v>539</v>
+                                    <v>527</v>
                                 </b>
                                 <b>
                                     <a>3</a>
                                     <b>8</b>
-                                    <v>647</v>
+                                    <v>632</v>
                                 </b>
                                 <b>
                                     <a>8</a>
                                     <b>11</b>
-                                    <v>215</v>
+                                    <v>210</v>
                                 </b>
                             </bs>
                         </hist>
@@ -25007,22 +25001,22 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>6432</v>
+                                    <v>6290</v>
                                 </b>
                                 <b>
                                     <a>2</a>
                                     <b>4</b>
-                                    <v>714</v>
+                                    <v>698</v>
                                 </b>
                                 <b>
                                     <a>4</a>
                                     <b>10</b>
-                                    <v>593</v>
+                                    <v>580</v>
                                 </b>
                                 <b>
                                     <a>10</a>
                                     <b>11</b>
-                                    <v>67</v>
+                                    <v>65</v>
                                 </b>
                             </bs>
                         </hist>
@@ -25160,12 +25154,12 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>11557</v>
+                                    <v>11301</v>
                                 </b>
                                 <b>
                                     <a>3</a>
                                     <b>43</b>
-                                    <v>40</v>
+                                    <v>39</v>
                                 </b>
                             </bs>
                         </hist>
@@ -25181,7 +25175,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>11570</v>
+                                    <v>11314</v>
                                 </b>
                                 <b>
                                     <a>2</a>
@@ -25196,11 +25190,11 @@
         </relation>
         <relation>
             <name>template_template_argument_value</name>
-            <cardinality>795</cardinality>
+            <cardinality>778</cardinality>
             <columnsizes>
                 <e>
                     <k>type_id</k>
-                    <v>674</v>
+                    <v>659</v>
                 </e>
                 <e>
                     <k>index</k>
@@ -25208,7 +25202,7 @@
                 </e>
                 <e>
                     <k>arg_value</k>
-                    <v>795</v>
+                    <v>778</v>
                 </e>
             </columnsizes>
             <dependencies>
@@ -25222,7 +25216,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>674</v>
+                                    <v>659</v>
                                 </b>
                             </bs>
                         </hist>
@@ -25238,12 +25232,12 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>579</v>
+                                    <v>567</v>
                                 </b>
                                 <b>
                                     <a>2</a>
                                     <b>3</b>
-                                    <v>67</v>
+                                    <v>65</v>
                                 </b>
                                 <b>
                                     <a>3</a>
@@ -25306,7 +25300,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>795</v>
+                                    <v>778</v>
                                 </b>
                             </bs>
                         </hist>
@@ -25322,7 +25316,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>795</v>
+                                    <v>778</v>
                                 </b>
                             </bs>
                         </hist>
@@ -25448,15 +25442,15 @@
         </relation>
         <relation>
             <name>concept_instantiation</name>
-            <cardinality>96781</cardinality>
+            <cardinality>96773</cardinality>
             <columnsizes>
                 <e>
                     <k>to</k>
-                    <v>96781</v>
+                    <v>96773</v>
                 </e>
                 <e>
                     <k>from</k>
-                    <v>3684</v>
+                    <v>3683</v>
                 </e>
             </columnsizes>
             <dependencies>
@@ -25470,7 +25464,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>96781</v>
+                                    <v>96773</v>
                                 </b>
                             </bs>
                         </hist>
@@ -25566,22 +25560,22 @@
         </relation>
         <relation>
             <name>is_type_constraint</name>
-            <cardinality>39490</cardinality>
+            <cardinality>39487</cardinality>
             <columnsizes>
                 <e>
                     <k>concept_id</k>
-                    <v>39490</v>
+                    <v>39487</v>
                 </e>
             </columnsizes>
             <dependencies/>
         </relation>
         <relation>
             <name>concept_template_argument</name>
-            <cardinality>120982</cardinality>
+            <cardinality>120973</cardinality>
             <columnsizes>
                 <e>
                     <k>concept_id</k>
-                    <v>81744</v>
+                    <v>81738</v>
                 </e>
                 <e>
                     <k>index</k>
@@ -25589,7 +25583,7 @@
                 </e>
                 <e>
                     <k>arg_type</k>
-                    <v>22934</v>
+                    <v>22932</v>
                 </e>
             </columnsizes>
             <dependencies>
@@ -25603,12 +25597,12 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>49737</v>
+                                    <v>49733</v>
                                 </b>
                                 <b>
                                     <a>2</a>
                                     <b>3</b>
-                                    <v>26411</v>
+                                    <v>26409</v>
                                 </b>
                                 <b>
                                     <a>3</a>
@@ -25629,12 +25623,12 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>53606</v>
+                                    <v>53602</v>
                                 </b>
                                 <b>
                                     <a>2</a>
                                     <b>3</b>
-                                    <v>23947</v>
+                                    <v>23945</v>
                                 </b>
                                 <b>
                                     <a>3</a>
@@ -25762,7 +25756,7 @@
                                 <b>
                                     <a>6</a>
                                     <b>9</b>
-                                    <v>1727</v>
+                                    <v>1726</v>
                                 </b>
                                 <b>
                                     <a>9</a>
@@ -25788,12 +25782,12 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>19296</v>
+                                    <v>19294</v>
                                 </b>
                                 <b>
                                     <a>2</a>
                                     <b>3</b>
-                                    <v>3500</v>
+                                    <v>3499</v>
                                 </b>
                                 <b>
                                     <a>3</a>
@@ -25939,15 +25933,15 @@
         </relation>
         <relation>
             <name>routinetypes</name>
-            <cardinality>758603</cardinality>
+            <cardinality>757852</cardinality>
             <columnsizes>
                 <e>
                     <k>id</k>
-                    <v>758603</v>
+                    <v>757852</v>
                 </e>
                 <e>
                     <k>return_type</k>
-                    <v>356335</v>
+                    <v>355982</v>
                 </e>
             </columnsizes>
             <dependencies>
@@ -25961,7 +25955,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>758603</v>
+                                    <v>757852</v>
                                 </b>
                             </bs>
                         </hist>
@@ -25977,17 +25971,17 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>294024</v>
+                                    <v>293732</v>
                                 </b>
                                 <b>
                                     <a>2</a>
                                     <b>3</b>
-                                    <v>44050</v>
+                                    <v>44006</v>
                                 </b>
                                 <b>
                                     <a>3</a>
                                     <b>4676</b>
-                                    <v>18261</v>
+                                    <v>18243</v>
                                 </b>
                             </bs>
                         </hist>
@@ -25997,11 +25991,11 @@
         </relation>
         <relation>
             <name>routinetypeargs</name>
-            <cardinality>1165836</cardinality>
+            <cardinality>1166052</cardinality>
             <columnsizes>
                 <e>
                     <k>routine</k>
-                    <v>412059</v>
+                    <v>412135</v>
                 </e>
                 <e>
                     <k>index</k>
@@ -26009,7 +26003,7 @@
                 </e>
                 <e>
                     <k>type_id</k>
-                    <v>111081</v>
+                    <v>111101</v>
                 </e>
             </columnsizes>
             <dependencies>
@@ -26023,32 +26017,32 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>82129</v>
+                                    <v>82144</v>
                                 </b>
                                 <b>
                                     <a>2</a>
                                     <b>3</b>
-                                    <v>125475</v>
+                                    <v>125498</v>
                                 </b>
                                 <b>
                                     <a>3</a>
                                     <b>4</b>
-                                    <v>106844</v>
+                                    <v>106864</v>
                                 </b>
                                 <b>
                                     <a>4</a>
                                     <b>5</b>
-                                    <v>48614</v>
+                                    <v>48623</v>
                                 </b>
                                 <b>
                                     <a>5</a>
                                     <b>7</b>
-                                    <v>32482</v>
+                                    <v>32488</v>
                                 </b>
                                 <b>
                                     <a>7</a>
                                     <b>19</b>
-                                    <v>16512</v>
+                                    <v>16515</v>
                                 </b>
                             </bs>
                         </hist>
@@ -26064,27 +26058,27 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>88104</v>
+                                    <v>88120</v>
                                 </b>
                                 <b>
                                     <a>2</a>
                                     <b>3</b>
-                                    <v>138023</v>
+                                    <v>138048</v>
                                 </b>
                                 <b>
                                     <a>3</a>
                                     <b>4</b>
-                                    <v>113525</v>
+                                    <v>113546</v>
                                 </b>
                                 <b>
                                     <a>4</a>
                                     <b>5</b>
-                                    <v>40141</v>
+                                    <v>40148</v>
                                 </b>
                                 <b>
                                     <a>5</a>
                                     <b>10</b>
-                                    <v>32156</v>
+                                    <v>32162</v>
                                 </b>
                                 <b>
                                     <a>10</a>
@@ -26282,47 +26276,47 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>33188</v>
+                                    <v>33194</v>
                                 </b>
                                 <b>
                                     <a>2</a>
                                     <b>3</b>
-                                    <v>14991</v>
+                                    <v>14994</v>
                                 </b>
                                 <b>
                                     <a>3</a>
                                     <b>4</b>
-                                    <v>13199</v>
+                                    <v>13201</v>
                                 </b>
                                 <b>
                                     <a>4</a>
                                     <b>5</b>
-                                    <v>9831</v>
+                                    <v>9833</v>
                                 </b>
                                 <b>
                                     <a>5</a>
                                     <b>6</b>
-                                    <v>6355</v>
+                                    <v>6356</v>
                                 </b>
                                 <b>
                                     <a>6</a>
                                     <b>8</b>
-                                    <v>9505</v>
+                                    <v>9507</v>
                                 </b>
                                 <b>
                                     <a>8</a>
                                     <b>13</b>
-                                    <v>9451</v>
+                                    <v>9453</v>
                                 </b>
                                 <b>
                                     <a>13</a>
                                     <b>26</b>
-                                    <v>8745</v>
+                                    <v>8746</v>
                                 </b>
                                 <b>
                                     <a>26</a>
                                     <b>916</b>
-                                    <v>5812</v>
+                                    <v>5813</v>
                                 </b>
                             </bs>
                         </hist>
@@ -26338,22 +26332,22 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>78490</v>
+                                    <v>78504</v>
                                 </b>
                                 <b>
                                     <a>2</a>
                                     <b>3</b>
-                                    <v>17544</v>
+                                    <v>17548</v>
                                 </b>
                                 <b>
                                     <a>3</a>
                                     <b>5</b>
-                                    <v>9451</v>
+                                    <v>9453</v>
                                 </b>
                                 <b>
                                     <a>5</a>
                                     <b>17</b>
-                                    <v>5594</v>
+                                    <v>5595</v>
                                 </b>
                             </bs>
                         </hist>
@@ -26363,15 +26357,15 @@
         </relation>
         <relation>
             <name>ptrtomembers</name>
-            <cardinality>12029</cardinality>
+            <cardinality>12026</cardinality>
             <columnsizes>
                 <e>
                     <k>id</k>
-                    <v>12029</v>
+                    <v>12026</v>
                 </e>
                 <e>
                     <k>type_id</k>
-                    <v>10114</v>
+                    <v>9890</v>
                 </e>
                 <e>
                     <k>class_id</k>
@@ -26389,7 +26383,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>12029</v>
+                                    <v>12026</v>
                                 </b>
                             </bs>
                         </hist>
@@ -26405,7 +26399,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>12029</v>
+                                    <v>12026</v>
                                 </b>
                             </bs>
                         </hist>
@@ -26421,12 +26415,12 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>9831</v>
+                                    <v>9613</v>
                                 </b>
                                 <b>
                                     <a>2</a>
-                                    <b>74</b>
-                                    <v>283</v>
+                                    <b>84</b>
+                                    <v>276</v>
                                 </b>
                             </bs>
                         </hist>
@@ -26442,12 +26436,12 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>9831</v>
+                                    <v>9613</v>
                                 </b>
                                 <b>
                                     <a>2</a>
-                                    <b>74</b>
-                                    <v>283</v>
+                                    <b>84</b>
+                                    <v>276</v>
                                 </b>
                             </bs>
                         </hist>
@@ -26463,22 +26457,22 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>4854</v>
+                                    <v>4747</v>
                                 </b>
                                 <b>
                                     <a>2</a>
                                     <b>3</b>
-                                    <v>539</v>
+                                    <v>659</v>
                                 </b>
                                 <b>
                                     <a>8</a>
                                     <b>9</b>
-                                    <v>512</v>
+                                    <v>501</v>
                                 </b>
                                 <b>
                                     <a>10</a>
                                     <b>65</b>
-                                    <v>53</v>
+                                    <v>52</v>
                                 </b>
                             </bs>
                         </hist>
@@ -26494,22 +26488,22 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>4854</v>
+                                    <v>4747</v>
                                 </b>
                                 <b>
                                     <a>2</a>
                                     <b>3</b>
-                                    <v>539</v>
+                                    <v>659</v>
                                 </b>
                                 <b>
                                     <a>8</a>
                                     <b>9</b>
-                                    <v>512</v>
+                                    <v>501</v>
                                 </b>
                                 <b>
                                     <a>10</a>
                                     <b>65</b>
-                                    <v>53</v>
+                                    <v>52</v>
                                 </b>
                             </bs>
                         </hist>
@@ -26519,15 +26513,15 @@
         </relation>
         <relation>
             <name>specifiers</name>
-            <cardinality>7754</cardinality>
+            <cardinality>7724</cardinality>
             <columnsizes>
                 <e>
                     <k>id</k>
-                    <v>7754</v>
+                    <v>7724</v>
                 </e>
                 <e>
                     <k>str</k>
-                    <v>7754</v>
+                    <v>7724</v>
                 </e>
             </columnsizes>
             <dependencies>
@@ -26541,7 +26535,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>7754</v>
+                                    <v>7724</v>
                                 </b>
                             </bs>
                         </hist>
@@ -26557,7 +26551,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>7754</v>
+                                    <v>7724</v>
                                 </b>
                             </bs>
                         </hist>
@@ -26567,15 +26561,15 @@
         </relation>
         <relation>
             <name>typespecifiers</name>
-            <cardinality>985913</cardinality>
+            <cardinality>966335</cardinality>
             <columnsizes>
                 <e>
                     <k>type_id</k>
-                    <v>979359</v>
+                    <v>959913</v>
                 </e>
                 <e>
                     <k>spec_id</k>
-                    <v>107</v>
+                    <v>105</v>
                 </e>
             </columnsizes>
             <dependencies>
@@ -26589,12 +26583,12 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>972805</v>
+                                    <v>953491</v>
                                 </b>
                                 <b>
                                     <a>2</a>
                                     <b>3</b>
-                                    <v>6554</v>
+                                    <v>6422</v>
                                 </b>
                             </bs>
                         </hist>
@@ -26618,13 +26612,13 @@
                                     <v>13</v>
                                 </b>
                                 <b>
-                                    <a>529</a>
-                                    <b>530</b>
+                                    <a>532</a>
+                                    <b>533</b>
                                     <v>13</v>
                                 </b>
                                 <b>
-                                    <a>820</a>
-                                    <b>821</b>
+                                    <a>821</a>
+                                    <b>822</b>
                                     <v>13</v>
                                 </b>
                                 <b>
@@ -26633,18 +26627,18 @@
                                     <v>13</v>
                                 </b>
                                 <b>
-                                    <a>4147</a>
-                                    <b>4148</b>
+                                    <a>4150</a>
+                                    <b>4151</b>
                                     <v>13</v>
                                 </b>
                                 <b>
-                                    <a>17356</a>
-                                    <b>17357</b>
+                                    <a>17496</a>
+                                    <b>17497</b>
                                     <v>13</v>
                                 </b>
                                 <b>
-                                    <a>48300</a>
-                                    <b>48301</b>
+                                    <a>48324</a>
+                                    <b>48325</b>
                                     <v>13</v>
                                 </b>
                             </bs>
@@ -26655,15 +26649,15 @@
         </relation>
         <relation>
             <name>funspecifiers</name>
-            <cardinality>9699590</cardinality>
+            <cardinality>9674600</cardinality>
             <columnsizes>
                 <e>
                     <k>func_id</k>
-                    <v>3974790</v>
+                    <v>3322022</v>
                 </e>
                 <e>
                     <k>spec_id</k>
-                    <v>2376</v>
+                    <v>811</v>
                 </e>
             </columnsizes>
             <dependencies>
@@ -26677,27 +26671,32 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>1485356</v>
+                                    <v>435451</v>
                                 </b>
                                 <b>
                                     <a>2</a>
                                     <b>3</b>
-                                    <v>507167</v>
+                                    <v>673513</v>
                                 </b>
                                 <b>
                                     <a>3</a>
                                     <b>4</b>
-                                    <v>1039223</v>
+                                    <v>1416326</v>
                                 </b>
                                 <b>
                                     <a>4</a>
                                     <b>5</b>
-                                    <v>697026</v>
+                                    <v>456941</v>
                                 </b>
                                 <b>
                                     <a>5</a>
+                                    <b>6</b>
+                                    <v>223835</v>
+                                </b>
+                                <b>
+                                    <a>6</a>
                                     <b>8</b>
-                                    <v>246016</v>
+                                    <v>115955</v>
                                 </b>
                             </bs>
                         </hist>
@@ -26711,99 +26710,94 @@
                             <budget>12</budget>
                             <bs>
                                 <b>
-                                    <a>17</a>
-                                    <b>18</b>
-                                    <v>125</v>
+                                    <a>2</a>
+                                    <b>3</b>
+                                    <v>85</v>
                                 </b>
                                 <b>
-                                    <a>18</a>
-                                    <b>19</b>
-                                    <v>125</v>
+                                    <a>106</a>
+                                    <b>107</b>
+                                    <v>42</v>
                                 </b>
                                 <b>
-                                    <a>53</a>
-                                    <b>54</b>
-                                    <v>125</v>
+                                    <a>214</a>
+                                    <b>215</b>
+                                    <v>42</v>
                                 </b>
                                 <b>
-                                    <a>114</a>
-                                    <b>115</b>
-                                    <v>125</v>
+                                    <a>301</a>
+                                    <b>302</b>
+                                    <v>42</v>
                                 </b>
                                 <b>
-                                    <a>206</a>
-                                    <b>207</b>
-                                    <v>125</v>
+                                    <a>308</a>
+                                    <b>309</b>
+                                    <v>42</v>
                                 </b>
                                 <b>
-                                    <a>272</a>
-                                    <b>273</b>
-                                    <v>125</v>
+                                    <a>562</a>
+                                    <b>563</b>
+                                    <v>42</v>
                                 </b>
                                 <b>
-                                    <a>354</a>
-                                    <b>355</b>
-                                    <v>125</v>
+                                    <a>1589</a>
+                                    <b>1590</b>
+                                    <v>42</v>
                                 </b>
                                 <b>
-                                    <a>653</a>
-                                    <b>654</b>
-                                    <v>125</v>
+                                    <a>1631</a>
+                                    <b>1632</b>
+                                    <v>42</v>
                                 </b>
                                 <b>
-                                    <a>766</a>
-                                    <b>767</b>
-                                    <v>125</v>
+                                    <a>3749</a>
+                                    <b>3750</b>
+                                    <v>42</v>
                                 </b>
                                 <b>
-                                    <a>823</a>
-                                    <b>824</b>
-                                    <v>125</v>
+                                    <a>3881</a>
+                                    <b>3882</b>
+                                    <v>42</v>
                                 </b>
                                 <b>
-                                    <a>1075</a>
-                                    <b>1076</b>
-                                    <v>125</v>
+                                    <a>6569</a>
+                                    <b>6570</b>
+                                    <v>42</v>
                                 </b>
                                 <b>
-                                    <a>1258</a>
-                                    <b>1259</b>
-                                    <v>125</v>
+                                    <a>6803</a>
+                                    <b>6804</b>
+                                    <v>42</v>
                                 </b>
                                 <b>
-                                    <a>1662</a>
-                                    <b>1663</b>
-                                    <v>125</v>
+                                    <a>12221</a>
+                                    <b>12222</b>
+                                    <v>42</v>
                                 </b>
                                 <b>
-                                    <a>3340</a>
-                                    <b>3341</b>
-                                    <v>125</v>
+                                    <a>14693</a>
+                                    <b>14694</b>
+                                    <v>42</v>
                                 </b>
                                 <b>
-                                    <a>3351</a>
-                                    <b>3352</b>
-                                    <v>125</v>
+                                    <a>15715</a>
+                                    <b>15716</b>
+                                    <v>42</v>
                                 </b>
                                 <b>
-                                    <a>6166</a>
-                                    <b>6167</b>
-                                    <v>125</v>
+                                    <a>42407</a>
+                                    <b>42408</b>
+                                    <v>42</v>
                                 </b>
                                 <b>
-                                    <a>15136</a>
-                                    <b>15137</b>
-                                    <v>125</v>
+                                    <a>51943</a>
+                                    <b>51944</b>
+                                    <v>42</v>
                                 </b>
                                 <b>
-                                    <a>19863</a>
-                                    <b>19864</b>
-                                    <v>125</v>
-                                </b>
-                                <b>
-                                    <a>22425</a>
-                                    <b>22426</b>
-                                    <v>125</v>
+                                    <a>63744</a>
+                                    <b>63745</b>
+                                    <v>42</v>
                                 </b>
                             </bs>
                         </hist>
@@ -26813,15 +26807,15 @@
         </relation>
         <relation>
             <name>varspecifiers</name>
-            <cardinality>2999353</cardinality>
+            <cardinality>3043328</cardinality>
             <columnsizes>
                 <e>
                     <k>var_id</k>
-                    <v>2281064</v>
+                    <v>2298382</v>
                 </e>
                 <e>
                     <k>spec_id</k>
-                    <v>1125</v>
+                    <v>1121</v>
                 </e>
             </columnsizes>
             <dependencies>
@@ -26835,17 +26829,17 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>1661582</v>
+                                    <v>1655851</v>
                                 </b>
                                 <b>
                                     <a>2</a>
                                     <b>3</b>
-                                    <v>521175</v>
+                                    <v>540612</v>
                                 </b>
                                 <b>
                                     <a>3</a>
                                     <b>5</b>
-                                    <v>98306</v>
+                                    <v>101917</v>
                                 </b>
                             </bs>
                         </hist>
@@ -26861,47 +26855,47 @@
                                 <b>
                                     <a>67</a>
                                     <b>68</b>
-                                    <v>125</v>
+                                    <v>124</v>
                                 </b>
                                 <b>
                                     <a>97</a>
                                     <b>98</b>
-                                    <v>125</v>
+                                    <v>124</v>
                                 </b>
                                 <b>
                                     <a>1091</a>
                                     <b>1092</b>
-                                    <v>125</v>
+                                    <v>124</v>
                                 </b>
                                 <b>
                                     <a>1325</a>
                                     <b>1326</b>
-                                    <v>125</v>
+                                    <v>124</v>
                                 </b>
                                 <b>
                                     <a>2236</a>
                                     <b>2237</b>
-                                    <v>125</v>
+                                    <v>124</v>
                                 </b>
                                 <b>
-                                    <a>2557</a>
-                                    <b>2558</b>
-                                    <v>125</v>
+                                    <a>2761</a>
+                                    <b>2762</b>
+                                    <v>124</v>
                                 </b>
                                 <b>
-                                    <a>3227</a>
-                                    <b>3228</b>
-                                    <v>125</v>
+                                    <a>3436</a>
+                                    <b>3437</b>
+                                    <v>124</v>
                                 </b>
                                 <b>
                                     <a>4931</a>
                                     <b>4932</b>
-                                    <v>125</v>
+                                    <v>124</v>
                                 </b>
                                 <b>
-                                    <a>8450</a>
-                                    <b>8451</b>
-                                    <v>125</v>
+                                    <a>8482</a>
+                                    <b>8483</b>
+                                    <v>124</v>
                                 </b>
                             </bs>
                         </hist>
@@ -26911,15 +26905,15 @@
         </relation>
         <relation>
             <name>explicit_specifier_exprs</name>
-            <cardinality>41398</cardinality>
+            <cardinality>41240</cardinality>
             <columnsizes>
                 <e>
                     <k>func_id</k>
-                    <v>41398</v>
+                    <v>41240</v>
                 </e>
                 <e>
                     <k>constant</k>
-                    <v>41398</v>
+                    <v>41240</v>
                 </e>
             </columnsizes>
             <dependencies>
@@ -26933,7 +26927,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>41398</v>
+                                    <v>41240</v>
                                 </b>
                             </bs>
                         </hist>
@@ -26949,7 +26943,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>41398</v>
+                                    <v>41240</v>
                                 </b>
                             </bs>
                         </hist>
@@ -26959,27 +26953,27 @@
         </relation>
         <relation>
             <name>attributes</name>
-            <cardinality>651875</cardinality>
+            <cardinality>649382</cardinality>
             <columnsizes>
                 <e>
                     <k>id</k>
-                    <v>651875</v>
+                    <v>649382</v>
                 </e>
                 <e>
                     <k>kind</k>
-                    <v>375</v>
+                    <v>373</v>
                 </e>
                 <e>
                     <k>name</k>
-                    <v>2126</v>
+                    <v>2118</v>
                 </e>
                 <e>
                     <k>name_space</k>
-                    <v>250</v>
+                    <v>249</v>
                 </e>
                 <e>
                     <k>location</k>
-                    <v>645747</v>
+                    <v>643277</v>
                 </e>
             </columnsizes>
             <dependencies>
@@ -26993,7 +26987,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>651875</v>
+                                    <v>649382</v>
                                 </b>
                             </bs>
                         </hist>
@@ -27009,7 +27003,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>651875</v>
+                                    <v>649382</v>
                                 </b>
                             </bs>
                         </hist>
@@ -27025,7 +27019,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>651875</v>
+                                    <v>649382</v>
                                 </b>
                             </bs>
                         </hist>
@@ -27041,7 +27035,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>651875</v>
+                                    <v>649382</v>
                                 </b>
                             </bs>
                         </hist>
@@ -27057,17 +27051,17 @@
                                 <b>
                                     <a>7</a>
                                     <b>8</b>
-                                    <v>125</v>
+                                    <v>124</v>
                                 </b>
                                 <b>
                                     <a>2402</a>
                                     <b>2403</b>
-                                    <v>125</v>
+                                    <v>124</v>
                                 </b>
                                 <b>
                                     <a>2803</a>
                                     <b>2804</b>
-                                    <v>125</v>
+                                    <v>124</v>
                                 </b>
                             </bs>
                         </hist>
@@ -27083,17 +27077,17 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>125</v>
+                                    <v>124</v>
                                 </b>
                                 <b>
                                     <a>6</a>
                                     <b>7</b>
-                                    <v>125</v>
+                                    <v>124</v>
                                 </b>
                                 <b>
                                     <a>12</a>
                                     <b>13</b>
-                                    <v>125</v>
+                                    <v>124</v>
                                 </b>
                             </bs>
                         </hist>
@@ -27109,12 +27103,12 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>250</v>
+                                    <v>249</v>
                                 </b>
                                 <b>
                                     <a>2</a>
                                     <b>3</b>
-                                    <v>125</v>
+                                    <v>124</v>
                                 </b>
                             </bs>
                         </hist>
@@ -27130,17 +27124,17 @@
                                 <b>
                                     <a>4</a>
                                     <b>5</b>
-                                    <v>125</v>
+                                    <v>124</v>
                                 </b>
                                 <b>
                                     <a>2356</a>
                                     <b>2357</b>
-                                    <v>125</v>
+                                    <v>124</v>
                                 </b>
                                 <b>
                                     <a>2803</a>
                                     <b>2804</b>
-                                    <v>125</v>
+                                    <v>124</v>
                                 </b>
                             </bs>
                         </hist>
@@ -27156,77 +27150,77 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>250</v>
+                                    <v>249</v>
                                 </b>
                                 <b>
                                     <a>3</a>
                                     <b>4</b>
-                                    <v>125</v>
+                                    <v>124</v>
                                 </b>
                                 <b>
                                     <a>6</a>
                                     <b>7</b>
-                                    <v>125</v>
+                                    <v>124</v>
                                 </b>
                                 <b>
                                     <a>7</a>
                                     <b>8</b>
-                                    <v>125</v>
+                                    <v>124</v>
                                 </b>
                                 <b>
                                     <a>8</a>
                                     <b>9</b>
-                                    <v>125</v>
+                                    <v>124</v>
                                 </b>
                                 <b>
                                     <a>10</a>
                                     <b>11</b>
-                                    <v>250</v>
+                                    <v>249</v>
                                 </b>
                                 <b>
                                     <a>14</a>
                                     <b>15</b>
-                                    <v>125</v>
+                                    <v>124</v>
                                 </b>
                                 <b>
                                     <a>18</a>
                                     <b>19</b>
-                                    <v>125</v>
+                                    <v>124</v>
                                 </b>
                                 <b>
                                     <a>24</a>
                                     <b>25</b>
-                                    <v>125</v>
+                                    <v>124</v>
                                 </b>
                                 <b>
                                     <a>55</a>
                                     <b>56</b>
-                                    <v>125</v>
+                                    <v>124</v>
                                 </b>
                                 <b>
                                     <a>62</a>
                                     <b>63</b>
-                                    <v>125</v>
+                                    <v>124</v>
                                 </b>
                                 <b>
                                     <a>72</a>
                                     <b>73</b>
-                                    <v>125</v>
+                                    <v>124</v>
                                 </b>
                                 <b>
                                     <a>340</a>
                                     <b>341</b>
-                                    <v>125</v>
+                                    <v>124</v>
                                 </b>
                                 <b>
                                     <a>1977</a>
                                     <b>1978</b>
-                                    <v>125</v>
+                                    <v>124</v>
                                 </b>
                                 <b>
                                     <a>2604</a>
                                     <b>2605</b>
-                                    <v>125</v>
+                                    <v>124</v>
                                 </b>
                             </bs>
                         </hist>
@@ -27242,12 +27236,12 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>1876</v>
+                                    <v>1868</v>
                                 </b>
                                 <b>
                                     <a>2</a>
                                     <b>3</b>
-                                    <v>250</v>
+                                    <v>249</v>
                                 </b>
                             </bs>
                         </hist>
@@ -27263,7 +27257,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>2126</v>
+                                    <v>2118</v>
                                 </b>
                             </bs>
                         </hist>
@@ -27279,77 +27273,77 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>250</v>
+                                    <v>249</v>
                                 </b>
                                 <b>
                                     <a>3</a>
                                     <b>4</b>
-                                    <v>125</v>
+                                    <v>124</v>
                                 </b>
                                 <b>
                                     <a>4</a>
                                     <b>5</b>
-                                    <v>125</v>
+                                    <v>124</v>
                                 </b>
                                 <b>
                                     <a>6</a>
                                     <b>7</b>
-                                    <v>125</v>
+                                    <v>124</v>
                                 </b>
                                 <b>
                                     <a>8</a>
                                     <b>9</b>
-                                    <v>125</v>
+                                    <v>124</v>
                                 </b>
                                 <b>
                                     <a>10</a>
                                     <b>11</b>
-                                    <v>250</v>
+                                    <v>249</v>
                                 </b>
                                 <b>
                                     <a>14</a>
                                     <b>15</b>
-                                    <v>125</v>
+                                    <v>124</v>
                                 </b>
                                 <b>
                                     <a>18</a>
                                     <b>19</b>
-                                    <v>125</v>
+                                    <v>124</v>
                                 </b>
                                 <b>
                                     <a>24</a>
                                     <b>25</b>
-                                    <v>125</v>
+                                    <v>124</v>
                                 </b>
                                 <b>
                                     <a>55</a>
                                     <b>56</b>
-                                    <v>125</v>
+                                    <v>124</v>
                                 </b>
                                 <b>
                                     <a>62</a>
                                     <b>63</b>
-                                    <v>125</v>
+                                    <v>124</v>
                                 </b>
                                 <b>
                                     <a>72</a>
                                     <b>73</b>
-                                    <v>125</v>
+                                    <v>124</v>
                                 </b>
                                 <b>
                                     <a>335</a>
                                     <b>336</b>
-                                    <v>125</v>
+                                    <v>124</v>
                                 </b>
                                 <b>
                                     <a>1977</a>
                                     <b>1978</b>
-                                    <v>125</v>
+                                    <v>124</v>
                                 </b>
                                 <b>
                                     <a>2604</a>
                                     <b>2605</b>
-                                    <v>125</v>
+                                    <v>124</v>
                                 </b>
                             </bs>
                         </hist>
@@ -27365,12 +27359,12 @@
                                 <b>
                                     <a>11</a>
                                     <b>12</b>
-                                    <v>125</v>
+                                    <v>124</v>
                                 </b>
                                 <b>
                                     <a>5201</a>
                                     <b>5202</b>
-                                    <v>125</v>
+                                    <v>124</v>
                                 </b>
                             </bs>
                         </hist>
@@ -27386,12 +27380,12 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>125</v>
+                                    <v>124</v>
                                 </b>
                                 <b>
                                     <a>3</a>
                                     <b>4</b>
-                                    <v>125</v>
+                                    <v>124</v>
                                 </b>
                             </bs>
                         </hist>
@@ -27407,12 +27401,12 @@
                                 <b>
                                     <a>2</a>
                                     <b>3</b>
-                                    <v>125</v>
+                                    <v>124</v>
                                 </b>
                                 <b>
                                     <a>15</a>
                                     <b>16</b>
-                                    <v>125</v>
+                                    <v>124</v>
                                 </b>
                             </bs>
                         </hist>
@@ -27428,12 +27422,12 @@
                                 <b>
                                     <a>11</a>
                                     <b>12</b>
-                                    <v>125</v>
+                                    <v>124</v>
                                 </b>
                                 <b>
                                     <a>5152</a>
                                     <b>5153</b>
-                                    <v>125</v>
+                                    <v>124</v>
                                 </b>
                             </bs>
                         </hist>
@@ -27449,12 +27443,12 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>639868</v>
+                                    <v>637421</v>
                                 </b>
                                 <b>
                                     <a>2</a>
                                     <b>5</b>
-                                    <v>5878</v>
+                                    <v>5855</v>
                                 </b>
                             </bs>
                         </hist>
@@ -27470,7 +27464,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>645747</v>
+                                    <v>643277</v>
                                 </b>
                             </bs>
                         </hist>
@@ -27486,12 +27480,12 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>640619</v>
+                                    <v>638169</v>
                                 </b>
                                 <b>
                                     <a>2</a>
                                     <b>3</b>
-                                    <v>5127</v>
+                                    <v>5108</v>
                                 </b>
                             </bs>
                         </hist>
@@ -27507,7 +27501,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>645747</v>
+                                    <v>643277</v>
                                 </b>
                             </bs>
                         </hist>
@@ -27517,27 +27511,27 @@
         </relation>
         <relation>
             <name>attribute_args</name>
-            <cardinality>98337</cardinality>
+            <cardinality>96265</cardinality>
             <columnsizes>
                 <e>
                     <k>id</k>
-                    <v>98337</v>
+                    <v>96265</v>
                 </e>
                 <e>
                     <k>kind</k>
-                    <v>53</v>
+                    <v>52</v>
                 </e>
                 <e>
                     <k>attribute</k>
-                    <v>84946</v>
+                    <v>83065</v>
                 </e>
                 <e>
                     <k>index</k>
-                    <v>67</v>
+                    <v>65</v>
                 </e>
                 <e>
                     <k>location</k>
-                    <v>91527</v>
+                    <v>89500</v>
                 </e>
             </columnsizes>
             <dependencies>
@@ -27551,7 +27545,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>98337</v>
+                                    <v>96265</v>
                                 </b>
                             </bs>
                         </hist>
@@ -27567,7 +27561,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>98337</v>
+                                    <v>96265</v>
                                 </b>
                             </bs>
                         </hist>
@@ -27583,7 +27577,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>98337</v>
+                                    <v>96265</v>
                                 </b>
                             </bs>
                         </hist>
@@ -27599,7 +27593,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>98337</v>
+                                    <v>96265</v>
                                 </b>
                             </bs>
                         </hist>
@@ -27628,8 +27622,8 @@
                                     <v>13</v>
                                 </b>
                                 <b>
-                                    <a>6589</a>
-                                    <b>6590</b>
+                                    <a>6597</a>
+                                    <b>6598</b>
                                     <v>13</v>
                                 </b>
                             </bs>
@@ -27734,17 +27728,17 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>77165</v>
+                                    <v>75350</v>
                                 </b>
                                 <b>
                                     <a>2</a>
                                     <b>4</b>
-                                    <v>6432</v>
+                                    <v>6395</v>
                                 </b>
                                 <b>
                                     <a>4</a>
                                     <b>18</b>
-                                    <v>1348</v>
+                                    <v>1318</v>
                                 </b>
                             </bs>
                         </hist>
@@ -27760,12 +27754,12 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>82653</v>
+                                    <v>80823</v>
                                 </b>
                                 <b>
                                     <a>2</a>
                                     <b>3</b>
-                                    <v>2292</v>
+                                    <v>2241</v>
                                 </b>
                             </bs>
                         </hist>
@@ -27781,12 +27775,12 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>78689</v>
+                                    <v>76946</v>
                                 </b>
                                 <b>
                                     <a>2</a>
                                     <b>6</b>
-                                    <v>6257</v>
+                                    <v>6118</v>
                                 </b>
                             </bs>
                         </hist>
@@ -27802,12 +27796,12 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>80293</v>
+                                    <v>78515</v>
                                 </b>
                                 <b>
                                     <a>2</a>
                                     <b>6</b>
-                                    <v>4652</v>
+                                    <v>4549</v>
                                 </b>
                             </bs>
                         </hist>
@@ -27841,8 +27835,8 @@
                                     <v>13</v>
                                 </b>
                                 <b>
-                                    <a>6472</a>
-                                    <b>6473</b>
+                                    <a>6480</a>
+                                    <b>6481</b>
                                     <v>13</v>
                                 </b>
                             </bs>
@@ -27864,7 +27858,7 @@
                                 <b>
                                     <a>2</a>
                                     <b>3</b>
-                                    <v>40</v>
+                                    <v>39</v>
                                 </b>
                                 <b>
                                     <a>4</a>
@@ -27957,12 +27951,12 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>89261</v>
+                                    <v>87179</v>
                                 </b>
                                 <b>
                                     <a>2</a>
                                     <b>23</b>
-                                    <v>2265</v>
+                                    <v>2320</v>
                                 </b>
                             </bs>
                         </hist>
@@ -27978,12 +27972,12 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>91311</v>
+                                    <v>89289</v>
                                 </b>
                                 <b>
                                     <a>2</a>
                                     <b>3</b>
-                                    <v>215</v>
+                                    <v>210</v>
                                 </b>
                             </bs>
                         </hist>
@@ -27999,12 +27993,12 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>91122</v>
+                                    <v>89105</v>
                                 </b>
                                 <b>
                                     <a>2</a>
                                     <b>18</b>
-                                    <v>404</v>
+                                    <v>395</v>
                                 </b>
                             </bs>
                         </hist>
@@ -28020,12 +28014,12 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>90974</v>
+                                    <v>88960</v>
                                 </b>
                                 <b>
                                     <a>2</a>
                                     <b>3</b>
-                                    <v>552</v>
+                                    <v>540</v>
                                 </b>
                             </bs>
                         </hist>
@@ -28035,15 +28029,15 @@
         </relation>
         <relation>
             <name>attribute_arg_value</name>
-            <cardinality>20955</cardinality>
+            <cardinality>20935</cardinality>
             <columnsizes>
                 <e>
                     <k>arg</k>
-                    <v>20955</v>
+                    <v>20935</v>
                 </e>
                 <e>
                     <k>value</k>
-                    <v>641</v>
+                    <v>640</v>
                 </e>
             </columnsizes>
             <dependencies>
@@ -28057,7 +28051,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>20955</v>
+                                    <v>20935</v>
                                 </b>
                             </bs>
                         </hist>
@@ -28128,15 +28122,15 @@
         </relation>
         <relation>
             <name>attribute_arg_type</name>
-            <cardinality>466</cardinality>
+            <cardinality>461</cardinality>
             <columnsizes>
                 <e>
                     <k>arg</k>
-                    <v>466</v>
+                    <v>461</v>
                 </e>
                 <e>
                     <k>type_id</k>
-                    <v>85</v>
+                    <v>84</v>
                 </e>
             </columnsizes>
             <dependencies>
@@ -28150,7 +28144,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>466</v>
+                                    <v>461</v>
                                 </b>
                             </bs>
                         </hist>
@@ -28191,15 +28185,15 @@
         </relation>
         <relation>
             <name>attribute_arg_constant</name>
-            <cardinality>88857</cardinality>
+            <cardinality>86995</cardinality>
             <columnsizes>
                 <e>
                     <k>arg</k>
-                    <v>88857</v>
+                    <v>86995</v>
                 </e>
                 <e>
                     <k>constant</k>
-                    <v>88857</v>
+                    <v>86995</v>
                 </e>
             </columnsizes>
             <dependencies>
@@ -28213,7 +28207,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>88857</v>
+                                    <v>86995</v>
                                 </b>
                             </bs>
                         </hist>
@@ -28229,7 +28223,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>88857</v>
+                                    <v>86995</v>
                                 </b>
                             </bs>
                         </hist>
@@ -28239,15 +28233,15 @@
         </relation>
         <relation>
             <name>attribute_arg_expr</name>
-            <cardinality>1793</cardinality>
+            <cardinality>1753</cardinality>
             <columnsizes>
                 <e>
                     <k>arg</k>
-                    <v>1793</v>
+                    <v>1753</v>
                 </e>
                 <e>
                     <k>expr</k>
-                    <v>1793</v>
+                    <v>1753</v>
                 </e>
             </columnsizes>
             <dependencies>
@@ -28261,7 +28255,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>1793</v>
+                                    <v>1753</v>
                                 </b>
                             </bs>
                         </hist>
@@ -28277,7 +28271,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>1793</v>
+                                    <v>1753</v>
                                 </b>
                             </bs>
                         </hist>
@@ -28340,15 +28334,15 @@
         </relation>
         <relation>
             <name>typeattributes</name>
-            <cardinality>92303</cardinality>
+            <cardinality>91950</cardinality>
             <columnsizes>
                 <e>
                     <k>type_id</k>
-                    <v>90677</v>
+                    <v>90330</v>
                 </e>
                 <e>
                     <k>spec_id</k>
-                    <v>29266</v>
+                    <v>29154</v>
                 </e>
             </columnsizes>
             <dependencies>
@@ -28362,12 +28356,12 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>89051</v>
+                                    <v>88710</v>
                                 </b>
                                 <b>
                                     <a>2</a>
                                     <b>3</b>
-                                    <v>1625</v>
+                                    <v>1619</v>
                                 </b>
                             </bs>
                         </hist>
@@ -28383,17 +28377,17 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>24764</v>
+                                    <v>24669</v>
                                 </b>
                                 <b>
                                     <a>2</a>
                                     <b>7</b>
-                                    <v>2251</v>
+                                    <v>2242</v>
                                 </b>
                                 <b>
                                     <a>7</a>
                                     <b>58</b>
-                                    <v>2251</v>
+                                    <v>2242</v>
                                 </b>
                             </bs>
                         </hist>
@@ -28403,15 +28397,15 @@
         </relation>
         <relation>
             <name>funcattributes</name>
-            <cardinality>845862</cardinality>
+            <cardinality>842627</cardinality>
             <columnsizes>
                 <e>
                     <k>func_id</k>
-                    <v>800961</v>
+                    <v>797898</v>
                 </e>
                 <e>
                     <k>spec_id</k>
-                    <v>617856</v>
+                    <v>615493</v>
                 </e>
             </columnsizes>
             <dependencies>
@@ -28425,12 +28419,12 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>760563</v>
+                                    <v>757654</v>
                                 </b>
                                 <b>
                                     <a>2</a>
                                     <b>7</b>
-                                    <v>40398</v>
+                                    <v>40243</v>
                                 </b>
                             </bs>
                         </hist>
@@ -28446,12 +28440,12 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>572079</v>
+                                    <v>569892</v>
                                 </b>
                                 <b>
                                     <a>2</a>
                                     <b>213</b>
-                                    <v>45776</v>
+                                    <v>45601</v>
                                 </b>
                             </bs>
                         </hist>
@@ -28592,15 +28586,15 @@
         </relation>
         <relation>
             <name>unspecifiedtype</name>
-            <cardinality>8313750</cardinality>
+            <cardinality>8145616</cardinality>
             <columnsizes>
                 <e>
                     <k>type_id</k>
-                    <v>8313750</v>
+                    <v>8145616</v>
                 </e>
                 <e>
                     <k>unspecified_type_id</k>
-                    <v>4783555</v>
+                    <v>4690378</v>
                 </e>
             </columnsizes>
             <dependencies>
@@ -28614,7 +28608,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>8313750</v>
+                                    <v>8145616</v>
                                 </b>
                             </bs>
                         </hist>
@@ -28630,17 +28624,17 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>3189801</v>
+                                    <v>3130941</v>
                                 </b>
                                 <b>
                                     <a>2</a>
                                     <b>3</b>
-                                    <v>1303717</v>
+                                    <v>1275559</v>
                                 </b>
                                 <b>
                                     <a>3</a>
                                     <b>6277</b>
-                                    <v>290037</v>
+                                    <v>283878</v>
                                 </b>
                             </bs>
                         </hist>
@@ -28650,19 +28644,19 @@
         </relation>
         <relation>
             <name>member</name>
-            <cardinality>4663372</cardinality>
+            <cardinality>4659693</cardinality>
             <columnsizes>
                 <e>
                     <k>parent</k>
-                    <v>558581</v>
+                    <v>559011</v>
                 </e>
                 <e>
                     <k>index</k>
-                    <v>10691</v>
+                    <v>10681</v>
                 </e>
                 <e>
                     <k>child</k>
-                    <v>4546703</v>
+                    <v>4543140</v>
                 </e>
             </columnsizes>
             <dependencies>
@@ -28676,52 +28670,52 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>232140</v>
+                                    <v>232892</v>
                                 </b>
                                 <b>
                                     <a>2</a>
                                     <b>3</b>
-                                    <v>24548</v>
+                                    <v>24524</v>
                                 </b>
                                 <b>
                                     <a>3</a>
                                     <b>4</b>
-                                    <v>29295</v>
+                                    <v>29266</v>
                                 </b>
                                 <b>
                                     <a>4</a>
                                     <b>5</b>
-                                    <v>37592</v>
+                                    <v>37555</v>
                                 </b>
                                 <b>
                                     <a>5</a>
                                     <b>7</b>
-                                    <v>47642</v>
+                                    <v>47595</v>
                                 </b>
                                 <b>
                                     <a>7</a>
                                     <b>11</b>
-                                    <v>43152</v>
+                                    <v>43109</v>
                                 </b>
                                 <b>
                                     <a>11</a>
                                     <b>14</b>
-                                    <v>41569</v>
+                                    <v>41528</v>
                                 </b>
                                 <b>
                                     <a>14</a>
                                     <b>19</b>
-                                    <v>45162</v>
+                                    <v>45117</v>
                                 </b>
                                 <b>
                                     <a>19</a>
                                     <b>53</b>
-                                    <v>42125</v>
+                                    <v>42083</v>
                                 </b>
                                 <b>
                                     <a>53</a>
                                     <b>251</b>
-                                    <v>15353</v>
+                                    <v>15338</v>
                                 </b>
                             </bs>
                         </hist>
@@ -28737,52 +28731,52 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>232011</v>
+                                    <v>232764</v>
                                 </b>
                                 <b>
                                     <a>2</a>
                                     <b>3</b>
-                                    <v>24676</v>
+                                    <v>24652</v>
                                 </b>
                                 <b>
                                     <a>3</a>
                                     <b>4</b>
-                                    <v>29338</v>
+                                    <v>29309</v>
                                 </b>
                                 <b>
                                     <a>4</a>
                                     <b>5</b>
-                                    <v>37677</v>
+                                    <v>37640</v>
                                 </b>
                                 <b>
                                     <a>5</a>
                                     <b>7</b>
-                                    <v>47428</v>
+                                    <v>47381</v>
                                 </b>
                                 <b>
                                     <a>7</a>
                                     <b>11</b>
-                                    <v>43579</v>
+                                    <v>43536</v>
                                 </b>
                                 <b>
                                     <a>11</a>
                                     <b>14</b>
-                                    <v>41484</v>
+                                    <v>41443</v>
                                 </b>
                                 <b>
                                     <a>14</a>
                                     <b>19</b>
-                                    <v>44948</v>
+                                    <v>44903</v>
                                 </b>
                                 <b>
                                     <a>19</a>
                                     <b>53</b>
-                                    <v>42125</v>
+                                    <v>42083</v>
                                 </b>
                                 <b>
                                     <a>53</a>
                                     <b>255</b>
-                                    <v>15310</v>
+                                    <v>15295</v>
                                 </b>
                             </bs>
                         </hist>
@@ -28798,57 +28792,57 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>2822</v>
+                                    <v>2819</v>
                                 </b>
                                 <b>
                                     <a>2</a>
                                     <b>4</b>
-                                    <v>812</v>
+                                    <v>811</v>
                                 </b>
                                 <b>
                                     <a>4</a>
                                     <b>22</b>
-                                    <v>812</v>
+                                    <v>811</v>
                                 </b>
                                 <b>
                                     <a>22</a>
                                     <b>31</b>
-                                    <v>812</v>
+                                    <v>811</v>
                                 </b>
                                 <b>
                                     <a>31</a>
                                     <b>53</b>
-                                    <v>855</v>
+                                    <v>854</v>
                                 </b>
                                 <b>
                                     <a>53</a>
                                     <b>108</b>
-                                    <v>812</v>
+                                    <v>811</v>
                                 </b>
                                 <b>
                                     <a>110</a>
                                     <b>218</b>
-                                    <v>812</v>
+                                    <v>811</v>
                                 </b>
                                 <b>
                                     <a>223</a>
                                     <b>328</b>
-                                    <v>812</v>
+                                    <v>811</v>
                                 </b>
                                 <b>
                                     <a>328</a>
                                     <b>581</b>
-                                    <v>812</v>
+                                    <v>811</v>
                                 </b>
                                 <b>
                                     <a>653</a>
                                     <b>2518</b>
-                                    <v>812</v>
+                                    <v>811</v>
                                 </b>
                                 <b>
                                     <a>2899</a>
-                                    <b>12712</b>
-                                    <v>513</v>
+                                    <b>12735</b>
+                                    <v>512</v>
                                 </b>
                             </bs>
                         </hist>
@@ -28864,61 +28858,61 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>1753</v>
+                                    <v>1751</v>
                                 </b>
                                 <b>
                                     <a>2</a>
                                     <b>3</b>
-                                    <v>1368</v>
+                                    <v>1367</v>
                                 </b>
                                 <b>
                                     <a>3</a>
                                     <b>8</b>
-                                    <v>812</v>
+                                    <v>811</v>
                                 </b>
                                 <b>
                                     <a>8</a>
                                     <b>31</b>
-                                    <v>855</v>
+                                    <v>854</v>
                                 </b>
                                 <b>
                                     <a>31</a>
                                     <b>41</b>
-                                    <v>855</v>
+                                    <v>854</v>
                                 </b>
                                 <b>
                                     <a>41</a>
                                     <b>97</b>
-                                    <v>812</v>
+                                    <v>811</v>
                                 </b>
                                 <b>
                                     <a>97</a>
                                     <b>161</b>
-                                    <v>812</v>
+                                    <v>811</v>
                                 </b>
                                 <b>
                                     <a>164</a>
                                     <b>314</b>
-                                    <v>855</v>
+                                    <v>854</v>
                                 </b>
                                 <b>
                                     <a>318</a>
                                     <b>386</b>
-                                    <v>812</v>
+                                    <v>811</v>
                                 </b>
                                 <b>
                                     <a>435</a>
                                     <b>1127</b>
-                                    <v>812</v>
+                                    <v>811</v>
                                 </b>
                                 <b>
                                     <a>1145</a>
                                     <b>6168</b>
-                                    <v>812</v>
+                                    <v>811</v>
                                 </b>
                                 <b>
                                     <a>6496</a>
-                                    <b>12724</b>
+                                    <b>12747</b>
                                     <v>128</v>
                                 </b>
                             </bs>
@@ -28935,7 +28929,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>4546703</v>
+                                    <v>4543140</v>
                                 </b>
                             </bs>
                         </hist>
@@ -28951,12 +28945,12 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>4459244</v>
+                                    <v>4455767</v>
                                 </b>
                                 <b>
                                     <a>2</a>
                                     <b>13</b>
-                                    <v>87458</v>
+                                    <v>87372</v>
                                 </b>
                             </bs>
                         </hist>
@@ -28966,15 +28960,15 @@
         </relation>
         <relation>
             <name>enclosingfunction</name>
-            <cardinality>144125</cardinality>
+            <cardinality>143982</cardinality>
             <columnsizes>
                 <e>
                     <k>child</k>
-                    <v>144125</v>
+                    <v>143982</v>
                 </e>
                 <e>
                     <k>parent</k>
-                    <v>89554</v>
+                    <v>89465</v>
                 </e>
             </columnsizes>
             <dependencies>
@@ -28988,7 +28982,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>144125</v>
+                                    <v>143982</v>
                                 </b>
                             </bs>
                         </hist>
@@ -29004,22 +28998,22 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>61926</v>
+                                    <v>61865</v>
                                 </b>
                                 <b>
                                     <a>2</a>
                                     <b>3</b>
-                                    <v>5816</v>
+                                    <v>5810</v>
                                 </b>
                                 <b>
                                     <a>3</a>
                                     <b>4</b>
-                                    <v>19287</v>
+                                    <v>19268</v>
                                 </b>
                                 <b>
                                     <a>4</a>
                                     <b>37</b>
-                                    <v>2523</v>
+                                    <v>2520</v>
                                 </b>
                             </bs>
                         </hist>
@@ -29029,15 +29023,15 @@
         </relation>
         <relation>
             <name>derivations</name>
-            <cardinality>597157</cardinality>
+            <cardinality>598061</cardinality>
             <columnsizes>
                 <e>
                     <k>derivation</k>
-                    <v>597157</v>
+                    <v>598061</v>
                 </e>
                 <e>
                     <k>sub</k>
-                    <v>569872</v>
+                    <v>570803</v>
                 </e>
                 <e>
                     <k>index</k>
@@ -29045,11 +29039,11 @@
                 </e>
                 <e>
                     <k>super</k>
-                    <v>294708</v>
+                    <v>295399</v>
                 </e>
                 <e>
                     <k>location</k>
-                    <v>44435</v>
+                    <v>44391</v>
                 </e>
             </columnsizes>
             <dependencies>
@@ -29063,7 +29057,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>597157</v>
+                                    <v>598061</v>
                                 </b>
                             </bs>
                         </hist>
@@ -29079,7 +29073,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>597157</v>
+                                    <v>598061</v>
                                 </b>
                             </bs>
                         </hist>
@@ -29095,7 +29089,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>597157</v>
+                                    <v>598061</v>
                                 </b>
                             </bs>
                         </hist>
@@ -29111,7 +29105,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>597157</v>
+                                    <v>598061</v>
                                 </b>
                             </bs>
                         </hist>
@@ -29127,12 +29121,12 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>549130</v>
+                                    <v>550081</v>
                                 </b>
                                 <b>
                                     <a>2</a>
                                     <b>9</b>
-                                    <v>20742</v>
+                                    <v>20721</v>
                                 </b>
                             </bs>
                         </hist>
@@ -29148,12 +29142,12 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>549130</v>
+                                    <v>550081</v>
                                 </b>
                                 <b>
                                     <a>2</a>
                                     <b>8</b>
-                                    <v>20742</v>
+                                    <v>20721</v>
                                 </b>
                             </bs>
                         </hist>
@@ -29169,12 +29163,12 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>549130</v>
+                                    <v>550081</v>
                                 </b>
                                 <b>
                                     <a>2</a>
                                     <b>9</b>
-                                    <v>20742</v>
+                                    <v>20721</v>
                                 </b>
                             </bs>
                         </hist>
@@ -29190,12 +29184,12 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>549130</v>
+                                    <v>550081</v>
                                 </b>
                                 <b>
                                     <a>2</a>
                                     <b>8</b>
-                                    <v>20742</v>
+                                    <v>20721</v>
                                 </b>
                             </bs>
                         </hist>
@@ -29229,8 +29223,8 @@
                                     <v>42</v>
                                 </b>
                                 <b>
-                                    <a>13325</a>
-                                    <b>13326</b>
+                                    <a>13360</a>
+                                    <b>13361</b>
                                     <v>42</v>
                                 </b>
                             </bs>
@@ -29247,7 +29241,7 @@
                                 <b>
                                     <a>25</a>
                                     <b>26</b>
-                                    <v>171</v>
+                                    <v>170</v>
                                 </b>
                                 <b>
                                     <a>52</a>
@@ -29260,8 +29254,8 @@
                                     <v>42</v>
                                 </b>
                                 <b>
-                                    <a>13325</a>
-                                    <b>13326</b>
+                                    <a>13360</a>
+                                    <b>13361</b>
                                     <v>42</v>
                                 </b>
                             </bs>
@@ -29301,8 +29295,8 @@
                                     <v>42</v>
                                 </b>
                                 <b>
-                                    <a>6487</a>
-                                    <b>6488</b>
+                                    <a>6510</a>
+                                    <b>6511</b>
                                     <v>42</v>
                                 </b>
                             </bs>
@@ -29319,7 +29313,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>171</v>
+                                    <v>170</v>
                                 </b>
                                 <b>
                                     <a>7</a>
@@ -29350,12 +29344,12 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>282648</v>
+                                    <v>283094</v>
                                 </b>
                                 <b>
                                     <a>2</a>
                                     <b>1655</b>
-                                    <v>12060</v>
+                                    <v>12304</v>
                                 </b>
                             </bs>
                         </hist>
@@ -29371,12 +29365,12 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>282648</v>
+                                    <v>283094</v>
                                 </b>
                                 <b>
                                     <a>2</a>
                                     <b>1655</b>
-                                    <v>12060</v>
+                                    <v>12304</v>
                                 </b>
                             </bs>
                         </hist>
@@ -29392,7 +29386,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>294152</v>
+                                    <v>294843</v>
                                 </b>
                                 <b>
                                     <a>2</a>
@@ -29413,12 +29407,12 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>288207</v>
+                                    <v>288691</v>
                                 </b>
                                 <b>
                                     <a>2</a>
                                     <b>81</b>
-                                    <v>6500</v>
+                                    <v>6707</v>
                                 </b>
                             </bs>
                         </hist>
@@ -29434,22 +29428,22 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>33358</v>
+                                    <v>33239</v>
                                 </b>
                                 <b>
                                     <a>2</a>
                                     <b>5</b>
-                                    <v>3977</v>
+                                    <v>3930</v>
                                 </b>
                                 <b>
                                     <a>5</a>
                                     <b>22</b>
-                                    <v>3378</v>
+                                    <v>3460</v>
                                 </b>
                                 <b>
-                                    <a>23</a>
+                                    <a>22</a>
                                     <b>383</b>
-                                    <v>3335</v>
+                                    <v>3375</v>
                                 </b>
                                 <b>
                                     <a>388</a>
@@ -29470,22 +29464,22 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>33358</v>
+                                    <v>33239</v>
                                 </b>
                                 <b>
                                     <a>2</a>
                                     <b>5</b>
-                                    <v>3977</v>
+                                    <v>3930</v>
                                 </b>
                                 <b>
                                     <a>5</a>
                                     <b>22</b>
-                                    <v>3378</v>
+                                    <v>3460</v>
                                 </b>
                                 <b>
-                                    <a>23</a>
+                                    <a>22</a>
                                     <b>383</b>
-                                    <v>3335</v>
+                                    <v>3375</v>
                                 </b>
                                 <b>
                                     <a>388</a>
@@ -29506,7 +29500,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>44435</v>
+                                    <v>44391</v>
                                 </b>
                             </bs>
                         </hist>
@@ -29522,22 +29516,22 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>36138</v>
+                                    <v>36016</v>
                                 </b>
                                 <b>
                                     <a>2</a>
                                     <b>4</b>
-                                    <v>3293</v>
+                                    <v>3289</v>
                                 </b>
                                 <b>
                                     <a>4</a>
                                     <b>26</b>
-                                    <v>3464</v>
+                                    <v>3546</v>
                                 </b>
                                 <b>
                                     <a>26</a>
                                     <b>928</b>
-                                    <v>1539</v>
+                                    <v>1538</v>
                                 </b>
                             </bs>
                         </hist>
@@ -29547,15 +29541,15 @@
         </relation>
         <relation>
             <name>derspecifiers</name>
-            <cardinality>599381</cardinality>
+            <cardinality>600283</cardinality>
             <columnsizes>
                 <e>
                     <k>der_id</k>
-                    <v>596601</v>
+                    <v>597506</v>
                 </e>
                 <e>
                     <k>spec_id</k>
-                    <v>171</v>
+                    <v>170</v>
                 </e>
             </columnsizes>
             <dependencies>
@@ -29569,12 +29563,12 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>593821</v>
+                                    <v>594729</v>
                                 </b>
                                 <b>
                                     <a>2</a>
                                     <b>3</b>
-                                    <v>2779</v>
+                                    <v>2777</v>
                                 </b>
                             </bs>
                         </hist>
@@ -29603,8 +29597,8 @@
                                     <v>42</v>
                                 </b>
                                 <b>
-                                    <a>12754</a>
-                                    <b>12755</b>
+                                    <a>12789</a>
+                                    <b>12790</b>
                                     <v>42</v>
                                 </b>
                             </bs>
@@ -29615,15 +29609,15 @@
         </relation>
         <relation>
             <name>direct_base_offsets</name>
-            <cardinality>563371</cardinality>
+            <cardinality>564308</cardinality>
             <columnsizes>
                 <e>
                     <k>der_id</k>
-                    <v>563371</v>
+                    <v>564308</v>
                 </e>
                 <e>
                     <k>offset</k>
-                    <v>641</v>
+                    <v>640</v>
                 </e>
             </columnsizes>
             <dependencies>
@@ -29637,7 +29631,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>563371</v>
+                                    <v>564308</v>
                                 </b>
                             </bs>
                         </hist>
@@ -29658,7 +29652,7 @@
                                 <b>
                                     <a>2</a>
                                     <b>3</b>
-                                    <v>171</v>
+                                    <v>170</v>
                                 </b>
                                 <b>
                                     <a>3</a>
@@ -29686,8 +29680,8 @@
                                     <v>42</v>
                                 </b>
                                 <b>
-                                    <a>13023</a>
-                                    <b>13024</b>
+                                    <a>13058</a>
+                                    <b>13059</b>
                                     <v>42</v>
                                 </b>
                             </bs>
@@ -29698,11 +29692,11 @@
         </relation>
         <relation>
             <name>virtual_base_offsets</name>
-            <cardinality>7313</cardinality>
+            <cardinality>7305</cardinality>
             <columnsizes>
                 <e>
                     <k>sub</k>
-                    <v>7313</v>
+                    <v>7305</v>
                 </e>
                 <e>
                     <k>super</k>
@@ -29724,7 +29718,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>7313</v>
+                                    <v>7305</v>
                                 </b>
                             </bs>
                         </hist>
@@ -29740,7 +29734,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>7313</v>
+                                    <v>7305</v>
                                 </b>
                             </bs>
                         </hist>
@@ -29834,23 +29828,23 @@
         </relation>
         <relation>
             <name>frienddecls</name>
-            <cardinality>879292</cardinality>
+            <cardinality>881070</cardinality>
             <columnsizes>
                 <e>
                     <k>id</k>
-                    <v>879292</v>
+                    <v>881070</v>
                 </e>
                 <e>
                     <k>type_id</k>
-                    <v>53245</v>
+                    <v>53192</v>
                 </e>
                 <e>
                     <k>decl_id</k>
-                    <v>97594</v>
+                    <v>97497</v>
                 </e>
                 <e>
                     <k>location</k>
-                    <v>7655</v>
+                    <v>7647</v>
                 </e>
             </columnsizes>
             <dependencies>
@@ -29864,7 +29858,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>879292</v>
+                                    <v>881070</v>
                                 </b>
                             </bs>
                         </hist>
@@ -29880,7 +29874,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>879292</v>
+                                    <v>881070</v>
                                 </b>
                             </bs>
                         </hist>
@@ -29896,7 +29890,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>879292</v>
+                                    <v>881070</v>
                                 </b>
                             </bs>
                         </hist>
@@ -29912,47 +29906,47 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>7740</v>
+                                    <v>7733</v>
                                 </b>
                                 <b>
                                     <a>2</a>
                                     <b>3</b>
-                                    <v>17534</v>
+                                    <v>17517</v>
                                 </b>
                                 <b>
                                     <a>3</a>
                                     <b>7</b>
-                                    <v>4490</v>
+                                    <v>4229</v>
                                 </b>
                                 <b>
                                     <a>7</a>
-                                    <b>12</b>
-                                    <v>4319</v>
+                                    <b>11</b>
+                                    <v>4187</v>
                                 </b>
                                 <b>
-                                    <a>12</a>
+                                    <a>11</a>
                                     <b>20</b>
-                                    <v>4576</v>
+                                    <v>4571</v>
                                 </b>
                                 <b>
                                     <a>20</a>
-                                    <b>32</b>
-                                    <v>4148</v>
+                                    <b>31</b>
+                                    <v>4016</v>
                                 </b>
                                 <b>
-                                    <a>33</a>
-                                    <b>50</b>
-                                    <v>4747</v>
+                                    <a>31</a>
+                                    <b>43</b>
+                                    <v>4144</v>
                                 </b>
                                 <b>
-                                    <a>50</a>
-                                    <b>80</b>
-                                    <v>4747</v>
+                                    <a>43</a>
+                                    <b>78</b>
+                                    <v>3887</v>
                                 </b>
                                 <b>
-                                    <a>101</a>
+                                    <a>79</a>
                                     <b>120</b>
-                                    <v>940</v>
+                                    <v>2905</v>
                                 </b>
                             </bs>
                         </hist>
@@ -29968,47 +29962,47 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>7740</v>
+                                    <v>7733</v>
                                 </b>
                                 <b>
                                     <a>2</a>
                                     <b>3</b>
-                                    <v>17534</v>
+                                    <v>17517</v>
                                 </b>
                                 <b>
                                     <a>3</a>
                                     <b>7</b>
-                                    <v>4490</v>
+                                    <v>4229</v>
                                 </b>
                                 <b>
                                     <a>7</a>
-                                    <b>12</b>
-                                    <v>4319</v>
+                                    <b>11</b>
+                                    <v>4187</v>
                                 </b>
                                 <b>
-                                    <a>12</a>
+                                    <a>11</a>
                                     <b>20</b>
-                                    <v>4576</v>
+                                    <v>4571</v>
                                 </b>
                                 <b>
                                     <a>20</a>
-                                    <b>32</b>
-                                    <v>4148</v>
+                                    <b>31</b>
+                                    <v>4016</v>
                                 </b>
                                 <b>
-                                    <a>33</a>
-                                    <b>50</b>
-                                    <v>4747</v>
+                                    <a>31</a>
+                                    <b>43</b>
+                                    <v>4144</v>
                                 </b>
                                 <b>
-                                    <a>50</a>
-                                    <b>80</b>
-                                    <v>4747</v>
+                                    <a>43</a>
+                                    <b>78</b>
+                                    <v>3887</v>
                                 </b>
                                 <b>
-                                    <a>101</a>
+                                    <a>79</a>
                                     <b>120</b>
-                                    <v>940</v>
+                                    <v>2905</v>
                                 </b>
                             </bs>
                         </hist>
@@ -30024,12 +30018,12 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>51534</v>
+                                    <v>51483</v>
                                 </b>
                                 <b>
                                     <a>2</a>
                                     <b>13</b>
-                                    <v>1710</v>
+                                    <v>1708</v>
                                 </b>
                             </bs>
                         </hist>
@@ -30045,32 +30039,32 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>60087</v>
+                                    <v>59900</v>
                                 </b>
                                 <b>
                                     <a>2</a>
                                     <b>3</b>
-                                    <v>7612</v>
+                                    <v>7733</v>
                                 </b>
                                 <b>
                                     <a>3</a>
                                     <b>8</b>
-                                    <v>7527</v>
+                                    <v>7775</v>
                                 </b>
                                 <b>
                                     <a>8</a>
-                                    <b>15</b>
-                                    <v>7612</v>
+                                    <b>16</b>
+                                    <v>7476</v>
                                 </b>
                                 <b>
-                                    <a>15</a>
+                                    <a>16</a>
                                     <b>40</b>
-                                    <v>7612</v>
+                                    <v>7391</v>
                                 </b>
                                 <b>
                                     <a>40</a>
                                     <b>164</b>
-                                    <v>7142</v>
+                                    <v>7220</v>
                                 </b>
                             </bs>
                         </hist>
@@ -30086,32 +30080,32 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>60087</v>
+                                    <v>59900</v>
                                 </b>
                                 <b>
                                     <a>2</a>
                                     <b>3</b>
-                                    <v>7612</v>
+                                    <v>7733</v>
                                 </b>
                                 <b>
                                     <a>3</a>
                                     <b>8</b>
-                                    <v>7527</v>
+                                    <v>7775</v>
                                 </b>
                                 <b>
                                     <a>8</a>
-                                    <b>15</b>
-                                    <v>7612</v>
+                                    <b>16</b>
+                                    <v>7476</v>
                                 </b>
                                 <b>
-                                    <a>15</a>
+                                    <a>16</a>
                                     <b>40</b>
-                                    <v>7612</v>
+                                    <v>7391</v>
                                 </b>
                                 <b>
                                     <a>40</a>
                                     <b>164</b>
-                                    <v>7142</v>
+                                    <v>7220</v>
                                 </b>
                             </bs>
                         </hist>
@@ -30127,12 +30121,12 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>96739</v>
+                                    <v>96643</v>
                                 </b>
                                 <b>
                                     <a>2</a>
                                     <b>5</b>
-                                    <v>855</v>
+                                    <v>854</v>
                                 </b>
                             </bs>
                         </hist>
@@ -30148,12 +30142,12 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>7184</v>
+                                    <v>7177</v>
                                 </b>
                                 <b>
                                     <a>2</a>
-                                    <b>20371</b>
-                                    <v>470</v>
+                                    <b>20433</b>
+                                    <v>469</v>
                                 </b>
                             </bs>
                         </hist>
@@ -30169,12 +30163,12 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>7484</v>
+                                    <v>7476</v>
                                 </b>
                                 <b>
                                     <a>2</a>
                                     <b>1148</b>
-                                    <v>171</v>
+                                    <v>170</v>
                                 </b>
                             </bs>
                         </hist>
@@ -30190,7 +30184,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>7227</v>
+                                    <v>7220</v>
                                 </b>
                                 <b>
                                     <a>2</a>
@@ -30205,19 +30199,19 @@
         </relation>
         <relation>
             <name>comments</name>
-            <cardinality>11233849</cardinality>
+            <cardinality>11190891</cardinality>
             <columnsizes>
                 <e>
                     <k>id</k>
-                    <v>11233849</v>
+                    <v>11190891</v>
                 </e>
                 <e>
                     <k>contents</k>
-                    <v>4296351</v>
+                    <v>4279921</v>
                 </e>
                 <e>
                     <k>location</k>
-                    <v>11233849</v>
+                    <v>11190891</v>
                 </e>
             </columnsizes>
             <dependencies>
@@ -30231,7 +30225,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>11233849</v>
+                                    <v>11190891</v>
                                 </b>
                             </bs>
                         </hist>
@@ -30247,7 +30241,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>11233849</v>
+                                    <v>11190891</v>
                                 </b>
                             </bs>
                         </hist>
@@ -30263,17 +30257,17 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>3921885</v>
+                                    <v>3906888</v>
                                 </b>
                                 <b>
                                     <a>2</a>
                                     <b>6</b>
-                                    <v>322310</v>
+                                    <v>321078</v>
                                 </b>
                                 <b>
                                     <a>6</a>
                                     <b>34359</b>
-                                    <v>52155</v>
+                                    <v>51955</v>
                                 </b>
                             </bs>
                         </hist>
@@ -30289,17 +30283,17 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>3921885</v>
+                                    <v>3906888</v>
                                 </b>
                                 <b>
                                     <a>2</a>
                                     <b>6</b>
-                                    <v>322310</v>
+                                    <v>321078</v>
                                 </b>
                                 <b>
                                     <a>6</a>
                                     <b>34359</b>
-                                    <v>52155</v>
+                                    <v>51955</v>
                                 </b>
                             </bs>
                         </hist>
@@ -30315,7 +30309,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>11233849</v>
+                                    <v>11190891</v>
                                 </b>
                             </bs>
                         </hist>
@@ -30331,7 +30325,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>11233849</v>
+                                    <v>11190891</v>
                                 </b>
                             </bs>
                         </hist>
@@ -30341,15 +30335,15 @@
         </relation>
         <relation>
             <name>commentbinding</name>
-            <cardinality>3842839</cardinality>
+            <cardinality>3828144</cardinality>
             <columnsizes>
                 <e>
                     <k>id</k>
-                    <v>3355433</v>
+                    <v>3342602</v>
                 </e>
                 <e>
                     <k>element</k>
-                    <v>3676619</v>
+                    <v>3662559</v>
                 </e>
             </columnsizes>
             <dependencies>
@@ -30363,12 +30357,12 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>3299151</v>
+                                    <v>3286535</v>
                                 </b>
                                 <b>
                                     <a>2</a>
                                     <b>1706</b>
-                                    <v>56282</v>
+                                    <v>56067</v>
                                 </b>
                             </bs>
                         </hist>
@@ -30384,12 +30378,12 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>3510398</v>
+                                    <v>3496974</v>
                                 </b>
                                 <b>
                                     <a>2</a>
                                     <b>3</b>
-                                    <v>166220</v>
+                                    <v>165585</v>
                                 </b>
                             </bs>
                         </hist>
@@ -30399,15 +30393,15 @@
         </relation>
         <relation>
             <name>exprconv</name>
-            <cardinality>9606161</cardinality>
+            <cardinality>9607944</cardinality>
             <columnsizes>
                 <e>
                     <k>converted</k>
-                    <v>9606056</v>
+                    <v>9607839</v>
                 </e>
                 <e>
                     <k>conversion</k>
-                    <v>9606161</v>
+                    <v>9607944</v>
                 </e>
             </columnsizes>
             <dependencies>
@@ -30421,7 +30415,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>9605951</v>
+                                    <v>9607734</v>
                                 </b>
                                 <b>
                                     <a>2</a>
@@ -30442,7 +30436,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>9606161</v>
+                                    <v>9607944</v>
                                 </b>
                             </bs>
                         </hist>
@@ -30452,22 +30446,22 @@
         </relation>
         <relation>
             <name>compgenerated</name>
-            <cardinality>10707572</cardinality>
+            <cardinality>10701576</cardinality>
             <columnsizes>
                 <e>
                     <k>id</k>
-                    <v>10707572</v>
+                    <v>10701576</v>
                 </e>
             </columnsizes>
             <dependencies/>
         </relation>
         <relation>
             <name>synthetic_destructor_call</name>
-            <cardinality>1789036</cardinality>
+            <cardinality>1788902</cardinality>
             <columnsizes>
                 <e>
                     <k>element</k>
-                    <v>1332347</v>
+                    <v>1332248</v>
                 </e>
                 <e>
                     <k>i</k>
@@ -30475,7 +30469,7 @@
                 </e>
                 <e>
                     <k>destructor_call</k>
-                    <v>1789036</v>
+                    <v>1788902</v>
                 </e>
             </columnsizes>
             <dependencies>
@@ -30489,17 +30483,17 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>886850</v>
+                                    <v>886784</v>
                                 </b>
                                 <b>
                                     <a>2</a>
                                     <b>3</b>
-                                    <v>438221</v>
+                                    <v>438188</v>
                                 </b>
                                 <b>
                                     <a>3</a>
                                     <b>19</b>
-                                    <v>7276</v>
+                                    <v>7275</v>
                                 </b>
                             </bs>
                         </hist>
@@ -30515,17 +30509,17 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>886850</v>
+                                    <v>886784</v>
                                 </b>
                                 <b>
                                     <a>2</a>
                                     <b>3</b>
-                                    <v>438221</v>
+                                    <v>438188</v>
                                 </b>
                                 <b>
                                     <a>3</a>
                                     <b>19</b>
-                                    <v>7276</v>
+                                    <v>7275</v>
                                 </b>
                             </bs>
                         </hist>
@@ -30673,7 +30667,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>1789036</v>
+                                    <v>1788902</v>
                                 </b>
                             </bs>
                         </hist>
@@ -30689,7 +30683,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>1789036</v>
+                                    <v>1788902</v>
                                 </b>
                             </bs>
                         </hist>
@@ -30699,15 +30693,15 @@
         </relation>
         <relation>
             <name>namespaces</name>
-            <cardinality>11044</cardinality>
+            <cardinality>10800</cardinality>
             <columnsizes>
                 <e>
                     <k>id</k>
-                    <v>11044</v>
+                    <v>10800</v>
                 </e>
                 <e>
                     <k>name</k>
-                    <v>5839</v>
+                    <v>5710</v>
                 </e>
             </columnsizes>
             <dependencies>
@@ -30721,7 +30715,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>11044</v>
+                                    <v>10800</v>
                                 </b>
                             </bs>
                         </hist>
@@ -30737,17 +30731,17 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>4773</v>
+                                    <v>4668</v>
                                 </b>
                                 <b>
                                     <a>2</a>
                                     <b>3</b>
-                                    <v>674</v>
+                                    <v>659</v>
                                 </b>
                                 <b>
                                     <a>3</a>
                                     <b>149</b>
-                                    <v>391</v>
+                                    <v>382</v>
                                 </b>
                             </bs>
                         </hist>
@@ -30757,26 +30751,26 @@
         </relation>
         <relation>
             <name>namespace_inline</name>
-            <cardinality>500</cardinality>
+            <cardinality>498</cardinality>
             <columnsizes>
                 <e>
                     <k>id</k>
-                    <v>500</v>
+                    <v>498</v>
                 </e>
             </columnsizes>
             <dependencies/>
         </relation>
         <relation>
             <name>namespacembrs</name>
-            <cardinality>2018038</cardinality>
+            <cardinality>2036610</cardinality>
             <columnsizes>
                 <e>
                     <k>parentid</k>
-                    <v>4002</v>
+                    <v>3987</v>
                 </e>
                 <e>
                     <k>memberid</k>
-                    <v>2018038</v>
+                    <v>2036610</v>
                 </e>
             </columnsizes>
             <dependencies>
@@ -30790,67 +30784,67 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>500</v>
+                                    <v>498</v>
                                 </b>
                                 <b>
                                     <a>2</a>
                                     <b>3</b>
-                                    <v>250</v>
+                                    <v>249</v>
                                 </b>
                                 <b>
                                     <a>3</a>
                                     <b>4</b>
-                                    <v>500</v>
+                                    <v>498</v>
                                 </b>
                                 <b>
                                     <a>4</a>
                                     <b>5</b>
-                                    <v>625</v>
+                                    <v>622</v>
                                 </b>
                                 <b>
                                     <a>5</a>
                                     <b>10</b>
-                                    <v>250</v>
+                                    <v>249</v>
                                 </b>
                                 <b>
                                     <a>10</a>
                                     <b>12</b>
-                                    <v>250</v>
+                                    <v>249</v>
                                 </b>
                                 <b>
                                     <a>12</a>
                                     <b>18</b>
-                                    <v>250</v>
+                                    <v>249</v>
                                 </b>
                                 <b>
                                     <a>19</a>
                                     <b>21</b>
-                                    <v>250</v>
+                                    <v>249</v>
                                 </b>
                                 <b>
                                     <a>23</a>
                                     <b>24</b>
-                                    <v>250</v>
+                                    <v>249</v>
                                 </b>
                                 <b>
                                     <a>25</a>
                                     <b>29</b>
-                                    <v>250</v>
+                                    <v>249</v>
                                 </b>
                                 <b>
                                     <a>70</a>
                                     <b>83</b>
-                                    <v>250</v>
+                                    <v>249</v>
                                 </b>
                                 <b>
                                     <a>165</a>
                                     <b>170</b>
-                                    <v>250</v>
+                                    <v>249</v>
                                 </b>
                                 <b>
-                                    <a>15407</a>
-                                    <b>15408</b>
-                                    <v>125</v>
+                                    <a>15618</a>
+                                    <b>15619</b>
+                                    <v>124</v>
                                 </b>
                             </bs>
                         </hist>
@@ -30866,7 +30860,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>2018038</v>
+                                    <v>2036610</v>
                                 </b>
                             </bs>
                         </hist>
@@ -30876,19 +30870,19 @@
         </relation>
         <relation>
             <name>exprparents</name>
-            <cardinality>19398686</cardinality>
+            <cardinality>19402287</cardinality>
             <columnsizes>
                 <e>
                     <k>expr_id</k>
-                    <v>19398686</v>
+                    <v>19402287</v>
                 </e>
                 <e>
                     <k>child_index</k>
-                    <v>19977</v>
+                    <v>19981</v>
                 </e>
                 <e>
                     <k>parent_id</k>
-                    <v>12903052</v>
+                    <v>12905447</v>
                 </e>
             </columnsizes>
             <dependencies>
@@ -30902,7 +30896,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>19398686</v>
+                                    <v>19402287</v>
                                 </b>
                             </bs>
                         </hist>
@@ -30918,7 +30912,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>19398686</v>
+                                    <v>19402287</v>
                                 </b>
                             </bs>
                         </hist>
@@ -30949,7 +30943,7 @@
                                 <b>
                                     <a>4</a>
                                     <b>5</b>
-                                    <v>8950</v>
+                                    <v>8952</v>
                                 </b>
                                 <b>
                                     <a>5</a>
@@ -31000,7 +30994,7 @@
                                 <b>
                                     <a>4</a>
                                     <b>5</b>
-                                    <v>8950</v>
+                                    <v>8952</v>
                                 </b>
                                 <b>
                                     <a>5</a>
@@ -31036,17 +31030,17 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>7373649</v>
+                                    <v>7375018</v>
                                 </b>
                                 <b>
                                     <a>2</a>
                                     <b>3</b>
-                                    <v>5068172</v>
+                                    <v>5069113</v>
                                 </b>
                                 <b>
                                     <a>3</a>
                                     <b>712</b>
-                                    <v>461230</v>
+                                    <v>461315</v>
                                 </b>
                             </bs>
                         </hist>
@@ -31062,17 +31056,17 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>7373649</v>
+                                    <v>7375018</v>
                                 </b>
                                 <b>
                                     <a>2</a>
                                     <b>3</b>
-                                    <v>5068172</v>
+                                    <v>5069113</v>
                                 </b>
                                 <b>
                                     <a>3</a>
                                     <b>712</b>
-                                    <v>461230</v>
+                                    <v>461315</v>
                                 </b>
                             </bs>
                         </hist>
@@ -31082,22 +31076,22 @@
         </relation>
         <relation>
             <name>expr_isload</name>
-            <cardinality>6822557</cardinality>
+            <cardinality>6834842</cardinality>
             <columnsizes>
                 <e>
                     <k>expr_id</k>
-                    <v>6822557</v>
+                    <v>6834842</v>
                 </e>
             </columnsizes>
             <dependencies/>
         </relation>
         <relation>
             <name>conversionkinds</name>
-            <cardinality>6049042</cardinality>
+            <cardinality>6050434</cardinality>
             <columnsizes>
                 <e>
                     <k>expr_id</k>
-                    <v>6049042</v>
+                    <v>6050434</v>
                 </e>
                 <e>
                     <k>kind</k>
@@ -31115,7 +31109,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>6049042</v>
+                                    <v>6050434</v>
                                 </b>
                             </bs>
                         </hist>
@@ -31154,13 +31148,13 @@
                                     <v>1</v>
                                 </b>
                                 <b>
-                                    <a>93175</a>
-                                    <b>93176</b>
+                                    <a>93247</a>
+                                    <b>93248</b>
                                     <v>1</v>
                                 </b>
                                 <b>
-                                    <a>5830215</a>
-                                    <b>5830216</b>
+                                    <a>5831535</a>
+                                    <b>5831536</b>
                                     <v>1</v>
                                 </b>
                             </bs>
@@ -31171,11 +31165,11 @@
         </relation>
         <relation>
             <name>iscall</name>
-            <cardinality>6210093</cardinality>
+            <cardinality>6209630</cardinality>
             <columnsizes>
                 <e>
                     <k>caller</k>
-                    <v>6210093</v>
+                    <v>6209630</v>
                 </e>
                 <e>
                     <k>kind</k>
@@ -31193,7 +31187,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>6210093</v>
+                                    <v>6209630</v>
                                 </b>
                             </bs>
                         </hist>
@@ -31229,11 +31223,11 @@
         </relation>
         <relation>
             <name>numtemplatearguments</name>
-            <cardinality>720113</cardinality>
+            <cardinality>719399</cardinality>
             <columnsizes>
                 <e>
                     <k>expr_id</k>
-                    <v>720113</v>
+                    <v>719399</v>
                 </e>
                 <e>
                     <k>num</k>
@@ -31251,7 +31245,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>720113</v>
+                                    <v>719399</v>
                                 </b>
                             </bs>
                         </hist>
@@ -31312,15 +31306,15 @@
         </relation>
         <relation>
             <name>specialnamequalifyingelements</name>
-            <cardinality>125</cardinality>
+            <cardinality>124</cardinality>
             <columnsizes>
                 <e>
                     <k>id</k>
-                    <v>125</v>
+                    <v>124</v>
                 </e>
                 <e>
                     <k>name</k>
-                    <v>125</v>
+                    <v>124</v>
                 </e>
             </columnsizes>
             <dependencies>
@@ -31334,7 +31328,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>125</v>
+                                    <v>124</v>
                                 </b>
                             </bs>
                         </hist>
@@ -31350,7 +31344,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>125</v>
+                                    <v>124</v>
                                 </b>
                             </bs>
                         </hist>
@@ -31360,23 +31354,23 @@
         </relation>
         <relation>
             <name>namequalifiers</name>
-            <cardinality>3254040</cardinality>
+            <cardinality>3255225</cardinality>
             <columnsizes>
                 <e>
                     <k>id</k>
-                    <v>3254040</v>
+                    <v>3255225</v>
                 </e>
                 <e>
                     <k>qualifiableelement</k>
-                    <v>3254040</v>
+                    <v>3255225</v>
                 </e>
                 <e>
                     <k>qualifyingelement</k>
-                    <v>50221</v>
+                    <v>50816</v>
                 </e>
                 <e>
                     <k>location</k>
-                    <v>590842</v>
+                    <v>591189</v>
                 </e>
             </columnsizes>
             <dependencies>
@@ -31390,7 +31384,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>3254040</v>
+                                    <v>3255225</v>
                                 </b>
                             </bs>
                         </hist>
@@ -31406,7 +31400,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>3254040</v>
+                                    <v>3255225</v>
                                 </b>
                             </bs>
                         </hist>
@@ -31422,7 +31416,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>3254040</v>
+                                    <v>3255225</v>
                                 </b>
                             </bs>
                         </hist>
@@ -31438,7 +31432,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>3254040</v>
+                                    <v>3255225</v>
                                 </b>
                             </bs>
                         </hist>
@@ -31454,7 +31448,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>3254040</v>
+                                    <v>3255225</v>
                                 </b>
                             </bs>
                         </hist>
@@ -31470,7 +31464,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>3254040</v>
+                                    <v>3255225</v>
                                 </b>
                             </bs>
                         </hist>
@@ -31486,27 +31480,27 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>33757</v>
+                                    <v>33754</v>
                                 </b>
                                 <b>
                                     <a>2</a>
                                     <b>3</b>
-                                    <v>8220</v>
+                                    <v>8749</v>
                                 </b>
                                 <b>
                                     <a>3</a>
                                     <b>5</b>
-                                    <v>4352</v>
+                                    <v>4397</v>
                                 </b>
                                 <b>
                                     <a>5</a>
-                                    <b>1601</b>
-                                    <v>3776</v>
+                                    <b>6810</b>
+                                    <v>3822</v>
                                 </b>
                                 <b>
-                                    <a>6806</a>
+                                    <a>19018</a>
                                     <b>41956</b>
-                                    <v>115</v>
+                                    <v>92</v>
                                 </b>
                             </bs>
                         </hist>
@@ -31522,27 +31516,27 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>33757</v>
+                                    <v>33754</v>
                                 </b>
                                 <b>
                                     <a>2</a>
                                     <b>3</b>
-                                    <v>8220</v>
+                                    <v>8749</v>
                                 </b>
                                 <b>
                                     <a>3</a>
                                     <b>5</b>
-                                    <v>4352</v>
+                                    <v>4397</v>
                                 </b>
                                 <b>
                                     <a>5</a>
-                                    <b>1601</b>
-                                    <v>3776</v>
+                                    <b>6810</b>
+                                    <v>3822</v>
                                 </b>
                                 <b>
-                                    <a>6806</a>
+                                    <a>19018</a>
                                     <b>41956</b>
-                                    <v>115</v>
+                                    <v>92</v>
                                 </b>
                             </bs>
                         </hist>
@@ -31558,17 +31552,17 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>36474</v>
+                                    <v>36816</v>
                                 </b>
                                 <b>
                                     <a>2</a>
                                     <b>3</b>
-                                    <v>7644</v>
+                                    <v>7874</v>
                                 </b>
                                 <b>
                                     <a>3</a>
                                     <b>6</b>
-                                    <v>3799</v>
+                                    <v>3822</v>
                                 </b>
                                 <b>
                                     <a>6</a>
@@ -31589,22 +31583,22 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>84761</v>
+                                    <v>84708</v>
                                 </b>
                                 <b>
                                     <a>2</a>
                                     <b>6</b>
-                                    <v>40365</v>
+                                    <v>40754</v>
                                 </b>
                                 <b>
                                     <a>6</a>
                                     <b>7</b>
-                                    <v>427076</v>
+                                    <v>426975</v>
                                 </b>
                                 <b>
                                     <a>7</a>
                                     <b>192</b>
-                                    <v>38638</v>
+                                    <v>38751</v>
                                 </b>
                             </bs>
                         </hist>
@@ -31620,22 +31614,22 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>84761</v>
+                                    <v>84708</v>
                                 </b>
                                 <b>
                                     <a>2</a>
                                     <b>6</b>
-                                    <v>40365</v>
+                                    <v>40754</v>
                                 </b>
                                 <b>
                                     <a>6</a>
                                     <b>7</b>
-                                    <v>427076</v>
+                                    <v>426975</v>
                                 </b>
                                 <b>
                                     <a>7</a>
                                     <b>192</b>
-                                    <v>38638</v>
+                                    <v>38751</v>
                                 </b>
                             </bs>
                         </hist>
@@ -31651,22 +31645,22 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>119071</v>
+                                    <v>119361</v>
                                 </b>
                                 <b>
                                     <a>2</a>
                                     <b>4</b>
-                                    <v>14184</v>
+                                    <v>14229</v>
                                 </b>
                                 <b>
                                     <a>4</a>
                                     <b>5</b>
-                                    <v>444530</v>
+                                    <v>444428</v>
                                 </b>
                                 <b>
                                     <a>5</a>
                                     <b>33</b>
-                                    <v>13056</v>
+                                    <v>13170</v>
                                 </b>
                             </bs>
                         </hist>
@@ -31676,15 +31670,15 @@
         </relation>
         <relation>
             <name>varbind</name>
-            <cardinality>8231069</cardinality>
+            <cardinality>8232597</cardinality>
             <columnsizes>
                 <e>
                     <k>expr</k>
-                    <v>8231069</v>
+                    <v>8232597</v>
                 </e>
                 <e>
                     <k>var</k>
-                    <v>1047377</v>
+                    <v>1047572</v>
                 </e>
             </columnsizes>
             <dependencies>
@@ -31698,7 +31692,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>8231069</v>
+                                    <v>8232597</v>
                                 </b>
                             </bs>
                         </hist>
@@ -31714,52 +31708,52 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>171046</v>
+                                    <v>171078</v>
                                 </b>
                                 <b>
                                     <a>2</a>
                                     <b>3</b>
-                                    <v>188162</v>
+                                    <v>188197</v>
                                 </b>
                                 <b>
                                     <a>3</a>
                                     <b>4</b>
-                                    <v>145232</v>
+                                    <v>145259</v>
                                 </b>
                                 <b>
                                     <a>4</a>
                                     <b>5</b>
-                                    <v>116303</v>
+                                    <v>116325</v>
                                 </b>
                                 <b>
                                     <a>5</a>
                                     <b>6</b>
-                                    <v>82913</v>
+                                    <v>82929</v>
                                 </b>
                                 <b>
                                     <a>6</a>
                                     <b>7</b>
-                                    <v>65629</v>
+                                    <v>65641</v>
                                 </b>
                                 <b>
                                     <a>7</a>
                                     <b>9</b>
-                                    <v>80584</v>
+                                    <v>80599</v>
                                 </b>
                                 <b>
                                     <a>9</a>
                                     <b>13</b>
-                                    <v>81342</v>
+                                    <v>81357</v>
                                 </b>
                                 <b>
                                     <a>13</a>
                                     <b>27</b>
-                                    <v>78901</v>
+                                    <v>78915</v>
                                 </b>
                                 <b>
                                     <a>27</a>
                                     <b>5137</b>
-                                    <v>37262</v>
+                                    <v>37268</v>
                                 </b>
                             </bs>
                         </hist>
@@ -31769,15 +31763,15 @@
         </relation>
         <relation>
             <name>funbind</name>
-            <cardinality>6220501</cardinality>
+            <cardinality>6220037</cardinality>
             <columnsizes>
                 <e>
                     <k>expr</k>
-                    <v>6217853</v>
+                    <v>6217389</v>
                 </e>
                 <e>
                     <k>fun</k>
-                    <v>295317</v>
+                    <v>295295</v>
                 </e>
             </columnsizes>
             <dependencies>
@@ -31791,12 +31785,12 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>6215204</v>
+                                    <v>6214741</v>
                                 </b>
                                 <b>
                                     <a>2</a>
                                     <b>3</b>
-                                    <v>2648</v>
+                                    <v>2647</v>
                                 </b>
                             </bs>
                         </hist>
@@ -31812,27 +31806,27 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>194184</v>
+                                    <v>194169</v>
                                 </b>
                                 <b>
                                     <a>2</a>
                                     <b>3</b>
-                                    <v>41563</v>
+                                    <v>41560</v>
                                 </b>
                                 <b>
                                     <a>3</a>
                                     <b>4</b>
-                                    <v>18398</v>
+                                    <v>18396</v>
                                 </b>
                                 <b>
                                     <a>4</a>
                                     <b>8</b>
-                                    <v>24339</v>
+                                    <v>24337</v>
                                 </b>
                                 <b>
                                     <a>8</a>
                                     <b>37798</b>
-                                    <v>16832</v>
+                                    <v>16831</v>
                                 </b>
                             </bs>
                         </hist>
@@ -31842,11 +31836,11 @@
         </relation>
         <relation>
             <name>expr_allocator</name>
-            <cardinality>56794</cardinality>
+            <cardinality>56738</cardinality>
             <columnsizes>
                 <e>
                     <k>expr</k>
-                    <v>56794</v>
+                    <v>56738</v>
                 </e>
                 <e>
                     <k>func</k>
@@ -31868,7 +31862,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>56794</v>
+                                    <v>56738</v>
                                 </b>
                             </bs>
                         </hist>
@@ -31884,7 +31878,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>56794</v>
+                                    <v>56738</v>
                                 </b>
                             </bs>
                         </hist>
@@ -31968,11 +31962,11 @@
         </relation>
         <relation>
             <name>expr_deallocator</name>
-            <cardinality>67572</cardinality>
+            <cardinality>67505</cardinality>
             <columnsizes>
                 <e>
                     <k>expr</k>
-                    <v>67572</v>
+                    <v>67505</v>
                 </e>
                 <e>
                     <k>func</k>
@@ -31994,7 +31988,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>67572</v>
+                                    <v>67505</v>
                                 </b>
                             </bs>
                         </hist>
@@ -32010,7 +32004,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>67572</v>
+                                    <v>67505</v>
                                 </b>
                             </bs>
                         </hist>
@@ -32115,15 +32109,15 @@
         </relation>
         <relation>
             <name>expr_cond_guard</name>
-            <cardinality>895370</cardinality>
+            <cardinality>895536</cardinality>
             <columnsizes>
                 <e>
                     <k>cond</k>
-                    <v>895370</v>
+                    <v>895536</v>
                 </e>
                 <e>
                     <k>guard</k>
-                    <v>895370</v>
+                    <v>895536</v>
                 </e>
             </columnsizes>
             <dependencies>
@@ -32137,7 +32131,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>895370</v>
+                                    <v>895536</v>
                                 </b>
                             </bs>
                         </hist>
@@ -32153,7 +32147,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>895370</v>
+                                    <v>895536</v>
                                 </b>
                             </bs>
                         </hist>
@@ -32163,15 +32157,15 @@
         </relation>
         <relation>
             <name>expr_cond_true</name>
-            <cardinality>895366</cardinality>
+            <cardinality>895532</cardinality>
             <columnsizes>
                 <e>
                     <k>cond</k>
-                    <v>895366</v>
+                    <v>895532</v>
                 </e>
                 <e>
                     <k>true</k>
-                    <v>895366</v>
+                    <v>895532</v>
                 </e>
             </columnsizes>
             <dependencies>
@@ -32185,7 +32179,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>895366</v>
+                                    <v>895532</v>
                                 </b>
                             </bs>
                         </hist>
@@ -32201,7 +32195,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>895366</v>
+                                    <v>895532</v>
                                 </b>
                             </bs>
                         </hist>
@@ -32211,15 +32205,15 @@
         </relation>
         <relation>
             <name>expr_cond_false</name>
-            <cardinality>895370</cardinality>
+            <cardinality>895536</cardinality>
             <columnsizes>
                 <e>
                     <k>cond</k>
-                    <v>895370</v>
+                    <v>895536</v>
                 </e>
                 <e>
                     <k>false</k>
-                    <v>895370</v>
+                    <v>895536</v>
                 </e>
             </columnsizes>
             <dependencies>
@@ -32233,7 +32227,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>895370</v>
+                                    <v>895536</v>
                                 </b>
                             </bs>
                         </hist>
@@ -32249,7 +32243,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>895370</v>
+                                    <v>895536</v>
                                 </b>
                             </bs>
                         </hist>
@@ -32259,15 +32253,15 @@
         </relation>
         <relation>
             <name>values</name>
-            <cardinality>13436143</cardinality>
+            <cardinality>13438637</cardinality>
             <columnsizes>
                 <e>
                     <k>id</k>
-                    <v>13436143</v>
+                    <v>13438637</v>
                 </e>
                 <e>
                     <k>str</k>
-                    <v>114239</v>
+                    <v>114260</v>
                 </e>
             </columnsizes>
             <dependencies>
@@ -32281,7 +32275,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>13436143</v>
+                                    <v>13438637</v>
                                 </b>
                             </bs>
                         </hist>
@@ -32297,27 +32291,27 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>78079</v>
+                                    <v>78093</v>
                                 </b>
                                 <b>
                                     <a>2</a>
                                     <b>3</b>
-                                    <v>15258</v>
+                                    <v>15260</v>
                                 </b>
                                 <b>
                                     <a>3</a>
                                     <b>6</b>
-                                    <v>8869</v>
+                                    <v>8871</v>
                                 </b>
                                 <b>
                                     <a>6</a>
                                     <b>52</b>
-                                    <v>8604</v>
+                                    <v>8605</v>
                                 </b>
                                 <b>
                                     <a>52</a>
                                     <b>674264</b>
-                                    <v>3427</v>
+                                    <v>3428</v>
                                 </b>
                             </bs>
                         </hist>
@@ -32327,15 +32321,15 @@
         </relation>
         <relation>
             <name>valuetext</name>
-            <cardinality>6643521</cardinality>
+            <cardinality>6647443</cardinality>
             <columnsizes>
                 <e>
                     <k>id</k>
-                    <v>6643521</v>
+                    <v>6647443</v>
                 </e>
                 <e>
                     <k>text</k>
-                    <v>1095396</v>
+                    <v>1095411</v>
                 </e>
             </columnsizes>
             <dependencies>
@@ -32349,7 +32343,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>6643521</v>
+                                    <v>6647443</v>
                                 </b>
                             </bs>
                         </hist>
@@ -32365,22 +32359,22 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>833981</v>
+                                    <v>833985</v>
                                 </b>
                                 <b>
                                     <a>2</a>
                                     <b>3</b>
-                                    <v>146939</v>
+                                    <v>146940</v>
                                 </b>
                                 <b>
                                     <a>3</a>
                                     <b>7</b>
-                                    <v>86534</v>
+                                    <v>86536</v>
                                 </b>
                                 <b>
                                     <a>7</a>
-                                    <b>593537</b>
-                                    <v>27942</v>
+                                    <b>593553</b>
+                                    <v>27950</v>
                                 </b>
                             </bs>
                         </hist>
@@ -32390,15 +32384,15 @@
         </relation>
         <relation>
             <name>valuebind</name>
-            <cardinality>13544416</cardinality>
+            <cardinality>13546930</cardinality>
             <columnsizes>
                 <e>
                     <k>val</k>
-                    <v>13436143</v>
+                    <v>13438637</v>
                 </e>
                 <e>
                     <k>expr</k>
-                    <v>13544416</v>
+                    <v>13546930</v>
                 </e>
             </columnsizes>
             <dependencies>
@@ -32412,12 +32406,12 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>13345847</v>
+                                    <v>13348324</v>
                                 </b>
                                 <b>
                                     <a>2</a>
                                     <b>6</b>
-                                    <v>90296</v>
+                                    <v>90312</v>
                                 </b>
                             </bs>
                         </hist>
@@ -32433,7 +32427,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>13544416</v>
+                                    <v>13546930</v>
                                 </b>
                             </bs>
                         </hist>
@@ -32443,15 +32437,15 @@
         </relation>
         <relation>
             <name>fieldoffsets</name>
-            <cardinality>1489139</cardinality>
+            <cardinality>1489415</cardinality>
             <columnsizes>
                 <e>
                     <k>id</k>
-                    <v>1489139</v>
+                    <v>1489415</v>
                 </e>
                 <e>
                     <k>byteoffset</k>
-                    <v>31287</v>
+                    <v>31293</v>
                 </e>
                 <e>
                     <k>bitoffset</k>
@@ -32469,7 +32463,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>1489139</v>
+                                    <v>1489415</v>
                                 </b>
                             </bs>
                         </hist>
@@ -32485,7 +32479,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>1489139</v>
+                                    <v>1489415</v>
                                 </b>
                             </bs>
                         </hist>
@@ -32501,7 +32495,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>17653</v>
+                                    <v>17656</v>
                                 </b>
                                 <b>
                                     <a>2</a>
@@ -32511,7 +32505,7 @@
                                 <b>
                                     <a>3</a>
                                     <b>5</b>
-                                    <v>2661</v>
+                                    <v>2662</v>
                                 </b>
                                 <b>
                                     <a>5</a>
@@ -32547,7 +32541,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>30309</v>
+                                    <v>30315</v>
                                 </b>
                                 <b>
                                     <a>2</a>
@@ -32644,19 +32638,19 @@
         </relation>
         <relation>
             <name>bitfield</name>
-            <cardinality>30392</cardinality>
+            <cardinality>30276</cardinality>
             <columnsizes>
                 <e>
                     <k>id</k>
-                    <v>30392</v>
+                    <v>30276</v>
                 </e>
                 <e>
                     <k>bits</k>
-                    <v>3502</v>
+                    <v>3488</v>
                 </e>
                 <e>
                     <k>declared_bits</k>
-                    <v>3502</v>
+                    <v>3488</v>
                 </e>
             </columnsizes>
             <dependencies>
@@ -32670,7 +32664,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>30392</v>
+                                    <v>30276</v>
                                 </b>
                             </bs>
                         </hist>
@@ -32686,7 +32680,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>30392</v>
+                                    <v>30276</v>
                                 </b>
                             </bs>
                         </hist>
@@ -32702,42 +32696,42 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>1000</v>
+                                    <v>996</v>
                                 </b>
                                 <b>
                                     <a>2</a>
                                     <b>3</b>
-                                    <v>750</v>
+                                    <v>747</v>
                                 </b>
                                 <b>
                                     <a>3</a>
                                     <b>4</b>
-                                    <v>250</v>
+                                    <v>249</v>
                                 </b>
                                 <b>
                                     <a>4</a>
                                     <b>5</b>
-                                    <v>500</v>
+                                    <v>498</v>
                                 </b>
                                 <b>
                                     <a>5</a>
                                     <b>7</b>
-                                    <v>250</v>
+                                    <v>249</v>
                                 </b>
                                 <b>
                                     <a>8</a>
                                     <b>9</b>
-                                    <v>250</v>
+                                    <v>249</v>
                                 </b>
                                 <b>
                                     <a>9</a>
                                     <b>11</b>
-                                    <v>250</v>
+                                    <v>249</v>
                                 </b>
                                 <b>
                                     <a>13</a>
                                     <b>143</b>
-                                    <v>250</v>
+                                    <v>249</v>
                                 </b>
                             </bs>
                         </hist>
@@ -32753,7 +32747,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>3502</v>
+                                    <v>3488</v>
                                 </b>
                             </bs>
                         </hist>
@@ -32769,42 +32763,42 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>1000</v>
+                                    <v>996</v>
                                 </b>
                                 <b>
                                     <a>2</a>
                                     <b>3</b>
-                                    <v>750</v>
+                                    <v>747</v>
                                 </b>
                                 <b>
                                     <a>3</a>
                                     <b>4</b>
-                                    <v>250</v>
+                                    <v>249</v>
                                 </b>
                                 <b>
                                     <a>4</a>
                                     <b>5</b>
-                                    <v>500</v>
+                                    <v>498</v>
                                 </b>
                                 <b>
                                     <a>5</a>
                                     <b>7</b>
-                                    <v>250</v>
+                                    <v>249</v>
                                 </b>
                                 <b>
                                     <a>8</a>
                                     <b>9</b>
-                                    <v>250</v>
+                                    <v>249</v>
                                 </b>
                                 <b>
                                     <a>9</a>
                                     <b>11</b>
-                                    <v>250</v>
+                                    <v>249</v>
                                 </b>
                                 <b>
                                     <a>13</a>
                                     <b>143</b>
-                                    <v>250</v>
+                                    <v>249</v>
                                 </b>
                             </bs>
                         </hist>
@@ -32820,7 +32814,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>3502</v>
+                                    <v>3488</v>
                                 </b>
                             </bs>
                         </hist>
@@ -32830,23 +32824,23 @@
         </relation>
         <relation>
             <name>initialisers</name>
-            <cardinality>2338659</cardinality>
+            <cardinality>2334426</cardinality>
             <columnsizes>
                 <e>
                     <k>init</k>
-                    <v>2338659</v>
+                    <v>2334426</v>
                 </e>
                 <e>
                     <k>var</k>
-                    <v>989337</v>
+                    <v>988524</v>
                 </e>
                 <e>
                     <k>expr</k>
-                    <v>2338659</v>
+                    <v>2334426</v>
                 </e>
                 <e>
                     <k>location</k>
-                    <v>539154</v>
+                    <v>537812</v>
                 </e>
             </columnsizes>
             <dependencies>
@@ -32860,7 +32854,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>2338659</v>
+                                    <v>2334426</v>
                                 </b>
                             </bs>
                         </hist>
@@ -32876,7 +32870,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>2338659</v>
+                                    <v>2334426</v>
                                 </b>
                             </bs>
                         </hist>
@@ -32892,7 +32886,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>2338659</v>
+                                    <v>2334426</v>
                                 </b>
                             </bs>
                         </hist>
@@ -32908,17 +32902,17 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>872291</v>
+                                    <v>871776</v>
                                 </b>
                                 <b>
                                     <a>2</a>
                                     <b>15</b>
-                                    <v>39495</v>
+                                    <v>39395</v>
                                 </b>
                                 <b>
                                     <a>16</a>
                                     <b>25</b>
-                                    <v>77549</v>
+                                    <v>77353</v>
                                 </b>
                             </bs>
                         </hist>
@@ -32934,17 +32928,17 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>872291</v>
+                                    <v>871776</v>
                                 </b>
                                 <b>
                                     <a>2</a>
                                     <b>15</b>
-                                    <v>39495</v>
+                                    <v>39395</v>
                                 </b>
                                 <b>
                                     <a>16</a>
                                     <b>25</b>
-                                    <v>77549</v>
+                                    <v>77353</v>
                                 </b>
                             </bs>
                         </hist>
@@ -32960,7 +32954,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>989328</v>
+                                    <v>988516</v>
                                 </b>
                                 <b>
                                     <a>2</a>
@@ -32981,7 +32975,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>2338659</v>
+                                    <v>2334426</v>
                                 </b>
                             </bs>
                         </hist>
@@ -32997,7 +32991,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>2338659</v>
+                                    <v>2334426</v>
                                 </b>
                             </bs>
                         </hist>
@@ -33013,7 +33007,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>2338659</v>
+                                    <v>2334426</v>
                                 </b>
                             </bs>
                         </hist>
@@ -33029,22 +33023,22 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>439236</v>
+                                    <v>438122</v>
                                 </b>
                                 <b>
                                     <a>2</a>
                                     <b>3</b>
-                                    <v>33072</v>
+                                    <v>32980</v>
                                 </b>
                                 <b>
                                     <a>3</a>
                                     <b>15</b>
-                                    <v>42172</v>
+                                    <v>42099</v>
                                 </b>
                                 <b>
                                     <a>15</a>
                                     <b>111796</b>
-                                    <v>24672</v>
+                                    <v>24610</v>
                                 </b>
                             </bs>
                         </hist>
@@ -33060,17 +33054,17 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>470366</v>
+                                    <v>469174</v>
                                 </b>
                                 <b>
                                     <a>2</a>
                                     <b>4</b>
-                                    <v>49613</v>
+                                    <v>49479</v>
                                 </b>
                                 <b>
                                     <a>4</a>
                                     <b>12163</b>
-                                    <v>19173</v>
+                                    <v>19159</v>
                                 </b>
                             </bs>
                         </hist>
@@ -33086,22 +33080,22 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>439236</v>
+                                    <v>438122</v>
                                 </b>
                                 <b>
                                     <a>2</a>
                                     <b>3</b>
-                                    <v>33072</v>
+                                    <v>32980</v>
                                 </b>
                                 <b>
                                     <a>3</a>
                                     <b>15</b>
-                                    <v>42172</v>
+                                    <v>42099</v>
                                 </b>
                                 <b>
                                     <a>15</a>
                                     <b>111796</b>
-                                    <v>24672</v>
+                                    <v>24610</v>
                                 </b>
                             </bs>
                         </hist>
@@ -33111,26 +33105,26 @@
         </relation>
         <relation>
             <name>braced_initialisers</name>
-            <cardinality>74182</cardinality>
+            <cardinality>74076</cardinality>
             <columnsizes>
                 <e>
                     <k>init</k>
-                    <v>74182</v>
+                    <v>74076</v>
                 </e>
             </columnsizes>
             <dependencies/>
         </relation>
         <relation>
             <name>expr_ancestor</name>
-            <cardinality>1795437</cardinality>
+            <cardinality>1795303</cardinality>
             <columnsizes>
                 <e>
                     <k>exp</k>
-                    <v>1795437</v>
+                    <v>1795303</v>
                 </e>
                 <e>
                     <k>ancestor</k>
-                    <v>898593</v>
+                    <v>898526</v>
                 </e>
             </columnsizes>
             <dependencies>
@@ -33144,7 +33138,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>1795437</v>
+                                    <v>1795303</v>
                                 </b>
                             </bs>
                         </hist>
@@ -33160,17 +33154,17 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>18283</v>
+                                    <v>18281</v>
                                 </b>
                                 <b>
                                     <a>2</a>
                                     <b>3</b>
-                                    <v>869534</v>
+                                    <v>869469</v>
                                 </b>
                                 <b>
                                     <a>3</a>
                                     <b>19</b>
-                                    <v>10776</v>
+                                    <v>10775</v>
                                 </b>
                             </bs>
                         </hist>
@@ -33180,19 +33174,19 @@
         </relation>
         <relation>
             <name>exprs</name>
-            <cardinality>25138614</cardinality>
+            <cardinality>25143280</cardinality>
             <columnsizes>
                 <e>
                     <k>id</k>
-                    <v>25138614</v>
+                    <v>25143280</v>
                 </e>
                 <e>
                     <k>kind</k>
-                    <v>1456</v>
+                    <v>1446</v>
                 </e>
                 <e>
                     <k>location</k>
-                    <v>5896962</v>
+                    <v>10554422</v>
                 </e>
             </columnsizes>
             <dependencies>
@@ -33206,7 +33200,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>25138614</v>
+                                    <v>25143280</v>
                                 </b>
                             </bs>
                         </hist>
@@ -33222,7 +33216,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>25138614</v>
+                                    <v>25143280</v>
                                 </b>
                             </bs>
                         </hist>
@@ -33237,63 +33231,73 @@
                             <bs>
                                 <b>
                                     <a>1</a>
-                                    <b>13</b>
-                                    <v>121</v>
+                                    <b>10</b>
+                                    <v>109</v>
                                 </b>
                                 <b>
-                                    <a>13</a>
-                                    <b>46</b>
-                                    <v>121</v>
+                                    <a>12</a>
+                                    <b>18</b>
+                                    <v>109</v>
                                 </b>
                                 <b>
-                                    <a>53</a>
-                                    <b>76</b>
-                                    <v>121</v>
+                                    <a>26</a>
+                                    <b>100</b>
+                                    <v>109</v>
                                 </b>
                                 <b>
-                                    <a>79</a>
-                                    <b>245</b>
-                                    <v>121</v>
+                                    <a>105</a>
+                                    <b>305</b>
+                                    <v>109</v>
                                 </b>
                                 <b>
-                                    <a>302</a>
-                                    <b>524</b>
-                                    <v>121</v>
+                                    <a>323</a>
+                                    <b>467</b>
+                                    <v>109</v>
                                 </b>
                                 <b>
-                                    <a>530</a>
-                                    <b>969</b>
-                                    <v>121</v>
+                                    <a>607</a>
+                                    <b>893</b>
+                                    <v>109</v>
                                 </b>
                                 <b>
-                                    <a>1043</a>
-                                    <b>2109</b>
-                                    <v>121</v>
+                                    <a>906</a>
+                                    <b>1658</b>
+                                    <v>109</v>
                                 </b>
                                 <b>
-                                    <a>2204</a>
-                                    <b>3636</b>
-                                    <v>121</v>
+                                    <a>1781</a>
+                                    <b>2386</b>
+                                    <v>109</v>
                                 </b>
                                 <b>
-                                    <a>4328</a>
-                                    <b>7013</b>
-                                    <v>121</v>
+                                    <a>3390</a>
+                                    <b>4336</b>
+                                    <v>109</v>
                                 </b>
                                 <b>
-                                    <a>7403</a>
-                                    <b>8498</b>
-                                    <v>121</v>
+                                    <a>4809</a>
+                                    <b>5185</b>
+                                    <v>109</v>
                                 </b>
                                 <b>
-                                    <a>9709</a>
-                                    <b>32322</b>
-                                    <v>121</v>
+                                    <a>5187</a>
+                                    <b>22128</b>
+                                    <v>109</v>
                                 </b>
                                 <b>
-                                    <a>33490</a>
-                                    <b>447645</b>
-                                    <v>121</v>
+                                    <a>26432</a>
+                                    <b>50205</b>
+                                    <v>109</v>
+                                </b>
+                                <b>
+                                    <a>63936</a>
+                                    <b>144106</b>
+                                    <v>109</v>
+                                </b>
+                                <b>
+                                    <a>313148</a>
+                                    <b>313149</b>
+                                    <v>21</v>
                                 </b>
                             </bs>
                         </hist>
@@ -33308,68 +33312,73 @@
                             <bs>
                                 <b>
                                     <a>1</a>
-                                    <b>3</b>
-                                    <v>107</v>
+                                    <b>9</b>
+                                    <v>109</v>
                                 </b>
                                 <b>
-                                    <a>4</a>
+                                    <a>9</a>
                                     <b>15</b>
-                                    <v>121</v>
+                                    <v>109</v>
                                 </b>
                                 <b>
                                     <a>17</a>
-                                    <b>26</b>
-                                    <v>121</v>
+                                    <b>96</b>
+                                    <v>109</v>
                                 </b>
                                 <b>
-                                    <a>28</a>
-                                    <b>40</b>
-                                    <v>121</v>
+                                    <a>99</a>
+                                    <b>222</b>
+                                    <v>109</v>
                                 </b>
                                 <b>
-                                    <a>47</a>
-                                    <b>105</b>
-                                    <v>121</v>
+                                    <a>260</a>
+                                    <b>383</b>
+                                    <v>109</v>
                                 </b>
                                 <b>
-                                    <a>133</a>
-                                    <b>276</b>
-                                    <v>121</v>
+                                    <a>408</a>
+                                    <b>594</b>
+                                    <v>109</v>
                                 </b>
                                 <b>
-                                    <a>305</a>
-                                    <b>552</b>
-                                    <v>121</v>
+                                    <a>599</a>
+                                    <b>749</b>
+                                    <v>109</v>
                                 </b>
                                 <b>
-                                    <a>620</a>
-                                    <b>1425</b>
-                                    <v>121</v>
+                                    <a>864</a>
+                                    <b>1774</b>
+                                    <v>109</v>
                                 </b>
                                 <b>
-                                    <a>1437</a>
-                                    <b>1711</b>
-                                    <v>121</v>
+                                    <a>1812</a>
+                                    <b>2545</b>
+                                    <v>109</v>
                                 </b>
                                 <b>
-                                    <a>1929</a>
-                                    <b>3215</b>
-                                    <v>121</v>
+                                    <a>2623</a>
+                                    <b>2919</b>
+                                    <v>109</v>
                                 </b>
                                 <b>
-                                    <a>3232</a>
-                                    <b>8454</b>
-                                    <v>121</v>
+                                    <a>3419</a>
+                                    <b>4913</b>
+                                    <v>109</v>
                                 </b>
                                 <b>
-                                    <a>11521</a>
-                                    <b>87503</b>
-                                    <v>121</v>
+                                    <a>5473</a>
+                                    <b>21165</b>
+                                    <v>109</v>
                                 </b>
                                 <b>
-                                    <a>155156</a>
-                                    <b>155157</b>
-                                    <v>13</v>
+                                    <a>26254</a>
+                                    <b>76840</b>
+                                    <v>109</v>
+                                </b>
+                                <b>
+                                    <a>224080</a>
+                                    <b>224081</b>
+                                    <v>21</v>
                                 </b>
                             </bs>
                         </hist>
@@ -33385,32 +33394,22 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>2750855</v>
+                                    <v>8876942</v>
                                 </b>
                                 <b>
                                     <a>2</a>
                                     <b>3</b>
-                                    <v>1390969</v>
+                                    <v>818418</v>
                                 </b>
                                 <b>
                                     <a>3</a>
-                                    <b>4</b>
-                                    <v>522854</v>
+                                    <b>16</b>
+                                    <v>795071</v>
                                 </b>
                                 <b>
-                                    <a>4</a>
-                                    <b>6</b>
-                                    <v>539333</v>
-                                </b>
-                                <b>
-                                    <a>6</a>
-                                    <b>13</b>
-                                    <v>455210</v>
-                                </b>
-                                <b>
-                                    <a>13</a>
-                                    <b>144777</b>
-                                    <v>237739</v>
+                                    <a>16</a>
+                                    <b>71733</b>
+                                    <v>63990</v>
                                 </b>
                             </bs>
                         </hist>
@@ -33426,17 +33425,17 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>4271139</v>
+                                    <v>9015972</v>
                                 </b>
                                 <b>
                                     <a>2</a>
                                     <b>3</b>
-                                    <v>1230098</v>
+                                    <v>772206</v>
                                 </b>
                                 <b>
                                     <a>3</a>
-                                    <b>30</b>
-                                    <v>395724</v>
+                                    <b>32</b>
+                                    <v>766243</v>
                                 </b>
                             </bs>
                         </hist>
@@ -33446,15 +33445,15 @@
         </relation>
         <relation>
             <name>expr_reuse</name>
-            <cardinality>906491</cardinality>
+            <cardinality>906424</cardinality>
             <columnsizes>
                 <e>
                     <k>reuse</k>
-                    <v>906491</v>
+                    <v>906424</v>
                 </e>
                 <e>
                     <k>original</k>
-                    <v>906491</v>
+                    <v>906424</v>
                 </e>
                 <e>
                     <k>value_category</k>
@@ -33472,7 +33471,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>906491</v>
+                                    <v>906424</v>
                                 </b>
                             </bs>
                         </hist>
@@ -33488,7 +33487,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>906491</v>
+                                    <v>906424</v>
                                 </b>
                             </bs>
                         </hist>
@@ -33504,7 +33503,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>906491</v>
+                                    <v>906424</v>
                                 </b>
                             </bs>
                         </hist>
@@ -33520,7 +33519,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>906491</v>
+                                    <v>906424</v>
                                 </b>
                             </bs>
                         </hist>
@@ -33572,19 +33571,19 @@
         </relation>
         <relation>
             <name>expr_types</name>
-            <cardinality>25138614</cardinality>
+            <cardinality>25143280</cardinality>
             <columnsizes>
                 <e>
                     <k>id</k>
-                    <v>25138614</v>
+                    <v>25143280</v>
                 </e>
                 <e>
                     <k>typeid</k>
-                    <v>120596</v>
+                    <v>213630</v>
                 </e>
                 <e>
                     <k>value_category</k>
-                    <v>56</v>
+                    <v>43</v>
                 </e>
             </columnsizes>
             <dependencies>
@@ -33598,7 +33597,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>25138614</v>
+                                    <v>25143280</v>
                                 </b>
                             </bs>
                         </hist>
@@ -33614,7 +33613,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>25138614</v>
+                                    <v>25143280</v>
                                 </b>
                             </bs>
                         </hist>
@@ -33630,57 +33629,52 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>17845</v>
+                                    <v>52371</v>
                                 </b>
                                 <b>
                                     <a>2</a>
                                     <b>3</b>
-                                    <v>19220</v>
+                                    <v>35097</v>
                                 </b>
                                 <b>
                                     <a>3</a>
                                     <b>4</b>
-                                    <v>10269</v>
+                                    <v>14468</v>
                                 </b>
                                 <b>
                                     <a>4</a>
                                     <b>5</b>
-                                    <v>8080</v>
+                                    <v>14490</v>
                                 </b>
                                 <b>
                                     <a>5</a>
-                                    <b>7</b>
-                                    <v>10690</v>
+                                    <b>8</b>
+                                    <v>17515</v>
                                 </b>
                                 <b>
-                                    <a>7</a>
-                                    <b>11</b>
-                                    <v>11111</v>
+                                    <a>8</a>
+                                    <b>14</b>
+                                    <v>17340</v>
                                 </b>
                                 <b>
-                                    <a>11</a>
-                                    <b>18</b>
-                                    <v>10157</v>
+                                    <a>14</a>
+                                    <b>24</b>
+                                    <v>16397</v>
                                 </b>
                                 <b>
-                                    <a>18</a>
-                                    <b>33</b>
-                                    <v>9483</v>
+                                    <a>24</a>
+                                    <b>49</b>
+                                    <v>16025</v>
                                 </b>
                                 <b>
-                                    <a>33</a>
-                                    <b>70</b>
-                                    <v>9119</v>
+                                    <a>49</a>
+                                    <b>134</b>
+                                    <v>16134</v>
                                 </b>
                                 <b>
-                                    <a>70</a>
-                                    <b>233</b>
-                                    <v>9062</v>
-                                </b>
-                                <b>
-                                    <a>233</a>
-                                    <b>379496</b>
-                                    <v>5555</v>
+                                    <a>134</a>
+                                    <b>441505</b>
+                                    <v>13789</v>
                                 </b>
                             </bs>
                         </hist>
@@ -33696,12 +33690,12 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>100590</v>
+                                    <v>185417</v>
                                 </b>
                                 <b>
                                     <a>2</a>
                                     <b>3</b>
-                                    <v>20005</v>
+                                    <v>28213</v>
                                 </b>
                             </bs>
                         </hist>
@@ -33715,14 +33709,14 @@
                             <budget>12</budget>
                             <bs>
                                 <b>
-                                    <a>118902</a>
-                                    <b>118903</b>
-                                    <v>28</v>
+                                    <a>153745</a>
+                                    <b>153746</b>
+                                    <v>21</v>
                                 </b>
                                 <b>
-                                    <a>777025</a>
-                                    <b>777026</b>
-                                    <v>28</v>
+                                    <a>993192</a>
+                                    <b>993193</b>
+                                    <v>21</v>
                                 </b>
                             </bs>
                         </hist>
@@ -33736,14 +33730,14 @@
                             <budget>12</budget>
                             <bs>
                                 <b>
-                                    <a>1298</a>
-                                    <b>1299</b>
-                                    <v>28</v>
+                                    <a>2282</a>
+                                    <b>2283</b>
+                                    <v>21</v>
                                 </b>
                                 <b>
-                                    <a>3713</a>
-                                    <b>3714</b>
-                                    <v>28</v>
+                                    <a>8750</a>
+                                    <b>8751</b>
+                                    <v>21</v>
                                 </b>
                             </bs>
                         </hist>
@@ -33764,15 +33758,15 @@
         </relation>
         <relation>
             <name>new_allocated_type</name>
-            <cardinality>57992</cardinality>
+            <cardinality>57934</cardinality>
             <columnsizes>
                 <e>
                     <k>expr</k>
-                    <v>57992</v>
+                    <v>57934</v>
                 </e>
                 <e>
                     <k>type_id</k>
-                    <v>34384</v>
+                    <v>34350</v>
                 </e>
             </columnsizes>
             <dependencies>
@@ -33786,7 +33780,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>57992</v>
+                                    <v>57934</v>
                                 </b>
                             </bs>
                         </hist>
@@ -33802,17 +33796,17 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>14455</v>
+                                    <v>14440</v>
                                 </b>
                                 <b>
                                     <a>2</a>
                                     <b>3</b>
-                                    <v>18176</v>
+                                    <v>18158</v>
                                 </b>
                                 <b>
                                     <a>3</a>
                                     <b>19</b>
-                                    <v>1753</v>
+                                    <v>1751</v>
                                 </b>
                             </bs>
                         </hist>
@@ -33822,15 +33816,15 @@
         </relation>
         <relation>
             <name>new_array_allocated_type</name>
-            <cardinality>6932</cardinality>
+            <cardinality>6914</cardinality>
             <columnsizes>
                 <e>
                     <k>expr</k>
-                    <v>6932</v>
+                    <v>6914</v>
                 </e>
                 <e>
                     <k>type_id</k>
-                    <v>2978</v>
+                    <v>2970</v>
                 </e>
             </columnsizes>
             <dependencies>
@@ -33844,7 +33838,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>6932</v>
+                                    <v>6914</v>
                                 </b>
                             </bs>
                         </hist>
@@ -33865,12 +33859,12 @@
                                 <b>
                                     <a>2</a>
                                     <b>3</b>
-                                    <v>2633</v>
+                                    <v>2626</v>
                                 </b>
                                 <b>
                                     <a>3</a>
                                     <b>5</b>
-                                    <v>224</v>
+                                    <v>223</v>
                                 </b>
                                 <b>
                                     <a>6</a>
@@ -35221,15 +35215,15 @@
         </relation>
         <relation>
             <name>condition_decl_bind</name>
-            <cardinality>437622</cardinality>
+            <cardinality>437589</cardinality>
             <columnsizes>
                 <e>
                     <k>expr</k>
-                    <v>437622</v>
+                    <v>437589</v>
                 </e>
                 <e>
                     <k>decl</k>
-                    <v>437622</v>
+                    <v>437589</v>
                 </e>
             </columnsizes>
             <dependencies>
@@ -35243,7 +35237,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>437622</v>
+                                    <v>437589</v>
                                 </b>
                             </bs>
                         </hist>
@@ -35259,7 +35253,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>437622</v>
+                                    <v>437589</v>
                                 </b>
                             </bs>
                         </hist>
@@ -35269,15 +35263,15 @@
         </relation>
         <relation>
             <name>typeid_bind</name>
-            <cardinality>60130</cardinality>
+            <cardinality>60071</cardinality>
             <columnsizes>
                 <e>
                     <k>expr</k>
-                    <v>60130</v>
+                    <v>60071</v>
                 </e>
                 <e>
                     <k>type_id</k>
-                    <v>20015</v>
+                    <v>19995</v>
                 </e>
             </columnsizes>
             <dependencies>
@@ -35291,7 +35285,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>60130</v>
+                                    <v>60071</v>
                                 </b>
                             </bs>
                         </hist>
@@ -35307,17 +35301,17 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>3720</v>
+                                    <v>3717</v>
                                 </b>
                                 <b>
                                     <a>2</a>
                                     <b>3</b>
-                                    <v>15781</v>
+                                    <v>15765</v>
                                 </b>
                                 <b>
                                     <a>3</a>
                                     <b>328</b>
-                                    <v>513</v>
+                                    <v>512</v>
                                 </b>
                             </bs>
                         </hist>
@@ -35327,15 +35321,15 @@
         </relation>
         <relation>
             <name>uuidof_bind</name>
-            <cardinality>28057</cardinality>
+            <cardinality>27985</cardinality>
             <columnsizes>
                 <e>
                     <k>expr</k>
-                    <v>28057</v>
+                    <v>27985</v>
                 </e>
                 <e>
                     <k>type_id</k>
-                    <v>27789</v>
+                    <v>27719</v>
                 </e>
             </columnsizes>
             <dependencies>
@@ -35349,7 +35343,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>28057</v>
+                                    <v>27985</v>
                                 </b>
                             </bs>
                         </hist>
@@ -35365,12 +35359,12 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>27565</v>
+                                    <v>27495</v>
                                 </b>
                                 <b>
                                     <a>2</a>
                                     <b>4</b>
-                                    <v>224</v>
+                                    <v>223</v>
                                 </b>
                             </bs>
                         </hist>
@@ -35380,15 +35374,15 @@
         </relation>
         <relation>
             <name>sizeof_bind</name>
-            <cardinality>241336</cardinality>
+            <cardinality>241381</cardinality>
             <columnsizes>
                 <e>
                     <k>expr</k>
-                    <v>241336</v>
+                    <v>241381</v>
                 </e>
                 <e>
                     <k>type_id</k>
-                    <v>11178</v>
+                    <v>11180</v>
                 </e>
             </columnsizes>
             <dependencies>
@@ -35402,7 +35396,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>241336</v>
+                                    <v>241381</v>
                                 </b>
                             </bs>
                         </hist>
@@ -35418,12 +35412,12 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>3866</v>
+                                    <v>3867</v>
                                 </b>
                                 <b>
                                     <a>2</a>
                                     <b>3</b>
-                                    <v>2775</v>
+                                    <v>2776</v>
                                 </b>
                                 <b>
                                     <a>3</a>
@@ -35433,7 +35427,7 @@
                                 <b>
                                     <a>4</a>
                                     <b>5</b>
-                                    <v>1136</v>
+                                    <v>1137</v>
                                 </b>
                                 <b>
                                     <a>5</a>
@@ -35443,7 +35437,7 @@
                                 <b>
                                     <a>6</a>
                                     <b>7</b>
-                                    <v>1061</v>
+                                    <v>1062</v>
                                 </b>
                                 <b>
                                     <a>7</a>
@@ -35511,11 +35505,11 @@
         </relation>
         <relation>
             <name>lambdas</name>
-            <cardinality>17748</cardinality>
+            <cardinality>17730</cardinality>
             <columnsizes>
                 <e>
                     <k>expr</k>
-                    <v>17748</v>
+                    <v>17730</v>
                 </e>
                 <e>
                     <k>default_capture</k>
@@ -35525,6 +35519,10 @@
                     <k>has_explicit_return_type</k>
                     <v>85</v>
                 </e>
+                <e>
+                    <k>has_explicit_parameter_list</k>
+                    <v>85</v>
+                </e>
             </columnsizes>
             <dependencies>
                 <dep>
@@ -35537,7 +35535,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>17748</v>
+                                    <v>17730</v>
                                 </b>
                             </bs>
                         </hist>
@@ -35553,7 +35551,23 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>17748</v>
+                                    <v>17730</v>
+                                </b>
+                            </bs>
+                        </hist>
+                    </val>
+                </dep>
+                <dep>
+                    <src>expr</src>
+                    <trg>has_explicit_parameter_list</trg>
+                    <val>
+                        <hist>
+                            <budget>12</budget>
+                            <bs>
+                                <b>
+                                    <a>1</a>
+                                    <b>2</b>
+                                    <v>17730</v>
                                 </b>
                             </bs>
                         </hist>
@@ -35606,6 +35620,27 @@
                         </hist>
                     </val>
                 </dep>
+                <dep>
+                    <src>default_capture</src>
+                    <trg>has_explicit_parameter_list</trg>
+                    <val>
+                        <hist>
+                            <budget>12</budget>
+                            <bs>
+                                <b>
+                                    <a>1</a>
+                                    <b>2</b>
+                                    <v>42</v>
+                                </b>
+                                <b>
+                                    <a>2</a>
+                                    <b>3</b>
+                                    <v>85</v>
+                                </b>
+                            </bs>
+                        </hist>
+                    </val>
+                </dep>
                 <dep>
                     <src>has_explicit_return_type</src>
                     <trg>expr</trg>
@@ -35648,19 +35683,103 @@
                         </hist>
                     </val>
                 </dep>
+                <dep>
+                    <src>has_explicit_return_type</src>
+                    <trg>has_explicit_parameter_list</trg>
+                    <val>
+                        <hist>
+                            <budget>12</budget>
+                            <bs>
+                                <b>
+                                    <a>1</a>
+                                    <b>2</b>
+                                    <v>42</v>
+                                </b>
+                                <b>
+                                    <a>2</a>
+                                    <b>3</b>
+                                    <v>42</v>
+                                </b>
+                            </bs>
+                        </hist>
+                    </val>
+                </dep>
+                <dep>
+                    <src>has_explicit_parameter_list</src>
+                    <trg>expr</trg>
+                    <val>
+                        <hist>
+                            <budget>12</budget>
+                            <bs>
+                                <b>
+                                    <a>45</a>
+                                    <b>46</b>
+                                    <v>42</v>
+                                </b>
+                                <b>
+                                    <a>370</a>
+                                    <b>371</b>
+                                    <v>42</v>
+                                </b>
+                            </bs>
+                        </hist>
+                    </val>
+                </dep>
+                <dep>
+                    <src>has_explicit_parameter_list</src>
+                    <trg>default_capture</trg>
+                    <val>
+                        <hist>
+                            <budget>12</budget>
+                            <bs>
+                                <b>
+                                    <a>2</a>
+                                    <b>3</b>
+                                    <v>42</v>
+                                </b>
+                                <b>
+                                    <a>3</a>
+                                    <b>4</b>
+                                    <v>42</v>
+                                </b>
+                            </bs>
+                        </hist>
+                    </val>
+                </dep>
+                <dep>
+                    <src>has_explicit_parameter_list</src>
+                    <trg>has_explicit_return_type</trg>
+                    <val>
+                        <hist>
+                            <budget>12</budget>
+                            <bs>
+                                <b>
+                                    <a>1</a>
+                                    <b>2</b>
+                                    <v>42</v>
+                                </b>
+                                <b>
+                                    <a>2</a>
+                                    <b>3</b>
+                                    <v>42</v>
+                                </b>
+                            </bs>
+                        </hist>
+                    </val>
+                </dep>
             </dependencies>
         </relation>
         <relation>
             <name>lambda_capture</name>
-            <cardinality>28523</cardinality>
+            <cardinality>28450</cardinality>
             <columnsizes>
                 <e>
                     <k>id</k>
-                    <v>28523</v>
+                    <v>28450</v>
                 </e>
                 <e>
                     <k>lambda</k>
-                    <v>13294</v>
+                    <v>13261</v>
                 </e>
                 <e>
                     <k>index</k>
@@ -35668,7 +35787,7 @@
                 </e>
                 <e>
                     <k>field</k>
-                    <v>28523</v>
+                    <v>28450</v>
                 </e>
                 <e>
                     <k>captured_by_reference</k>
@@ -35680,7 +35799,7 @@
                 </e>
                 <e>
                     <k>location</k>
-                    <v>18396</v>
+                    <v>18350</v>
                 </e>
             </columnsizes>
             <dependencies>
@@ -35694,7 +35813,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>28523</v>
+                                    <v>28450</v>
                                 </b>
                             </bs>
                         </hist>
@@ -35710,7 +35829,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>28523</v>
+                                    <v>28450</v>
                                 </b>
                             </bs>
                         </hist>
@@ -35726,7 +35845,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>28523</v>
+                                    <v>28450</v>
                                 </b>
                             </bs>
                         </hist>
@@ -35742,7 +35861,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>28523</v>
+                                    <v>28450</v>
                                 </b>
                             </bs>
                         </hist>
@@ -35758,7 +35877,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>28523</v>
+                                    <v>28450</v>
                                 </b>
                             </bs>
                         </hist>
@@ -35774,7 +35893,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>28523</v>
+                                    <v>28450</v>
                                 </b>
                             </bs>
                         </hist>
@@ -35790,27 +35909,27 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>6673</v>
+                                    <v>6656</v>
                                 </b>
                                 <b>
                                     <a>2</a>
                                     <b>3</b>
-                                    <v>3081</v>
+                                    <v>3074</v>
                                 </b>
                                 <b>
                                     <a>3</a>
                                     <b>4</b>
-                                    <v>1614</v>
+                                    <v>1610</v>
                                 </b>
                                 <b>
                                     <a>4</a>
                                     <b>6</b>
-                                    <v>1225</v>
+                                    <v>1222</v>
                                 </b>
                                 <b>
                                     <a>6</a>
                                     <b>18</b>
-                                    <v>699</v>
+                                    <v>697</v>
                                 </b>
                             </bs>
                         </hist>
@@ -35826,27 +35945,27 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>6673</v>
+                                    <v>6656</v>
                                 </b>
                                 <b>
                                     <a>2</a>
                                     <b>3</b>
-                                    <v>3081</v>
+                                    <v>3074</v>
                                 </b>
                                 <b>
                                     <a>3</a>
                                     <b>4</b>
-                                    <v>1614</v>
+                                    <v>1610</v>
                                 </b>
                                 <b>
                                     <a>4</a>
                                     <b>6</b>
-                                    <v>1225</v>
+                                    <v>1222</v>
                                 </b>
                                 <b>
                                     <a>6</a>
                                     <b>18</b>
-                                    <v>699</v>
+                                    <v>697</v>
                                 </b>
                             </bs>
                         </hist>
@@ -35862,27 +35981,27 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>6673</v>
+                                    <v>6656</v>
                                 </b>
                                 <b>
                                     <a>2</a>
                                     <b>3</b>
-                                    <v>3081</v>
+                                    <v>3074</v>
                                 </b>
                                 <b>
                                     <a>3</a>
                                     <b>4</b>
-                                    <v>1614</v>
+                                    <v>1610</v>
                                 </b>
                                 <b>
                                     <a>4</a>
                                     <b>6</b>
-                                    <v>1225</v>
+                                    <v>1222</v>
                                 </b>
                                 <b>
                                     <a>6</a>
                                     <b>18</b>
-                                    <v>699</v>
+                                    <v>697</v>
                                 </b>
                             </bs>
                         </hist>
@@ -35898,12 +36017,12 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>12724</v>
+                                    <v>12692</v>
                                 </b>
                                 <b>
                                     <a>2</a>
                                     <b>3</b>
-                                    <v>569</v>
+                                    <v>568</v>
                                 </b>
                             </bs>
                         </hist>
@@ -35919,7 +36038,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>13268</v>
+                                    <v>13235</v>
                                 </b>
                                 <b>
                                     <a>2</a>
@@ -35940,27 +36059,27 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>7303</v>
+                                    <v>7284</v>
                                 </b>
                                 <b>
                                     <a>2</a>
                                     <b>3</b>
-                                    <v>3245</v>
+                                    <v>3237</v>
                                 </b>
                                 <b>
                                     <a>3</a>
                                     <b>4</b>
-                                    <v>1329</v>
+                                    <v>1326</v>
                                 </b>
                                 <b>
                                     <a>4</a>
                                     <b>7</b>
-                                    <v>1087</v>
+                                    <v>1084</v>
                                 </b>
                                 <b>
                                     <a>7</a>
                                     <b>18</b>
-                                    <v>328</v>
+                                    <v>327</v>
                                 </b>
                             </bs>
                         </hist>
@@ -36269,7 +36388,7 @@
                                 <b>
                                     <a>2</a>
                                     <b>3</b>
-                                    <v>112</v>
+                                    <v>111</v>
                                 </b>
                             </bs>
                         </hist>
@@ -36402,7 +36521,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>28523</v>
+                                    <v>28450</v>
                                 </b>
                             </bs>
                         </hist>
@@ -36418,7 +36537,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>28523</v>
+                                    <v>28450</v>
                                 </b>
                             </bs>
                         </hist>
@@ -36434,7 +36553,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>28523</v>
+                                    <v>28450</v>
                                 </b>
                             </bs>
                         </hist>
@@ -36450,7 +36569,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>28523</v>
+                                    <v>28450</v>
                                 </b>
                             </bs>
                         </hist>
@@ -36466,7 +36585,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>28523</v>
+                                    <v>28450</v>
                                 </b>
                             </bs>
                         </hist>
@@ -36482,7 +36601,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>28523</v>
+                                    <v>28450</v>
                                 </b>
                             </bs>
                         </hist>
@@ -36740,17 +36859,17 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>16566</v>
+                                    <v>16524</v>
                                 </b>
                                 <b>
                                     <a>2</a>
                                     <b>6</b>
-                                    <v>1398</v>
+                                    <v>1394</v>
                                 </b>
                                 <b>
                                     <a>6</a>
                                     <b>68</b>
-                                    <v>431</v>
+                                    <v>430</v>
                                 </b>
                             </bs>
                         </hist>
@@ -36766,12 +36885,12 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>17179</v>
+                                    <v>17136</v>
                                 </b>
                                 <b>
                                     <a>2</a>
                                     <b>68</b>
-                                    <v>1217</v>
+                                    <v>1214</v>
                                 </b>
                             </bs>
                         </hist>
@@ -36787,12 +36906,12 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>17663</v>
+                                    <v>17618</v>
                                 </b>
                                 <b>
                                     <a>2</a>
                                     <b>8</b>
-                                    <v>733</v>
+                                    <v>731</v>
                                 </b>
                             </bs>
                         </hist>
@@ -36808,17 +36927,17 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>16566</v>
+                                    <v>16524</v>
                                 </b>
                                 <b>
                                     <a>2</a>
                                     <b>6</b>
-                                    <v>1398</v>
+                                    <v>1394</v>
                                 </b>
                                 <b>
                                     <a>6</a>
                                     <b>68</b>
-                                    <v>431</v>
+                                    <v>430</v>
                                 </b>
                             </bs>
                         </hist>
@@ -36834,7 +36953,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>18370</v>
+                                    <v>18324</v>
                                 </b>
                                 <b>
                                     <a>2</a>
@@ -36855,7 +36974,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>18396</v>
+                                    <v>18350</v>
                                 </b>
                             </bs>
                         </hist>
@@ -36865,11 +36984,11 @@
         </relation>
         <relation>
             <name>fold</name>
-            <cardinality>1368</cardinality>
+            <cardinality>1367</cardinality>
             <columnsizes>
                 <e>
                     <k>expr</k>
-                    <v>1368</v>
+                    <v>1367</v>
                 </e>
                 <e>
                     <k>operator</k>
@@ -36891,7 +37010,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>1368</v>
+                                    <v>1367</v>
                                 </b>
                             </bs>
                         </hist>
@@ -36907,7 +37026,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>1368</v>
+                                    <v>1367</v>
                                 </b>
                             </bs>
                         </hist>
@@ -36986,11 +37105,11 @@
         </relation>
         <relation>
             <name>stmts</name>
-            <cardinality>6258938</cardinality>
+            <cardinality>6243068</cardinality>
             <columnsizes>
                 <e>
                     <k>id</k>
-                    <v>6258938</v>
+                    <v>6243068</v>
                 </e>
                 <e>
                     <k>kind</k>
@@ -36998,7 +37117,7 @@
                 </e>
                 <e>
                     <k>location</k>
-                    <v>2754699</v>
+                    <v>2747714</v>
                 </e>
             </columnsizes>
             <dependencies>
@@ -37012,7 +37131,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>6258938</v>
+                                    <v>6243068</v>
                                 </b>
                             </bs>
                         </hist>
@@ -37028,7 +37147,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>6258938</v>
+                                    <v>6243068</v>
                                 </b>
                             </bs>
                         </hist>
@@ -37266,17 +37385,17 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>2352912</v>
+                                    <v>2346946</v>
                                 </b>
                                 <b>
                                     <a>2</a>
                                     <b>4</b>
-                                    <v>239081</v>
+                                    <v>238474</v>
                                 </b>
                                 <b>
                                     <a>4</a>
                                     <b>1581</b>
-                                    <v>162705</v>
+                                    <v>162292</v>
                                 </b>
                             </bs>
                         </hist>
@@ -37292,12 +37411,12 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>2667989</v>
+                                    <v>2661225</v>
                                 </b>
                                 <b>
                                     <a>2</a>
                                     <b>10</b>
-                                    <v>86709</v>
+                                    <v>86489</v>
                                 </b>
                             </bs>
                         </hist>
@@ -37414,15 +37533,15 @@
         </relation>
         <relation>
             <name>if_initialization</name>
-            <cardinality>375</cardinality>
+            <cardinality>373</cardinality>
             <columnsizes>
                 <e>
                     <k>if_stmt</k>
-                    <v>375</v>
+                    <v>373</v>
                 </e>
                 <e>
                     <k>init_id</k>
-                    <v>375</v>
+                    <v>373</v>
                 </e>
             </columnsizes>
             <dependencies>
@@ -37436,7 +37555,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>375</v>
+                                    <v>373</v>
                                 </b>
                             </bs>
                         </hist>
@@ -37452,7 +37571,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>375</v>
+                                    <v>373</v>
                                 </b>
                             </bs>
                         </hist>
@@ -37462,15 +37581,15 @@
         </relation>
         <relation>
             <name>if_then</name>
-            <cardinality>987388</cardinality>
+            <cardinality>987571</cardinality>
             <columnsizes>
                 <e>
                     <k>if_stmt</k>
-                    <v>987388</v>
+                    <v>987571</v>
                 </e>
                 <e>
                     <k>then_id</k>
-                    <v>987388</v>
+                    <v>987571</v>
                 </e>
             </columnsizes>
             <dependencies>
@@ -37484,7 +37603,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>987388</v>
+                                    <v>987571</v>
                                 </b>
                             </bs>
                         </hist>
@@ -37500,7 +37619,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>987388</v>
+                                    <v>987571</v>
                                 </b>
                             </bs>
                         </hist>
@@ -37510,15 +37629,15 @@
         </relation>
         <relation>
             <name>if_else</name>
-            <cardinality>467787</cardinality>
+            <cardinality>467752</cardinality>
             <columnsizes>
                 <e>
                     <k>if_stmt</k>
-                    <v>467787</v>
+                    <v>467752</v>
                 </e>
                 <e>
                     <k>else_id</k>
-                    <v>467787</v>
+                    <v>467752</v>
                 </e>
             </columnsizes>
             <dependencies>
@@ -37532,7 +37651,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>467787</v>
+                                    <v>467752</v>
                                 </b>
                             </bs>
                         </hist>
@@ -37548,7 +37667,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>467787</v>
+                                    <v>467752</v>
                                 </b>
                             </bs>
                         </hist>
@@ -37606,15 +37725,15 @@
         </relation>
         <relation>
             <name>constexpr_if_then</name>
-            <cardinality>103934</cardinality>
+            <cardinality>103537</cardinality>
             <columnsizes>
                 <e>
                     <k>constexpr_if_stmt</k>
-                    <v>103934</v>
+                    <v>103537</v>
                 </e>
                 <e>
                     <k>then_id</k>
-                    <v>103934</v>
+                    <v>103537</v>
                 </e>
             </columnsizes>
             <dependencies>
@@ -37628,7 +37747,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>103934</v>
+                                    <v>103537</v>
                                 </b>
                             </bs>
                         </hist>
@@ -37644,7 +37763,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>103934</v>
+                                    <v>103537</v>
                                 </b>
                             </bs>
                         </hist>
@@ -37654,15 +37773,15 @@
         </relation>
         <relation>
             <name>constexpr_if_else</name>
-            <cardinality>74042</cardinality>
+            <cardinality>73759</cardinality>
             <columnsizes>
                 <e>
                     <k>constexpr_if_stmt</k>
-                    <v>74042</v>
+                    <v>73759</v>
                 </e>
                 <e>
                     <k>else_id</k>
-                    <v>74042</v>
+                    <v>73759</v>
                 </e>
             </columnsizes>
             <dependencies>
@@ -37676,7 +37795,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>74042</v>
+                                    <v>73759</v>
                                 </b>
                             </bs>
                         </hist>
@@ -37692,7 +37811,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>74042</v>
+                                    <v>73759</v>
                                 </b>
                             </bs>
                         </hist>
@@ -37798,15 +37917,15 @@
         </relation>
         <relation>
             <name>while_body</name>
-            <cardinality>39534</cardinality>
+            <cardinality>39542</cardinality>
             <columnsizes>
                 <e>
                     <k>while_stmt</k>
-                    <v>39534</v>
+                    <v>39542</v>
                 </e>
                 <e>
                     <k>body_id</k>
-                    <v>39534</v>
+                    <v>39542</v>
                 </e>
             </columnsizes>
             <dependencies>
@@ -37820,7 +37939,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>39534</v>
+                                    <v>39542</v>
                                 </b>
                             </bs>
                         </hist>
@@ -37836,7 +37955,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>39534</v>
+                                    <v>39542</v>
                                 </b>
                             </bs>
                         </hist>
@@ -37846,15 +37965,15 @@
         </relation>
         <relation>
             <name>do_body</name>
-            <cardinality>232974</cardinality>
+            <cardinality>233017</cardinality>
             <columnsizes>
                 <e>
                     <k>do_stmt</k>
-                    <v>232974</v>
+                    <v>233017</v>
                 </e>
                 <e>
                     <k>body_id</k>
-                    <v>232974</v>
+                    <v>233017</v>
                 </e>
             </columnsizes>
             <dependencies>
@@ -37868,7 +37987,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>232974</v>
+                                    <v>233017</v>
                                 </b>
                             </bs>
                         </hist>
@@ -37884,7 +38003,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>232974</v>
+                                    <v>233017</v>
                                 </b>
                             </bs>
                         </hist>
@@ -37942,11 +38061,11 @@
         </relation>
         <relation>
             <name>switch_case</name>
-            <cardinality>894840</cardinality>
+            <cardinality>894773</cardinality>
             <columnsizes>
                 <e>
                     <k>switch_stmt</k>
-                    <v>440777</v>
+                    <v>440744</v>
                 </e>
                 <e>
                     <k>index</k>
@@ -37954,7 +38073,7 @@
                 </e>
                 <e>
                     <k>case_id</k>
-                    <v>894840</v>
+                    <v>894773</v>
                 </e>
             </columnsizes>
             <dependencies>
@@ -37973,7 +38092,7 @@
                                 <b>
                                     <a>2</a>
                                     <b>3</b>
-                                    <v>437691</v>
+                                    <v>437658</v>
                                 </b>
                                 <b>
                                     <a>3</a>
@@ -37999,7 +38118,7 @@
                                 <b>
                                     <a>2</a>
                                     <b>3</b>
-                                    <v>437691</v>
+                                    <v>437658</v>
                                 </b>
                                 <b>
                                     <a>3</a>
@@ -38162,7 +38281,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>894840</v>
+                                    <v>894773</v>
                                 </b>
                             </bs>
                         </hist>
@@ -38178,7 +38297,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>894840</v>
+                                    <v>894773</v>
                                 </b>
                             </bs>
                         </hist>
@@ -38188,15 +38307,15 @@
         </relation>
         <relation>
             <name>switch_body</name>
-            <cardinality>440777</cardinality>
+            <cardinality>440744</cardinality>
             <columnsizes>
                 <e>
                     <k>switch_stmt</k>
-                    <v>440777</v>
+                    <v>440744</v>
                 </e>
                 <e>
                     <k>body_id</k>
-                    <v>440777</v>
+                    <v>440744</v>
                 </e>
             </columnsizes>
             <dependencies>
@@ -38210,7 +38329,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>440777</v>
+                                    <v>440744</v>
                                 </b>
                             </bs>
                         </hist>
@@ -38226,7 +38345,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>440777</v>
+                                    <v>440744</v>
                                 </b>
                             </bs>
                         </hist>
@@ -38236,15 +38355,15 @@
         </relation>
         <relation>
             <name>for_initialization</name>
-            <cardinality>73036</cardinality>
+            <cardinality>73050</cardinality>
             <columnsizes>
                 <e>
                     <k>for_stmt</k>
-                    <v>73036</v>
+                    <v>73050</v>
                 </e>
                 <e>
                     <k>init_id</k>
-                    <v>73036</v>
+                    <v>73050</v>
                 </e>
             </columnsizes>
             <dependencies>
@@ -38258,7 +38377,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>73036</v>
+                                    <v>73050</v>
                                 </b>
                             </bs>
                         </hist>
@@ -38274,7 +38393,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>73036</v>
+                                    <v>73050</v>
                                 </b>
                             </bs>
                         </hist>
@@ -38284,15 +38403,15 @@
         </relation>
         <relation>
             <name>for_condition</name>
-            <cardinality>76123</cardinality>
+            <cardinality>76137</cardinality>
             <columnsizes>
                 <e>
                     <k>for_stmt</k>
-                    <v>76123</v>
+                    <v>76137</v>
                 </e>
                 <e>
                     <k>condition_id</k>
-                    <v>76123</v>
+                    <v>76137</v>
                 </e>
             </columnsizes>
             <dependencies>
@@ -38306,7 +38425,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>76123</v>
+                                    <v>76137</v>
                                 </b>
                             </bs>
                         </hist>
@@ -38322,7 +38441,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>76123</v>
+                                    <v>76137</v>
                                 </b>
                             </bs>
                         </hist>
@@ -38332,15 +38451,15 @@
         </relation>
         <relation>
             <name>for_update</name>
-            <cardinality>73177</cardinality>
+            <cardinality>73190</cardinality>
             <columnsizes>
                 <e>
                     <k>for_stmt</k>
-                    <v>73177</v>
+                    <v>73190</v>
                 </e>
                 <e>
                     <k>update_id</k>
-                    <v>73177</v>
+                    <v>73190</v>
                 </e>
             </columnsizes>
             <dependencies>
@@ -38354,7 +38473,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>73177</v>
+                                    <v>73190</v>
                                 </b>
                             </bs>
                         </hist>
@@ -38370,7 +38489,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>73177</v>
+                                    <v>73190</v>
                                 </b>
                             </bs>
                         </hist>
@@ -38380,15 +38499,15 @@
         </relation>
         <relation>
             <name>for_body</name>
-            <cardinality>84148</cardinality>
+            <cardinality>84163</cardinality>
             <columnsizes>
                 <e>
                     <k>for_stmt</k>
-                    <v>84148</v>
+                    <v>84163</v>
                 </e>
                 <e>
                     <k>body_id</k>
-                    <v>84148</v>
+                    <v>84163</v>
                 </e>
             </columnsizes>
             <dependencies>
@@ -38402,7 +38521,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>84148</v>
+                                    <v>84163</v>
                                 </b>
                             </bs>
                         </hist>
@@ -38418,7 +38537,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>84148</v>
+                                    <v>84163</v>
                                 </b>
                             </bs>
                         </hist>
@@ -38428,19 +38547,19 @@
         </relation>
         <relation>
             <name>stmtparents</name>
-            <cardinality>5523824</cardinality>
+            <cardinality>5509818</cardinality>
             <columnsizes>
                 <e>
                     <k>id</k>
-                    <v>5523824</v>
+                    <v>5509818</v>
                 </e>
                 <e>
                     <k>index</k>
-                    <v>16765</v>
+                    <v>16722</v>
                 </e>
                 <e>
                     <k>parent</k>
-                    <v>2342363</v>
+                    <v>2336424</v>
                 </e>
             </columnsizes>
             <dependencies>
@@ -38454,7 +38573,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>5523824</v>
+                                    <v>5509818</v>
                                 </b>
                             </bs>
                         </hist>
@@ -38470,7 +38589,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>5523824</v>
+                                    <v>5509818</v>
                                 </b>
                             </bs>
                         </hist>
@@ -38486,52 +38605,52 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>5507</v>
+                                    <v>5493</v>
                                 </b>
                                 <b>
                                     <a>2</a>
                                     <b>3</b>
-                                    <v>1372</v>
+                                    <v>1369</v>
                                 </b>
                                 <b>
                                     <a>3</a>
                                     <b>4</b>
-                                    <v>302</v>
+                                    <v>301</v>
                                 </b>
                                 <b>
                                     <a>4</a>
                                     <b>5</b>
-                                    <v>2132</v>
+                                    <v>2126</v>
                                 </b>
                                 <b>
                                     <a>7</a>
                                     <b>8</b>
-                                    <v>1398</v>
+                                    <v>1394</v>
                                 </b>
                                 <b>
                                     <a>8</a>
                                     <b>12</b>
-                                    <v>1087</v>
+                                    <v>1084</v>
                                 </b>
                                 <b>
                                     <a>12</a>
                                     <b>29</b>
-                                    <v>1476</v>
+                                    <v>1472</v>
                                 </b>
                                 <b>
                                     <a>29</a>
                                     <b>38</b>
-                                    <v>1260</v>
+                                    <v>1257</v>
                                 </b>
                                 <b>
                                     <a>41</a>
                                     <b>77</b>
-                                    <v>1269</v>
+                                    <v>1265</v>
                                 </b>
                                 <b>
                                     <a>77</a>
                                     <b>195079</b>
-                                    <v>958</v>
+                                    <v>955</v>
                                 </b>
                             </bs>
                         </hist>
@@ -38547,52 +38666,52 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>5507</v>
+                                    <v>5493</v>
                                 </b>
                                 <b>
                                     <a>2</a>
                                     <b>3</b>
-                                    <v>1372</v>
+                                    <v>1369</v>
                                 </b>
                                 <b>
                                     <a>3</a>
                                     <b>4</b>
-                                    <v>302</v>
+                                    <v>301</v>
                                 </b>
                                 <b>
                                     <a>4</a>
                                     <b>5</b>
-                                    <v>2132</v>
+                                    <v>2126</v>
                                 </b>
                                 <b>
                                     <a>7</a>
                                     <b>8</b>
-                                    <v>1398</v>
+                                    <v>1394</v>
                                 </b>
                                 <b>
                                     <a>8</a>
                                     <b>12</b>
-                                    <v>1087</v>
+                                    <v>1084</v>
                                 </b>
                                 <b>
                                     <a>12</a>
                                     <b>29</b>
-                                    <v>1476</v>
+                                    <v>1472</v>
                                 </b>
                                 <b>
                                     <a>29</a>
                                     <b>38</b>
-                                    <v>1260</v>
+                                    <v>1257</v>
                                 </b>
                                 <b>
                                     <a>41</a>
                                     <b>77</b>
-                                    <v>1269</v>
+                                    <v>1265</v>
                                 </b>
                                 <b>
                                     <a>77</a>
                                     <b>195079</b>
-                                    <v>958</v>
+                                    <v>955</v>
                                 </b>
                             </bs>
                         </hist>
@@ -38608,32 +38727,32 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>1344445</v>
+                                    <v>1341036</v>
                                 </b>
                                 <b>
                                     <a>2</a>
                                     <b>3</b>
-                                    <v>507773</v>
+                                    <v>506485</v>
                                 </b>
                                 <b>
                                     <a>3</a>
                                     <b>4</b>
-                                    <v>144118</v>
+                                    <v>143753</v>
                                 </b>
                                 <b>
                                     <a>4</a>
                                     <b>6</b>
-                                    <v>151422</v>
+                                    <v>151038</v>
                                 </b>
                                 <b>
                                     <a>6</a>
                                     <b>16</b>
-                                    <v>175775</v>
+                                    <v>175329</v>
                                 </b>
                                 <b>
                                     <a>16</a>
                                     <b>1943</b>
-                                    <v>18828</v>
+                                    <v>18780</v>
                                 </b>
                             </bs>
                         </hist>
@@ -38649,32 +38768,32 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>1344445</v>
+                                    <v>1341036</v>
                                 </b>
                                 <b>
                                     <a>2</a>
                                     <b>3</b>
-                                    <v>507773</v>
+                                    <v>506485</v>
                                 </b>
                                 <b>
                                     <a>3</a>
                                     <b>4</b>
-                                    <v>144118</v>
+                                    <v>143753</v>
                                 </b>
                                 <b>
                                     <a>4</a>
                                     <b>6</b>
-                                    <v>151422</v>
+                                    <v>151038</v>
                                 </b>
                                 <b>
                                     <a>6</a>
                                     <b>16</b>
-                                    <v>175775</v>
+                                    <v>175329</v>
                                 </b>
                                 <b>
                                     <a>16</a>
                                     <b>1943</b>
-                                    <v>18828</v>
+                                    <v>18780</v>
                                 </b>
                             </bs>
                         </hist>
@@ -38684,30 +38803,30 @@
         </relation>
         <relation>
             <name>ishandler</name>
-            <cardinality>47389</cardinality>
+            <cardinality>47330</cardinality>
             <columnsizes>
                 <e>
                     <k>block</k>
-                    <v>47389</v>
+                    <v>47330</v>
                 </e>
             </columnsizes>
             <dependencies/>
         </relation>
         <relation>
             <name>stmt_decl_bind</name>
-            <cardinality>730244</cardinality>
+            <cardinality>723033</cardinality>
             <columnsizes>
                 <e>
                     <k>stmt</k>
-                    <v>689803</v>
+                    <v>682992</v>
                 </e>
                 <e>
                     <k>num</k>
-                    <v>125</v>
+                    <v>124</v>
                 </e>
                 <e>
                     <k>decl</k>
-                    <v>730175</v>
+                    <v>722965</v>
                 </e>
             </columnsizes>
             <dependencies>
@@ -38721,12 +38840,12 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>667590</v>
+                                    <v>660998</v>
                                 </b>
                                 <b>
                                     <a>2</a>
                                     <b>32</b>
-                                    <v>22212</v>
+                                    <v>21993</v>
                                 </b>
                             </bs>
                         </hist>
@@ -38742,12 +38861,12 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>667590</v>
+                                    <v>660998</v>
                                 </b>
                                 <b>
                                     <a>2</a>
                                     <b>32</b>
-                                    <v>22212</v>
+                                    <v>21993</v>
                                 </b>
                             </bs>
                         </hist>
@@ -38885,7 +39004,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>730151</v>
+                                    <v>722941</v>
                                 </b>
                                 <b>
                                     <a>2</a>
@@ -38906,7 +39025,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>730175</v>
+                                    <v>722965</v>
                                 </b>
                             </bs>
                         </hist>
@@ -38916,19 +39035,19 @@
         </relation>
         <relation>
             <name>stmt_decl_entry_bind</name>
-            <cardinality>730244</cardinality>
+            <cardinality>723033</cardinality>
             <columnsizes>
                 <e>
                     <k>stmt</k>
-                    <v>689803</v>
+                    <v>682992</v>
                 </e>
                 <e>
                     <k>num</k>
-                    <v>125</v>
+                    <v>124</v>
                 </e>
                 <e>
                     <k>decl_entry</k>
-                    <v>730244</v>
+                    <v>723033</v>
                 </e>
             </columnsizes>
             <dependencies>
@@ -38942,12 +39061,12 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>667590</v>
+                                    <v>660998</v>
                                 </b>
                                 <b>
                                     <a>2</a>
                                     <b>32</b>
-                                    <v>22212</v>
+                                    <v>21993</v>
                                 </b>
                             </bs>
                         </hist>
@@ -38963,12 +39082,12 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>667590</v>
+                                    <v>660998</v>
                                 </b>
                                 <b>
                                     <a>2</a>
                                     <b>32</b>
-                                    <v>22212</v>
+                                    <v>21993</v>
                                 </b>
                             </bs>
                         </hist>
@@ -39106,7 +39225,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>730244</v>
+                                    <v>723033</v>
                                 </b>
                             </bs>
                         </hist>
@@ -39122,7 +39241,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>730244</v>
+                                    <v>723033</v>
                                 </b>
                             </bs>
                         </hist>
@@ -39132,15 +39251,15 @@
         </relation>
         <relation>
             <name>blockscope</name>
-            <cardinality>1764517</cardinality>
+            <cardinality>1757769</cardinality>
             <columnsizes>
                 <e>
                     <k>block</k>
-                    <v>1764517</v>
+                    <v>1757769</v>
                 </e>
                 <e>
                     <k>enclosing</k>
-                    <v>1509119</v>
+                    <v>1503348</v>
                 </e>
             </columnsizes>
             <dependencies>
@@ -39154,7 +39273,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>1764517</v>
+                                    <v>1757769</v>
                                 </b>
                             </bs>
                         </hist>
@@ -39170,17 +39289,17 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>1337771</v>
+                                    <v>1332655</v>
                                 </b>
                                 <b>
                                     <a>2</a>
                                     <b>3</b>
-                                    <v>128699</v>
+                                    <v>128207</v>
                                 </b>
                                 <b>
                                     <a>3</a>
                                     <b>28</b>
-                                    <v>42649</v>
+                                    <v>42486</v>
                                 </b>
                             </bs>
                         </hist>
@@ -39190,19 +39309,19 @@
         </relation>
         <relation>
             <name>jumpinfo</name>
-            <cardinality>347327</cardinality>
+            <cardinality>347391</cardinality>
             <columnsizes>
                 <e>
                     <k>id</k>
-                    <v>347327</v>
+                    <v>347391</v>
                 </e>
                 <e>
                     <k>str</k>
-                    <v>28866</v>
+                    <v>28871</v>
                 </e>
                 <e>
                     <k>target</k>
-                    <v>72498</v>
+                    <v>72512</v>
                 </e>
             </columnsizes>
             <dependencies>
@@ -39216,7 +39335,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>347327</v>
+                                    <v>347391</v>
                                 </b>
                             </bs>
                         </hist>
@@ -39232,7 +39351,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>347327</v>
+                                    <v>347391</v>
                                 </b>
                             </bs>
                         </hist>
@@ -39248,12 +39367,12 @@
                                 <b>
                                     <a>2</a>
                                     <b>3</b>
-                                    <v>13558</v>
+                                    <v>13560</v>
                                 </b>
                                 <b>
                                     <a>3</a>
                                     <b>4</b>
-                                    <v>6041</v>
+                                    <v>6042</v>
                                 </b>
                                 <b>
                                     <a>4</a>
@@ -39268,7 +39387,7 @@
                                 <b>
                                     <a>6</a>
                                     <b>10</b>
-                                    <v>2191</v>
+                                    <v>2192</v>
                                 </b>
                                 <b>
                                     <a>10</a>
@@ -39278,7 +39397,7 @@
                                 <b>
                                     <a>25</a>
                                     <b>13711</b>
-                                    <v>999</v>
+                                    <v>1000</v>
                                 </b>
                             </bs>
                         </hist>
@@ -39294,17 +39413,17 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>23124</v>
+                                    <v>23128</v>
                                 </b>
                                 <b>
                                     <a>2</a>
                                     <b>3</b>
-                                    <v>3616</v>
+                                    <v>3617</v>
                                 </b>
                                 <b>
                                     <a>3</a>
                                     <b>3321</b>
-                                    <v>2124</v>
+                                    <v>2125</v>
                                 </b>
                             </bs>
                         </hist>
@@ -39325,27 +39444,27 @@
                                 <b>
                                     <a>2</a>
                                     <b>3</b>
-                                    <v>36107</v>
+                                    <v>36114</v>
                                 </b>
                                 <b>
                                     <a>3</a>
                                     <b>4</b>
-                                    <v>17583</v>
+                                    <v>17586</v>
                                 </b>
                                 <b>
                                     <a>4</a>
                                     <b>5</b>
-                                    <v>7358</v>
+                                    <v>7359</v>
                                 </b>
                                 <b>
                                     <a>5</a>
                                     <b>8</b>
-                                    <v>6399</v>
+                                    <v>6401</v>
                                 </b>
                                 <b>
                                     <a>8</a>
                                     <b>2124</b>
-                                    <v>5016</v>
+                                    <v>5017</v>
                                 </b>
                             </bs>
                         </hist>
@@ -39361,7 +39480,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>72498</v>
+                                    <v>72512</v>
                                 </b>
                             </bs>
                         </hist>
@@ -39371,19 +39490,19 @@
         </relation>
         <relation>
             <name>preprocdirects</name>
-            <cardinality>5407616</cardinality>
+            <cardinality>5386937</cardinality>
             <columnsizes>
                 <e>
                     <k>id</k>
-                    <v>5407616</v>
+                    <v>5386937</v>
                 </e>
                 <e>
                     <k>kind</k>
-                    <v>1375</v>
+                    <v>1370</v>
                 </e>
                 <e>
                     <k>location</k>
-                    <v>5404364</v>
+                    <v>5383698</v>
                 </e>
             </columnsizes>
             <dependencies>
@@ -39397,7 +39516,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>5407616</v>
+                                    <v>5386937</v>
                                 </b>
                             </bs>
                         </hist>
@@ -39413,7 +39532,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>5407616</v>
+                                    <v>5386937</v>
                                 </b>
                             </bs>
                         </hist>
@@ -39429,57 +39548,57 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>125</v>
+                                    <v>124</v>
                                 </b>
                                 <b>
                                     <a>145</a>
                                     <b>146</b>
-                                    <v>125</v>
+                                    <v>124</v>
                                 </b>
                                 <b>
                                     <a>808</a>
                                     <b>809</b>
-                                    <v>125</v>
+                                    <v>124</v>
                                 </b>
                                 <b>
                                     <a>866</a>
                                     <b>867</b>
-                                    <v>125</v>
+                                    <v>124</v>
                                 </b>
                                 <b>
                                     <a>973</a>
                                     <b>974</b>
-                                    <v>125</v>
+                                    <v>124</v>
                                 </b>
                                 <b>
                                     <a>1509</a>
                                     <b>1510</b>
-                                    <v>125</v>
+                                    <v>124</v>
                                 </b>
                                 <b>
                                     <a>1891</a>
                                     <b>1892</b>
-                                    <v>125</v>
+                                    <v>124</v>
                                 </b>
                                 <b>
                                     <a>3256</a>
                                     <b>3257</b>
-                                    <v>125</v>
+                                    <v>124</v>
                                 </b>
                                 <b>
                                     <a>4714</a>
                                     <b>4715</b>
-                                    <v>125</v>
+                                    <v>124</v>
                                 </b>
                                 <b>
                                     <a>7089</a>
                                     <b>7090</b>
-                                    <v>125</v>
+                                    <v>124</v>
                                 </b>
                                 <b>
                                     <a>21984</a>
                                     <b>21985</b>
-                                    <v>125</v>
+                                    <v>124</v>
                                 </b>
                             </bs>
                         </hist>
@@ -39495,57 +39614,57 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>125</v>
+                                    <v>124</v>
                                 </b>
                                 <b>
                                     <a>145</a>
                                     <b>146</b>
-                                    <v>125</v>
+                                    <v>124</v>
                                 </b>
                                 <b>
                                     <a>808</a>
                                     <b>809</b>
-                                    <v>125</v>
+                                    <v>124</v>
                                 </b>
                                 <b>
                                     <a>866</a>
                                     <b>867</b>
-                                    <v>125</v>
+                                    <v>124</v>
                                 </b>
                                 <b>
                                     <a>973</a>
                                     <b>974</b>
-                                    <v>125</v>
+                                    <v>124</v>
                                 </b>
                                 <b>
                                     <a>1509</a>
                                     <b>1510</b>
-                                    <v>125</v>
+                                    <v>124</v>
                                 </b>
                                 <b>
                                     <a>1891</a>
                                     <b>1892</b>
-                                    <v>125</v>
+                                    <v>124</v>
                                 </b>
                                 <b>
                                     <a>3256</a>
                                     <b>3257</b>
-                                    <v>125</v>
+                                    <v>124</v>
                                 </b>
                                 <b>
                                     <a>4714</a>
                                     <b>4715</b>
-                                    <v>125</v>
+                                    <v>124</v>
                                 </b>
                                 <b>
                                     <a>7089</a>
                                     <b>7090</b>
-                                    <v>125</v>
+                                    <v>124</v>
                                 </b>
                                 <b>
                                     <a>21958</a>
                                     <b>21959</b>
-                                    <v>125</v>
+                                    <v>124</v>
                                 </b>
                             </bs>
                         </hist>
@@ -39561,12 +39680,12 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>5404239</v>
+                                    <v>5383573</v>
                                 </b>
                                 <b>
                                     <a>27</a>
                                     <b>28</b>
-                                    <v>125</v>
+                                    <v>124</v>
                                 </b>
                             </bs>
                         </hist>
@@ -39582,7 +39701,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>5404364</v>
+                                    <v>5383698</v>
                                 </b>
                             </bs>
                         </hist>
@@ -39592,15 +39711,15 @@
         </relation>
         <relation>
             <name>preprocpair</name>
-            <cardinality>1141282</cardinality>
+            <cardinality>1136918</cardinality>
             <columnsizes>
                 <e>
                     <k>begin</k>
-                    <v>886636</v>
+                    <v>883245</v>
                 </e>
                 <e>
                     <k>elseelifend</k>
-                    <v>1141282</v>
+                    <v>1136918</v>
                 </e>
             </columnsizes>
             <dependencies>
@@ -39614,17 +39733,17 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>645622</v>
+                                    <v>643153</v>
                                 </b>
                                 <b>
                                     <a>2</a>
                                     <b>3</b>
-                                    <v>231383</v>
+                                    <v>230498</v>
                                 </b>
                                 <b>
                                     <a>3</a>
                                     <b>9</b>
-                                    <v>9630</v>
+                                    <v>9593</v>
                                 </b>
                             </bs>
                         </hist>
@@ -39640,7 +39759,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>1141282</v>
+                                    <v>1136918</v>
                                 </b>
                             </bs>
                         </hist>
@@ -39650,41 +39769,41 @@
         </relation>
         <relation>
             <name>preproctrue</name>
-            <cardinality>437752</cardinality>
+            <cardinality>436078</cardinality>
             <columnsizes>
                 <e>
                     <k>branch</k>
-                    <v>437752</v>
+                    <v>436078</v>
                 </e>
             </columnsizes>
             <dependencies/>
         </relation>
         <relation>
             <name>preprocfalse</name>
-            <cardinality>284664</cardinality>
+            <cardinality>283575</cardinality>
             <columnsizes>
                 <e>
                     <k>branch</k>
-                    <v>284664</v>
+                    <v>283575</v>
                 </e>
             </columnsizes>
             <dependencies/>
         </relation>
         <relation>
             <name>preproctext</name>
-            <cardinality>4352508</cardinality>
+            <cardinality>4335864</cardinality>
             <columnsizes>
                 <e>
                     <k>id</k>
-                    <v>4352508</v>
+                    <v>4335864</v>
                 </e>
                 <e>
                     <k>head</k>
-                    <v>2954828</v>
+                    <v>2943528</v>
                 </e>
                 <e>
                     <k>body</k>
-                    <v>1681344</v>
+                    <v>1674914</v>
                 </e>
             </columnsizes>
             <dependencies>
@@ -39698,7 +39817,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>4352508</v>
+                                    <v>4335864</v>
                                 </b>
                             </bs>
                         </hist>
@@ -39714,7 +39833,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>4352508</v>
+                                    <v>4335864</v>
                                 </b>
                             </bs>
                         </hist>
@@ -39730,12 +39849,12 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>2758089</v>
+                                    <v>2747542</v>
                                 </b>
                                 <b>
                                     <a>2</a>
                                     <b>798</b>
-                                    <v>196738</v>
+                                    <v>195986</v>
                                 </b>
                             </bs>
                         </hist>
@@ -39751,12 +39870,12 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>2875157</v>
+                                    <v>2864162</v>
                                 </b>
                                 <b>
                                     <a>2</a>
                                     <b>5</b>
-                                    <v>79670</v>
+                                    <v>79366</v>
                                 </b>
                             </bs>
                         </hist>
@@ -39772,17 +39891,17 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>1532758</v>
+                                    <v>1526897</v>
                                 </b>
                                 <b>
                                     <a>2</a>
                                     <b>10</b>
-                                    <v>127698</v>
+                                    <v>127210</v>
                                 </b>
                                 <b>
                                     <a>10</a>
                                     <b>13579</b>
-                                    <v>20887</v>
+                                    <v>20807</v>
                                 </b>
                             </bs>
                         </hist>
@@ -39798,17 +39917,17 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>1537010</v>
+                                    <v>1531133</v>
                                 </b>
                                 <b>
                                     <a>2</a>
                                     <b>12</b>
-                                    <v>127323</v>
+                                    <v>126836</v>
                                 </b>
                                 <b>
                                     <a>12</a>
                                     <b>3231</b>
-                                    <v>17009</v>
+                                    <v>16944</v>
                                 </b>
                             </bs>
                         </hist>
@@ -39818,15 +39937,15 @@
         </relation>
         <relation>
             <name>includes</name>
-            <cardinality>406823</cardinality>
+            <cardinality>397814</cardinality>
             <columnsizes>
                 <e>
                     <k>id</k>
-                    <v>406823</v>
+                    <v>397814</v>
                 </e>
                 <e>
                     <k>included</k>
-                    <v>74940</v>
+                    <v>73280</v>
                 </e>
             </columnsizes>
             <dependencies>
@@ -39840,7 +39959,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>406823</v>
+                                    <v>397814</v>
                                 </b>
                             </bs>
                         </hist>
@@ -39856,37 +39975,37 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>37085</v>
+                                    <v>36264</v>
                                 </b>
                                 <b>
                                     <a>2</a>
                                     <b>3</b>
-                                    <v>12056</v>
+                                    <v>11789</v>
                                 </b>
                                 <b>
                                     <a>3</a>
                                     <b>4</b>
-                                    <v>6324</v>
+                                    <v>6184</v>
                                 </b>
                                 <b>
                                     <a>4</a>
                                     <b>6</b>
-                                    <v>6837</v>
+                                    <v>6685</v>
                                 </b>
                                 <b>
                                     <a>6</a>
                                     <b>11</b>
-                                    <v>5771</v>
+                                    <v>5644</v>
                                 </b>
                                 <b>
                                     <a>11</a>
                                     <b>47</b>
-                                    <v>5623</v>
+                                    <v>5499</v>
                                 </b>
                                 <b>
                                     <a>47</a>
                                     <b>793</b>
-                                    <v>1240</v>
+                                    <v>1213</v>
                                 </b>
                             </bs>
                         </hist>
@@ -39896,15 +40015,15 @@
         </relation>
         <relation>
             <name>link_targets</name>
-            <cardinality>943</cardinality>
+            <cardinality>923</cardinality>
             <columnsizes>
                 <e>
                     <k>id</k>
-                    <v>943</v>
+                    <v>923</v>
                 </e>
                 <e>
                     <k>binary</k>
-                    <v>943</v>
+                    <v>923</v>
                 </e>
             </columnsizes>
             <dependencies>
@@ -39918,7 +40037,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>943</v>
+                                    <v>923</v>
                                 </b>
                             </bs>
                         </hist>
@@ -39934,7 +40053,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>943</v>
+                                    <v>923</v>
                                 </b>
                             </bs>
                         </hist>
@@ -39944,11 +40063,11 @@
         </relation>
         <relation>
             <name>link_parent</name>
-            <cardinality>38129861</cardinality>
+            <cardinality>38113713</cardinality>
             <columnsizes>
                 <e>
                     <k>element</k>
-                    <v>4849837</v>
+                    <v>4847511</v>
                 </e>
                 <e>
                     <k>link_target</k>
@@ -39966,17 +40085,17 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>665798</v>
+                                    <v>665224</v>
                                 </b>
                                 <b>
                                     <a>2</a>
                                     <b>9</b>
-                                    <v>33828</v>
+                                    <v>33795</v>
                                 </b>
                                 <b>
                                     <a>9</a>
                                     <b>10</b>
-                                    <v>4150209</v>
+                                    <v>4148491</v>
                                 </b>
                             </bs>
                         </hist>
@@ -39995,48 +40114,48 @@
                                     <v>42</v>
                                 </b>
                                 <b>
-                                    <a>97300</a>
-                                    <b>97301</b>
+                                    <a>97356</a>
+                                    <b>97357</b>
                                     <v>42</v>
                                 </b>
                                 <b>
-                                    <a>97419</a>
-                                    <b>97420</b>
+                                    <a>97475</a>
+                                    <b>97476</b>
                                     <v>42</v>
                                 </b>
                                 <b>
-                                    <a>97472</a>
-                                    <b>97473</b>
+                                    <a>97528</a>
+                                    <b>97529</b>
                                     <v>42</v>
                                 </b>
                                 <b>
-                                    <a>97499</a>
-                                    <b>97500</b>
+                                    <a>97555</a>
+                                    <b>97556</b>
                                     <v>42</v>
                                 </b>
                                 <b>
-                                    <a>97521</a>
-                                    <b>97522</b>
+                                    <a>97577</a>
+                                    <b>97578</b>
                                     <v>42</v>
                                 </b>
                                 <b>
-                                    <a>97553</a>
-                                    <b>97554</b>
+                                    <a>97609</a>
+                                    <b>97610</b>
                                     <v>42</v>
                                 </b>
                                 <b>
-                                    <a>99560</a>
-                                    <b>99561</b>
+                                    <a>99616</a>
+                                    <b>99617</b>
                                     <v>42</v>
                                 </b>
                                 <b>
-                                    <a>102940</a>
-                                    <b>102941</b>
+                                    <a>102996</a>
+                                    <b>102997</b>
                                     <v>42</v>
                                 </b>
                                 <b>
-                                    <a>104302</a>
-                                    <b>104303</b>
+                                    <a>104360</a>
+                                    <b>104361</b>
                                     <v>42</v>
                                 </b>
                             </bs>
diff --git a/cpp/ql/lib/upgrades/9a7c3c14c1076f64b871719117a558733d987b48/old.dbscheme b/cpp/ql/lib/upgrades/9a7c3c14c1076f64b871719117a558733d987b48/old.dbscheme
new file mode 100644
index 00000000000..9a7c3c14c10
--- /dev/null
+++ b/cpp/ql/lib/upgrades/9a7c3c14c1076f64b871719117a558733d987b48/old.dbscheme
@@ -0,0 +1,2491 @@
+
+/**
+ * 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
+);
+
+/**
+ * Optionally, record the build mode for each compilation.
+ */
+compilation_build_mode(
+    unique int id : @compilation ref,
+    int mode : int ref
+);
+
+/*
+case @compilation_build_mode.mode of
+  0 = @build_mode_none
+| 1 = @build_mode_manual
+| 2 = @build_mode_auto
+;
+*/
+
+/**
+ * The source files that are compiled by a compiler invocation.
+ * If `id` is for the compiler invocation
+ *
+ *   gcc -c f1.c f2.c f3.c
+ *
+ * then there will be rows for
+ *
+ * num | arg
+ * --- | ---
+ * 0   | f1.c
+ * 1   | f2.c
+ * 2   | f3.c
+ *
+ * Note that even if those files `#include` headers, those headers
+ * do not appear as rows.
+ */
+#keyset[id, num]
+compilation_compiling_files(
+    int id : @compilation ref,
+    int num : int ref,
+    int file : @file ref
+);
+
+/**
+ * The time taken by the extractor for a compiler invocation.
+ *
+ * For each file `num`, there will be rows for
+ *
+ * kind | seconds
+ * ---- | ---
+ * 1    | CPU seconds used by the extractor frontend
+ * 2    | Elapsed seconds during the extractor frontend
+ * 3    | CPU seconds used by the extractor backend
+ * 4    | Elapsed seconds during the extractor backend
+ */
+#keyset[id, num, kind]
+compilation_time(
+    int id : @compilation ref,
+    int num : int ref,
+    /* kind:
+       1 = frontend_cpu_seconds
+       2 = frontend_elapsed_seconds
+       3 = extractor_cpu_seconds
+       4 = extractor_elapsed_seconds
+    */
+    int kind : int ref,
+    float seconds : float ref
+);
+
+/**
+ * An error or warning generated by the extractor.
+ * The diagnostic message `diagnostic` was generated during compiler
+ * invocation `compilation`, and is the `file_number_diagnostic_number`th
+ * message generated while extracting the `file_number`th file of that
+ * invocation.
+ */
+#keyset[compilation, file_number, file_number_diagnostic_number]
+diagnostic_for(
+    int diagnostic : @diagnostic ref,
+    int compilation : @compilation ref,
+    int file_number : int ref,
+    int file_number_diagnostic_number : int ref
+);
+
+/**
+ * If extraction was successful, then `cpu_seconds` and
+ * `elapsed_seconds` are the CPU time and elapsed time (respectively)
+ * that extraction took for compiler invocation `id`.
+ */
+compilation_finished(
+    unique int id : @compilation ref,
+    float cpu_seconds : float ref,
+    float elapsed_seconds : float ref
+);
+
+
+/**
+ * External data, 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
+ */
+
+extractor_version(
+    string codeql_version: string ref,
+    string frontend_version: string ref
+)
+
+@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
+| 7 = @user_defined_literal
+| 8 = @deduction_guide
+;
+*/
+
+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
+);
+
+/*
+case @coroutine_placeholder_variable.kind of
+  1 = @handle
+| 2 = @promise
+| 3 = @init_await_resume
+;
+*/
+
+coroutine_placeholder_variable(
+  unique int placeholder_variable: @variable ref,
+  int kind: int ref,
+  int function: @function ref
+)
+
+/** The `new` function used for allocating the coroutine state, if any. */
+coroutine_new(
+  unique int function: @function ref,
+  int new: @function ref
+);
+
+/** The `delete` function used for deallocating the coroutine state, if any. */
+coroutine_delete(
+  unique int function: @function ref,
+  int delete: @function ref
+);
+
+purefunctions(unique int id: @function ref);
+
+function_deleted(unique int id: @function ref);
+
+function_defaulted(unique int id: @function ref);
+
+function_prototyped(unique int id: @function ref)
+
+deduction_guide_for_class(
+    int id: @function ref,
+    int class_template: @usertype ref
+)
+
+member_function_this_type(
+    unique int id: @function ref,
+    int this_type: @type ref
+);
+
+#keyset[id, type_id]
+fun_decls(
+    int id: @fun_decl,
+    int function: @function ref,
+    int type_id: @type ref,
+    string name: string ref,
+    int location: @location_default ref
+);
+fun_def(unique int id: @fun_decl ref);
+fun_specialized(unique int id: @fun_decl ref);
+fun_implicit(unique int id: @fun_decl ref);
+fun_decl_specifiers(
+    int id: @fun_decl ref,
+    string name: string ref
+)
+#keyset[fun_decl, index]
+fun_decl_throws(
+    int fun_decl: @fun_decl ref,
+    int index: int ref,
+    int type_id: @type ref
+);
+/* an empty throw specification is different from none */
+fun_decl_empty_throws(unique int fun_decl: @fun_decl ref);
+fun_decl_noexcept(
+    int fun_decl: @fun_decl ref,
+    int constant: @expr ref
+);
+fun_decl_empty_noexcept(int fun_decl: @fun_decl ref);
+fun_decl_typedef_type(
+    unique int fun_decl: @fun_decl ref,
+    int typedeftype_id: @usertype ref
+);
+
+/*
+case @fun_requires.kind of
+  1 = @template_attached
+| 2 = @function_attached
+;
+*/
+
+fun_requires(
+    int id: @fun_decl ref,
+    int kind: int ref,
+    int constraint: @expr ref
+);
+
+param_decl_bind(
+    unique int id: @var_decl ref,
+    int index: int ref,
+    int fun_decl: @fun_decl ref
+);
+
+#keyset[id, type_id]
+var_decls(
+    int id: @var_decl,
+    int variable: @variable ref,
+    int type_id: @type ref,
+    string name: string ref,
+    int location: @location_default ref
+);
+var_def(unique int id: @var_decl ref);
+var_specialized(int id: @var_decl ref);
+var_decl_specifiers(
+    int id: @var_decl ref,
+    string name: string ref
+)
+is_structured_binding(unique int id: @variable ref);
+var_requires(
+    int id: @var_decl ref,
+    int constraint: @expr ref
+);
+
+type_decls(
+    unique int id: @type_decl,
+    int type_id: @type ref,
+    int location: @location_default ref
+);
+type_def(unique int id: @type_decl ref);
+type_decl_top(
+    unique int type_decl: @type_decl ref
+);
+type_requires(
+    int id: @type_decl ref,
+    int constraint: @expr ref
+);
+
+namespace_decls(
+    unique int id: @namespace_decl,
+    int namespace_id: @namespace ref,
+    int location: @location_default ref,
+    int bodylocation: @location_default ref
+);
+
+case @using.kind of
+  1 = @using_declaration
+| 2 = @using_directive
+| 3 = @using_enum_declaration
+;
+
+usings(
+    unique int id: @using,
+    int element_id: @element ref,
+    int location: @location_default ref,
+    int kind: int ref
+);
+
+/** The element which contains the `using` declaration. */
+using_container(
+    int parent: @element ref,
+    int child: @using ref
+);
+
+static_asserts(
+    unique int id: @static_assert,
+    int condition : @expr ref,
+    string message : string ref,
+    int location: @location_default ref,
+    int enclosing : @element ref
+);
+
+// each function has an ordered list of parameters
+#keyset[id, type_id]
+#keyset[function, index, type_id]
+params(
+    int id: @parameter,
+    int function: @parameterized_element ref,
+    int index: int ref,
+    int type_id: @type ref
+);
+
+overrides(
+    int new: @function ref,
+    int old: @function ref
+);
+
+#keyset[id, type_id]
+membervariables(
+    int id: @membervariable,
+    int type_id: @type ref,
+    string name: string ref
+);
+
+#keyset[id, type_id]
+globalvariables(
+    int id: @globalvariable,
+    int type_id: @type ref,
+    string name: string ref
+);
+
+#keyset[id, type_id]
+localvariables(
+    int id: @localvariable,
+    int type_id: @type ref,
+    string name: string ref
+);
+
+autoderivation(
+    unique int var: @variable ref,
+    int derivation_type: @type ref
+);
+
+orphaned_variables(
+    int var: @localvariable ref,
+    int function: @function ref
+)
+
+enumconstants(
+    unique int id: @enumconstant,
+    int parent: @usertype ref,
+    int index: int ref,
+    int type_id: @type ref,
+    string name: string ref,
+    int location: @location_default ref
+);
+
+@variable = @localscopevariable | @globalvariable | @membervariable;
+
+@localscopevariable = @localvariable | @parameter;
+
+/**
+ * Built-in types are the fundamental types, e.g., integral, floating, and void.
+ */
+case @builtintype.kind of
+   1 = @errortype
+|  2 = @unknowntype
+|  3 = @void
+|  4 = @boolean
+|  5 = @char
+|  6 = @unsigned_char
+|  7 = @signed_char
+|  8 = @short
+|  9 = @unsigned_short
+| 10 = @signed_short
+| 11 = @int
+| 12 = @unsigned_int
+| 13 = @signed_int
+| 14 = @long
+| 15 = @unsigned_long
+| 16 = @signed_long
+| 17 = @long_long
+| 18 = @unsigned_long_long
+| 19 = @signed_long_long
+// ... 20 Microsoft-specific __int8
+// ... 21 Microsoft-specific __int16
+// ... 22 Microsoft-specific __int32
+// ... 23 Microsoft-specific __int64
+| 24 = @float
+| 25 = @double
+| 26 = @long_double
+| 27 = @complex_float         // C99-specific _Complex float
+| 28 = @complex_double        // C99-specific _Complex double
+| 29 = @complex_long_double   // C99-specific _Complex long double
+| 30 = @imaginary_float       // C99-specific _Imaginary float
+| 31 = @imaginary_double      // C99-specific _Imaginary double
+| 32 = @imaginary_long_double // C99-specific _Imaginary long double
+| 33 = @wchar_t               // Microsoft-specific
+| 34 = @decltype_nullptr      // C++11
+| 35 = @int128                // __int128
+| 36 = @unsigned_int128       // unsigned __int128
+| 37 = @signed_int128         // signed __int128
+| 38 = @float128              // __float128
+| 39 = @complex_float128      // _Complex __float128
+| 40 = @decimal32             // _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 or C23 `typeof`/`typeof_unqual`
+ * operator taking an expression as its argument.  For example:
+ * ```
+ * int a;
+ * decltype(1+a) b;
+ * typeof(1+a) c;
+ * ```
+ * Here `expr` is `1+a`.
+ *
+ * Sometimes an additional pair of parentheses around the expression
+ * changes the semantics of the decltype, e.g.
+ * ```
+ * struct A { double x; };
+ * const A* a = new A();
+ * decltype( a->x ); // type is double
+ * decltype((a->x)); // type is const double&
+ * ```
+ * (Please consult the C++11 standard for more details).
+ * `parentheses_would_change_meaning` is `true` iff that is the case.
+ */
+
+/*
+case @decltype.kind of
+|  0 = @decltype
+|  1 = @typeof // The frontend does not differentiate between typeof and typeof_unqual
+;
+*/
+
+#keyset[id, expr]
+decltypes(
+    int id: @decltype,
+    int expr: @expr ref,
+    int kind: int ref,
+    int base_type: @type ref,
+    boolean parentheses_would_change_meaning: boolean ref
+);
+
+/*
+case @type_operator.kind of
+|  0 = @typeof // The frontend does not differentiate between typeof and typeof_unqual
+|  1 = @underlying_type
+|  2 = @bases
+|  3 = @direct_bases
+|  4 = @add_lvalue_reference
+|  5 = @add_pointer
+|  6 = @add_rvalue_reference
+|  7 = @decay
+|  8 = @make_signed
+|  9 = @make_unsigned
+| 10 = @remove_all_extents
+| 11 = @remove_const
+| 12 = @remove_cv
+| 13 = @remove_cvref
+| 14 = @remove_extent
+| 15 = @remove_pointer
+| 16 = @remove_reference_t
+| 17 = @remove_restrict
+| 18 = @remove_volatile
+| 19 = @remove_reference
+;
+*/
+
+type_operators(
+    unique int id: @type_operator,
+    int arg_type: @type ref,
+    int kind: int ref,
+    int base_type: @type ref
+)
+
+/*
+case @usertype.kind of
+|  0 = @unknown_usertype
+|  1 = @struct
+|  2 = @class
+|  3 = @union
+|  4 = @enum
+// ... 5 = @typedef deprecated        // classic C: typedef typedef type name
+// ... 6 = @template deprecated
+|  7 = @template_parameter
+|  8 = @template_template_parameter
+|  9 = @proxy_class                   // a proxy class associated with a template parameter
+// ... 10 objc_class deprecated
+// ... 11 objc_protocol deprecated
+// ... 12 objc_category deprecated
+| 13 = @scoped_enum
+// ... 14 = @using_alias deprecated   // a using name = type style typedef
+| 15 = @template_struct
+| 16 = @template_class
+| 17 = @template_union
+| 18 = @alias
+;
+*/
+
+usertypes(
+    unique int id: @usertype,
+    string name: string ref,
+    int kind: int ref
+);
+
+usertypesize(
+    unique int id: @usertype ref,
+    int size: int ref,
+    int alignment: int ref
+);
+
+usertype_final(unique int id: @usertype ref);
+
+usertype_uuid(
+    unique int id: @usertype ref,
+    string uuid: string ref
+);
+
+/*
+case @usertype.alias_kind of
+| 0 = @typedef
+| 1 = @alias
+*/
+
+usertype_alias_kind(
+    int id: @usertype ref,
+    int alias_kind: int ref
+)
+
+nontype_template_parameters(
+    int id: @expr ref
+);
+
+type_template_type_constraint(
+    int id: @usertype ref,
+    int constraint: @expr ref
+);
+
+mangled_name(
+    unique int id: @declaration ref,
+    int mangled_name : @mangledname,
+    boolean is_complete: boolean ref
+);
+
+is_pod_class(unique int id: @usertype ref);
+is_standard_layout_class(unique int id: @usertype ref);
+
+is_complete(unique int id: @usertype ref);
+
+is_class_template(unique int id: @usertype ref);
+class_instantiation(
+    int to: @usertype ref,
+    int from: @usertype ref
+);
+class_template_argument(
+    int type_id: @usertype ref,
+    int index: int ref,
+    int arg_type: @type ref
+);
+class_template_argument_value(
+    int type_id: @usertype ref,
+    int index: int ref,
+    int arg_value: @expr ref
+);
+
+@user_or_decltype = @usertype | @decltype;
+
+is_proxy_class_for(
+    unique int id: @usertype ref,
+    int templ_param_id: @user_or_decltype ref
+);
+
+type_mentions(
+    unique int id: @type_mention,
+    int type_id: @type ref,
+    int location: @location 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
+);
+
+template_template_instantiation(
+    int to: @usertype ref,
+    int from: @usertype ref
+);
+template_template_argument(
+    int type_id: @usertype ref,
+    int index: int ref,
+    int arg_type: @type ref
+);
+template_template_argument_value(
+    int type_id: @usertype ref,
+    int index: int ref,
+    int arg_value: @expr ref
+);
+
+@concept = @concept_template | @concept_id;
+
+concept_templates(
+    unique int concept_id: @concept_template,
+    string name: string ref,
+    int location: @location_default ref
+);
+concept_instantiation(
+    unique int to: @concept_id ref,
+    int from: @concept_template ref
+);
+is_type_constraint(int concept_id: @concept_id ref);
+concept_template_argument(
+    int concept_id: @concept ref,
+    int index: int ref,
+    int arg_type: @type ref
+);
+concept_template_argument_value(
+    int concept_id: @concept ref,
+    int index: int ref,
+    int arg_value: @expr ref
+);
+
+routinetypes(
+    unique int id: @routinetype,
+    int return_type: @type ref
+);
+
+routinetypeargs(
+    int routine: @routinetype ref,
+    int index: int ref,
+    int type_id: @type ref
+);
+
+ptrtomembers(
+    unique int id: @ptrtomember,
+    int type_id: @type ref,
+    int class_id: @type ref
+);
+
+/*
+ specifiers for types, functions, and variables
+
+    "public",
+    "protected",
+    "private",
+
+    "const",
+    "volatile",
+    "static",
+
+    "pure",
+    "virtual",
+    "sealed", // Microsoft
+    "__interface", // Microsoft
+    "inline",
+    "explicit",
+
+    "near", // near far extension
+    "far", // near far extension
+    "__ptr32", // Microsoft
+    "__ptr64", // Microsoft
+    "__sptr", // Microsoft
+    "__uptr", // Microsoft
+    "dllimport", // Microsoft
+    "dllexport", // Microsoft
+    "thread", // Microsoft
+    "naked", // Microsoft
+    "microsoft_inline", // Microsoft
+    "forceinline", // Microsoft
+    "selectany", // Microsoft
+    "nothrow", // Microsoft
+    "novtable", // Microsoft
+    "noreturn", // Microsoft
+    "noinline", // Microsoft
+    "noalias", // Microsoft
+    "restrict", // Microsoft
+*/
+
+specifiers(
+    unique int id: @specifier,
+    unique string str: string ref
+);
+
+typespecifiers(
+    int type_id: @type ref,
+    int spec_id: @specifier ref
+);
+
+funspecifiers(
+    int func_id: @function ref,
+    int spec_id: @specifier ref
+);
+
+varspecifiers(
+    int var_id: @accessible ref,
+    int spec_id: @specifier ref
+);
+
+explicit_specifier_exprs(
+    unique int func_id: @function ref,
+    int constant: @expr ref
+)
+
+attributes(
+    unique int id: @attribute,
+    int kind: int ref,
+    string name: string ref,
+    string name_space: string ref,
+    int location: @location_default ref
+);
+
+case @attribute.kind of
+  0 = @gnuattribute
+| 1 = @stdattribute
+| 2 = @declspec
+| 3 = @msattribute
+| 4 = @alignas
+// ... 5 @objc_propertyattribute deprecated
+;
+
+attribute_args(
+    unique int id: @attribute_arg,
+    int kind: int ref,
+    int attribute: @attribute ref,
+    int index: int ref,
+    int location: @location_default ref
+);
+
+case @attribute_arg.kind of
+  0 = @attribute_arg_empty
+| 1 = @attribute_arg_token
+| 2 = @attribute_arg_constant
+| 3 = @attribute_arg_type
+| 4 = @attribute_arg_constant_expr
+| 5 = @attribute_arg_expr
+;
+
+attribute_arg_value(
+    unique int arg: @attribute_arg ref,
+    string value: string ref
+);
+attribute_arg_type(
+    unique int arg: @attribute_arg ref,
+    int type_id: @type ref
+);
+attribute_arg_constant(
+    unique int arg: @attribute_arg ref,
+    int constant: @expr ref
+)
+attribute_arg_expr(
+    unique int arg: @attribute_arg ref,
+    int expr: @expr ref
+)
+attribute_arg_name(
+    unique int arg: @attribute_arg ref,
+    string name: string ref
+);
+
+typeattributes(
+    int type_id: @type ref,
+    int spec_id: @attribute ref
+);
+
+funcattributes(
+    int func_id: @function ref,
+    int spec_id: @attribute ref
+);
+
+varattributes(
+    int var_id: @accessible ref,
+    int spec_id: @attribute ref
+);
+
+stmtattributes(
+    int stmt_id: @stmt ref,
+    int spec_id: @attribute ref
+);
+
+@type = @builtintype
+      | @derivedtype
+      | @usertype
+      | @routinetype
+      | @ptrtomember
+      | @decltype
+      | @type_operator;
+
+unspecifiedtype(
+    unique int type_id: @type ref,
+    int unspecified_type_id: @type ref
+);
+
+member(
+    int parent: @type ref,
+    int index: int ref,
+    int child: @member ref
+);
+
+@enclosingfunction_child = @usertype | @variable | @namespace
+
+enclosingfunction(
+    unique int child: @enclosingfunction_child ref,
+    int parent: @function ref
+);
+
+derivations(
+    unique int derivation: @derivation,
+    int sub: @type ref,
+    int index: int ref,
+    int super: @type ref,
+    int location: @location_default ref
+);
+
+derspecifiers(
+    int der_id: @derivation ref,
+    int spec_id: @specifier ref
+);
+
+/**
+ * Contains the byte offset of the base class subobject within the derived
+ * class. Only holds for non-virtual base classes, but see table
+ * `virtual_base_offsets` for offsets of virtual base class subobjects.
+ */
+direct_base_offsets(
+    unique int der_id: @derivation ref,
+    int offset: int ref
+);
+
+/**
+ * Contains the byte offset of the virtual base class subobject for class
+ * `super` within a most-derived object of class `sub`. `super` can be either a
+ * direct or indirect base class.
+ */
+#keyset[sub, super]
+virtual_base_offsets(
+    int sub: @usertype ref,
+    int super: @usertype ref,
+    int offset: int ref
+);
+
+frienddecls(
+    unique int id: @frienddecl,
+    int type_id: @type ref,
+    int decl_id: @declaration ref,
+    int location: @location_default ref
+);
+
+@declaredtype = @usertype ;
+
+@declaration = @function
+             | @declaredtype
+             | @variable
+             | @enumconstant
+             | @frienddecl
+             | @concept_template;
+
+@member = @membervariable
+        | @function
+        | @declaredtype
+        | @enumconstant;
+
+@locatable = @diagnostic
+           | @declaration
+           | @ppd_include
+           | @ppd_define
+           | @macroinvocation
+           /*| @funcall*/
+           | @xmllocatable
+           | @attribute
+           | @attribute_arg;
+
+@namedscope = @namespace | @usertype;
+
+@element = @locatable
+         | @file
+         | @folder
+         | @specifier
+         | @type
+         | @expr
+         | @namespace
+         | @initialiser
+         | @stmt
+         | @derivation
+         | @comment
+         | @preprocdirect
+         | @fun_decl
+         | @var_decl
+         | @type_decl
+         | @namespace_decl
+         | @using
+         | @namequalifier
+         | @specialnamequalifyingelement
+         | @static_assert
+         | @type_mention
+         | @lambdacapture;
+
+@exprparent = @element;
+
+comments(
+    unique int id: @comment,
+    string contents: string ref,
+    int location: @location_default ref
+);
+
+commentbinding(
+    int id: @comment ref,
+    int element: @element ref
+);
+
+exprconv(
+    int converted: @expr ref,
+    unique int conversion: @expr ref
+);
+
+compgenerated(unique int id: @element ref);
+
+/**
+ * `destructor_call` destructs the `i`'th entity that should be
+ * destructed following `element`. Note that entities should be
+ * destructed in reverse construction order, so for a given `element`
+ * these should be called from highest to lowest `i`.
+ */
+#keyset[element, destructor_call]
+#keyset[element, i]
+synthetic_destructor_call(
+    int element: @element ref,
+    int i: int ref,
+    int destructor_call: @routineexpr ref
+);
+
+namespaces(
+    unique int id: @namespace,
+    string name: string ref
+);
+
+namespace_inline(
+    unique int id: @namespace ref
+);
+
+namespacembrs(
+    int parentid: @namespace ref,
+    unique int memberid: @namespacembr ref
+);
+
+@namespacembr = @declaration | @namespace;
+
+exprparents(
+    int expr_id: @expr ref,
+    int child_index: int ref,
+    int parent_id: @exprparent ref
+);
+
+expr_isload(unique int expr_id: @expr ref);
+
+@cast = @c_style_cast
+      | @const_cast
+      | @dynamic_cast
+      | @reinterpret_cast
+      | @static_cast
+      ;
+
+/*
+case @conversion.kind of
+  0 = @simple_conversion           // a numeric conversion, qualification conversion, or a reinterpret_cast
+| 1 = @bool_conversion             // conversion to 'bool'
+| 2 = @base_class_conversion       // a derived-to-base conversion
+| 3 = @derived_class_conversion    // a base-to-derived conversion
+| 4 = @pm_base_class_conversion    // a derived-to-base conversion of a pointer to member
+| 5 = @pm_derived_class_conversion // a base-to-derived conversion of a pointer to member
+| 6 = @glvalue_adjust              // an adjustment of the type of a glvalue
+| 7 = @prvalue_adjust              // an adjustment of the type of a prvalue
+;
+*/
+/**
+ * Describes the semantics represented by a cast expression. This is largely
+ * independent of the source syntax of the cast, so it is separate from the
+ * regular expression kind.
+ */
+conversionkinds(
+    unique int expr_id: @cast ref,
+    int kind: int ref
+);
+
+@conversion = @cast
+            | @array_to_pointer
+            | @parexpr
+            | @reference_to
+            | @ref_indirect
+            | @temp_init
+            | @c11_generic
+            ;
+
+/*
+case @funbindexpr.kind of
+  0 = @normal_call  // a normal call
+| 1 = @virtual_call // a virtual call
+| 2 = @adl_call     // a call whose target is only found by ADL
+;
+*/
+iscall(
+    unique int caller: @funbindexpr ref,
+    int kind: int ref
+);
+
+numtemplatearguments(
+    unique int expr_id: @expr ref,
+    int num: int ref
+);
+
+specialnamequalifyingelements(
+    unique int id: @specialnamequalifyingelement,
+    unique string name: string ref
+);
+
+@namequalifiableelement = @expr | @namequalifier;
+@namequalifyingelement = @namespace
+                       | @specialnamequalifyingelement
+                       | @usertype;
+
+namequalifiers(
+    unique int id: @namequalifier,
+    unique int qualifiableelement: @namequalifiableelement ref,
+    int qualifyingelement: @namequalifyingelement ref,
+    int location: @location_default ref
+);
+
+varbind(
+    int expr: @varbindexpr ref,
+    int var: @accessible ref
+);
+
+funbind(
+    int expr: @funbindexpr ref,
+    int fun: @function ref
+);
+
+@any_new_expr = @new_expr
+              | @new_array_expr;
+
+@new_or_delete_expr = @any_new_expr
+                    | @delete_expr
+                    | @delete_array_expr;
+
+@prefix_crement_expr = @preincrexpr | @predecrexpr;
+
+@postfix_crement_expr = @postincrexpr | @postdecrexpr;
+
+@increment_expr = @preincrexpr | @postincrexpr;
+
+@decrement_expr = @predecrexpr | @postdecrexpr;
+
+@crement_expr = @increment_expr | @decrement_expr;
+
+@un_arith_op_expr = @arithnegexpr
+                  | @unaryplusexpr
+                  | @conjugation
+                  | @realpartexpr
+                  | @imagpartexpr
+                  | @crement_expr
+                  ;
+
+@un_bitwise_op_expr = @complementexpr;
+
+@un_log_op_expr = @notexpr;
+
+@un_op_expr = @address_of
+            | @indirect
+            | @un_arith_op_expr
+            | @un_bitwise_op_expr
+            | @builtinaddressof
+            | @vec_fill
+            | @un_log_op_expr
+            | @co_await
+            | @co_yield
+            ;
+
+@bin_log_op_expr = @andlogicalexpr | @orlogicalexpr;
+
+@cmp_op_expr = @eq_op_expr | @rel_op_expr;
+
+@eq_op_expr = @eqexpr | @neexpr;
+
+@rel_op_expr = @gtexpr
+             | @ltexpr
+             | @geexpr
+             | @leexpr
+             | @spaceshipexpr
+             ;
+
+@bin_bitwise_op_expr = @lshiftexpr
+                     | @rshiftexpr
+                     | @andexpr
+                     | @orexpr
+                     | @xorexpr
+                     ;
+
+@p_arith_op_expr = @paddexpr
+                 | @psubexpr
+                 | @pdiffexpr
+                 ;
+
+@bin_arith_op_expr = @addexpr
+                   | @subexpr
+                   | @mulexpr
+                   | @divexpr
+                   | @remexpr
+                   | @jmulexpr
+                   | @jdivexpr
+                   | @fjaddexpr
+                   | @jfaddexpr
+                   | @fjsubexpr
+                   | @jfsubexpr
+                   | @minexpr
+                   | @maxexpr
+                   | @p_arith_op_expr
+                   ;
+
+@bin_op_expr = @bin_arith_op_expr
+             | @bin_bitwise_op_expr
+             | @cmp_op_expr
+             | @bin_log_op_expr
+             ;
+
+@op_expr = @un_op_expr
+         | @bin_op_expr
+         | @assign_expr
+         | @conditionalexpr
+         ;
+
+@assign_arith_expr = @assignaddexpr
+                   | @assignsubexpr
+                   | @assignmulexpr
+                   | @assigndivexpr
+                   | @assignremexpr
+                   ;
+
+@assign_bitwise_expr = @assignandexpr
+                     | @assignorexpr
+                     | @assignxorexpr
+                     | @assignlshiftexpr
+                     | @assignrshiftexpr
+                     ;
+
+@assign_pointer_expr = @assignpaddexpr
+                     | @assignpsubexpr
+                     ;
+
+@assign_op_expr = @assign_arith_expr
+                | @assign_bitwise_expr
+                | @assign_pointer_expr
+                ;
+
+@assign_expr = @assignexpr | @assign_op_expr | @blockassignexpr
+
+/*
+  Binary encoding of the allocator form.
+
+  case @allocator.form of
+    0 = plain
+  | 1 = alignment
+  ;
+*/
+
+/**
+ * The allocator function associated with a `new` or `new[]` expression.
+ * The `form` column specified whether the allocation call contains an alignment
+ * argument.
+ */
+expr_allocator(
+    unique int expr: @any_new_expr ref,
+    int func: @function ref,
+    int form: int ref
+);
+
+/*
+  Binary encoding of the deallocator form.
+
+  case @deallocator.form of
+    0 = plain
+  | 1 = size
+  | 2 = alignment
+  | 4 = destroying_delete
+  ;
+*/
+
+/**
+ * The deallocator function associated with a `delete`, `delete[]`, `new`, or
+ * `new[]` expression. For a `new` or `new[]` expression, the deallocator is the
+ * one used to free memory if the initialization throws an exception.
+ * The `form` column specifies whether the deallocation call contains a size
+ * argument, and alignment argument, or both.
+ */
+expr_deallocator(
+    unique int expr: @new_or_delete_expr ref,
+    int func: @function ref,
+    int form: int ref
+);
+
+/**
+ * Holds if the `@conditionalexpr` is of the two operand form
+ * `guard ? : false`.
+ */
+expr_cond_two_operand(
+    unique int cond: @conditionalexpr ref
+);
+
+/**
+ * The guard of `@conditionalexpr` `guard ? true : false`
+ */
+expr_cond_guard(
+    unique int cond: @conditionalexpr ref,
+    int guard: @expr ref
+);
+
+/**
+ * The expression used when the guard of `@conditionalexpr`
+ * `guard ? true : false` holds. For the two operand form
+ * `guard ?: false` consider using `expr_cond_guard` instead.
+ */
+expr_cond_true(
+    unique int cond: @conditionalexpr ref,
+    int true: @expr ref
+);
+
+/**
+ * The expression used when the guard of `@conditionalexpr`
+ * `guard ? true : false` does not hold.
+ */
+expr_cond_false(
+    unique int cond: @conditionalexpr ref,
+    int false: @expr ref
+);
+
+/** A string representation of the value. */
+values(
+    unique int id: @value,
+    string str: string ref
+);
+
+/** The actual text in the source code for the value, if any. */
+valuetext(
+    unique int id: @value ref,
+    string text: string ref
+);
+
+valuebind(
+    int val: @value ref,
+    unique int expr: @expr ref
+);
+
+fieldoffsets(
+    unique int id: @variable ref,
+    int byteoffset: int ref,
+    int bitoffset: int ref
+);
+
+bitfield(
+    unique int id: @variable ref,
+    int bits: int ref,
+    int declared_bits: int ref
+);
+
+/* TODO
+memberprefix(
+    int member: @expr ref,
+    int prefix: @expr ref
+);
+*/
+
+/*
+   kind(1) = mbrcallexpr
+   kind(2) = mbrptrcallexpr
+   kind(3) = mbrptrmbrcallexpr
+   kind(4) = ptrmbrptrmbrcallexpr
+   kind(5) = mbrreadexpr // x.y
+   kind(6) = mbrptrreadexpr // p->y
+   kind(7) = mbrptrmbrreadexpr // x.*pm
+   kind(8) = mbrptrmbrptrreadexpr // x->*pm
+   kind(9) = staticmbrreadexpr // static x.y
+   kind(10) = staticmbrptrreadexpr // static p->y
+*/
+/* TODO
+memberaccess(
+    int member: @expr ref,
+    int kind: int ref
+);
+*/
+
+initialisers(
+    unique int init: @initialiser,
+    int var: @accessible ref,
+    unique int expr: @expr ref,
+    int location: @location_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
+);
+
+expr_reuse(
+    int reuse: @expr ref,
+    int original: @expr ref,
+    int value_category: int ref
+)
+
+/*
+  case @value.category of
+    1 = prval
+  | 2 = xval
+  | 3 = lval
+  ;
+*/
+expr_types(
+    int id: @expr ref,
+    int typeid: @type ref,
+    int value_category: int ref
+);
+
+case @expr.kind of
+    1 = @errorexpr
+|   2 = @address_of // & AddressOfExpr
+|   3 = @reference_to // ReferenceToExpr (implicit?)
+|   4 = @indirect // * PointerDereferenceExpr
+|   5 = @ref_indirect // ReferenceDereferenceExpr (implicit?)
+// ...
+|   8 = @array_to_pointer // (???)
+|   9 = @vacuous_destructor_call // VacuousDestructorCall
+// ...
+|  11 = @assume // Microsoft
+|  12 = @parexpr
+|  13 = @arithnegexpr
+|  14 = @unaryplusexpr
+|  15 = @complementexpr
+|  16 = @notexpr
+|  17 = @conjugation // GNU ~ operator
+|  18 = @realpartexpr // GNU __real
+|  19 = @imagpartexpr // GNU __imag
+|  20 = @postincrexpr
+|  21 = @postdecrexpr
+|  22 = @preincrexpr
+|  23 = @predecrexpr
+|  24 = @conditionalexpr
+|  25 = @addexpr
+|  26 = @subexpr
+|  27 = @mulexpr
+|  28 = @divexpr
+|  29 = @remexpr
+|  30 = @jmulexpr // C99 mul imaginary
+|  31 = @jdivexpr // C99 div imaginary
+|  32 = @fjaddexpr // C99 add real + imaginary
+|  33 = @jfaddexpr // C99 add imaginary + real
+|  34 = @fjsubexpr // C99 sub real - imaginary
+|  35 = @jfsubexpr // C99 sub imaginary - real
+|  36 = @paddexpr // pointer add (pointer + int or int + pointer)
+|  37 = @psubexpr // pointer sub (pointer - integer)
+|  38 = @pdiffexpr // difference between two pointers
+|  39 = @lshiftexpr
+|  40 = @rshiftexpr
+|  41 = @andexpr
+|  42 = @orexpr
+|  43 = @xorexpr
+|  44 = @eqexpr
+|  45 = @neexpr
+|  46 = @gtexpr
+|  47 = @ltexpr
+|  48 = @geexpr
+|  49 = @leexpr
+|  50 = @minexpr // GNU minimum
+|  51 = @maxexpr // GNU maximum
+|  52 = @assignexpr
+|  53 = @assignaddexpr
+|  54 = @assignsubexpr
+|  55 = @assignmulexpr
+|  56 = @assigndivexpr
+|  57 = @assignremexpr
+|  58 = @assignlshiftexpr
+|  59 = @assignrshiftexpr
+|  60 = @assignandexpr
+|  61 = @assignorexpr
+|  62 = @assignxorexpr
+|  63 = @assignpaddexpr // assign pointer add
+|  64 = @assignpsubexpr // assign pointer sub
+|  65 = @andlogicalexpr
+|  66 = @orlogicalexpr
+|  67 = @commaexpr
+|  68 = @subscriptexpr // access to member of an array, e.g., a[5]
+// ...  69 @objc_subscriptexpr deprecated
+// ...  70 @cmdaccess deprecated
+// ...
+|  73 = @virtfunptrexpr
+|  74 = @callexpr
+// ...  75 @msgexpr_normal deprecated
+// ...  76 @msgexpr_super deprecated
+// ...  77 @atselectorexpr deprecated
+// ...  78 @atprotocolexpr deprecated
+|  79 = @vastartexpr
+|  80 = @vaargexpr
+|  81 = @vaendexpr
+|  82 = @vacopyexpr
+// ...  83 @atencodeexpr deprecated
+|  84 = @varaccess
+|  85 = @thisaccess
+// ...  86 @objc_box_expr deprecated
+|  87 = @new_expr
+|  88 = @delete_expr
+|  89 = @throw_expr
+|  90 = @condition_decl // a variable declared in a condition, e.g., if(int x = y > 2)
+|  91 = @braced_init_list
+|  92 = @type_id
+|  93 = @runtime_sizeof
+|  94 = @runtime_alignof
+|  95 = @sizeof_pack
+|  96 = @expr_stmt // GNU extension
+|  97 = @routineexpr
+|  98 = @type_operand // used to access a type in certain contexts (haven't found any examples yet....)
+|  99 = @offsetofexpr // offsetof ::= type and field
+| 100 = @hasassignexpr // __has_assign ::= type
+| 101 = @hascopyexpr // __has_copy ::= type
+| 102 = @hasnothrowassign // __has_nothrow_assign ::= type
+| 103 = @hasnothrowconstr // __has_nothrow_constructor ::= type
+| 104 = @hasnothrowcopy // __has_nothrow_copy ::= type
+| 105 = @hastrivialassign // __has_trivial_assign ::= type
+| 106 = @hastrivialconstr // __has_trivial_constructor ::= type
+| 107 = @hastrivialcopy // __has_trivial_copy ::= type
+| 108 = @hasuserdestr // __has_user_destructor ::= type
+| 109 = @hasvirtualdestr // __has_virtual_destructor ::= type
+| 110 = @isabstractexpr // __is_abstract ::= type
+| 111 = @isbaseofexpr // __is_base_of ::= type type
+| 112 = @isclassexpr // __is_class ::= type
+| 113 = @isconvtoexpr // __is_convertible_to ::= type type
+| 114 = @isemptyexpr // __is_empty ::= type
+| 115 = @isenumexpr // __is_enum ::= type
+| 116 = @ispodexpr // __is_pod ::= type
+| 117 = @ispolyexpr // __is_polymorphic ::= type
+| 118 = @isunionexpr // __is_union ::= type
+| 119 = @typescompexpr // GNU __builtin_types_compatible ::= type type
+| 120 = @intaddrexpr // frontend internal builtin, used to implement offsetof
+// ...
+| 122 = @hastrivialdestructor // __has_trivial_destructor ::= type
+| 123 = @literal
+| 124 = @uuidof
+| 127 = @aggregateliteral
+| 128 = @delete_array_expr
+| 129 = @new_array_expr
+// ... 130 @objc_array_literal deprecated
+// ... 131 @objc_dictionary_literal deprecated
+| 132 = @foldexpr
+// ...
+| 200 = @ctordirectinit
+| 201 = @ctorvirtualinit
+| 202 = @ctorfieldinit
+| 203 = @ctordelegatinginit
+| 204 = @dtordirectdestruct
+| 205 = @dtorvirtualdestruct
+| 206 = @dtorfielddestruct
+// ...
+| 210 = @static_cast
+| 211 = @reinterpret_cast
+| 212 = @const_cast
+| 213 = @dynamic_cast
+| 214 = @c_style_cast
+| 215 = @lambdaexpr
+| 216 = @param_ref
+| 217 = @noopexpr
+// ...
+| 294 = @istriviallyconstructibleexpr
+| 295 = @isdestructibleexpr
+| 296 = @isnothrowdestructibleexpr
+| 297 = @istriviallydestructibleexpr
+| 298 = @istriviallyassignableexpr
+| 299 = @isnothrowassignableexpr
+| 300 = @istrivialexpr
+| 301 = @isstandardlayoutexpr
+| 302 = @istriviallycopyableexpr
+| 303 = @isliteraltypeexpr
+| 304 = @hastrivialmoveconstructorexpr
+| 305 = @hastrivialmoveassignexpr
+| 306 = @hasnothrowmoveassignexpr
+| 307 = @isconstructibleexpr
+| 308 = @isnothrowconstructibleexpr
+| 309 = @hasfinalizerexpr
+| 310 = @isdelegateexpr
+| 311 = @isinterfaceclassexpr
+| 312 = @isrefarrayexpr
+| 313 = @isrefclassexpr
+| 314 = @issealedexpr
+| 315 = @issimplevalueclassexpr
+| 316 = @isvalueclassexpr
+| 317 = @isfinalexpr
+| 319 = @noexceptexpr
+| 320 = @builtinshufflevector
+| 321 = @builtinchooseexpr
+| 322 = @builtinaddressof
+| 323 = @vec_fill
+| 324 = @builtinconvertvector
+| 325 = @builtincomplex
+| 326 = @spaceshipexpr
+| 327 = @co_await
+| 328 = @co_yield
+| 329 = @temp_init
+| 330 = @isassignable
+| 331 = @isaggregate
+| 332 = @hasuniqueobjectrepresentations
+| 333 = @builtinbitcast
+| 334 = @builtinshuffle
+| 335 = @blockassignexpr
+| 336 = @issame
+| 337 = @isfunction
+| 338 = @islayoutcompatible
+| 339 = @ispointerinterconvertiblebaseof
+| 340 = @isarray
+| 341 = @arrayrank
+| 342 = @arrayextent
+| 343 = @isarithmetic
+| 344 = @iscompletetype
+| 345 = @iscompound
+| 346 = @isconst
+| 347 = @isfloatingpoint
+| 348 = @isfundamental
+| 349 = @isintegral
+| 350 = @islvaluereference
+| 351 = @ismemberfunctionpointer
+| 352 = @ismemberobjectpointer
+| 353 = @ismemberpointer
+| 354 = @isobject
+| 355 = @ispointer
+| 356 = @isreference
+| 357 = @isrvaluereference
+| 358 = @isscalar
+| 359 = @issigned
+| 360 = @isunsigned
+| 361 = @isvoid
+| 362 = @isvolatile
+| 363 = @reuseexpr
+| 364 = @istriviallycopyassignable
+| 365 = @isassignablenopreconditioncheck
+| 366 = @referencebindstotemporary
+| 367 = @issameas
+| 368 = @builtinhasattribute
+| 369 = @ispointerinterconvertiblewithclass
+| 370 = @builtinispointerinterconvertiblewithclass
+| 371 = @iscorrespondingmember
+| 372 = @builtiniscorrespondingmember
+| 373 = @isboundedarray
+| 374 = @isunboundedarray
+| 375 = @isreferenceable
+| 378 = @isnothrowconvertible
+| 379 = @referenceconstructsfromtemporary
+| 380 = @referenceconvertsfromtemporary
+| 381 = @isconvertible
+| 382 = @isvalidwinrttype
+| 383 = @iswinclass
+| 384 = @iswininterface
+| 385 = @istriviallyequalitycomparable
+| 386 = @isscopedenum
+| 387 = @istriviallyrelocatable
+| 388 = @datasizeof
+| 389 = @c11_generic
+| 390 = @requires_expr
+| 391 = @nested_requirement
+| 392 = @compound_requirement
+| 393 = @concept_id
+;
+
+@var_args_expr = @vastartexpr
+               | @vaendexpr
+               | @vaargexpr
+               | @vacopyexpr
+               ;
+
+@builtin_op = @var_args_expr
+            | @noopexpr
+            | @offsetofexpr
+            | @intaddrexpr
+            | @hasassignexpr
+            | @hascopyexpr
+            | @hasnothrowassign
+            | @hasnothrowconstr
+            | @hasnothrowcopy
+            | @hastrivialassign
+            | @hastrivialconstr
+            | @hastrivialcopy
+            | @hastrivialdestructor
+            | @hasuserdestr
+            | @hasvirtualdestr
+            | @isabstractexpr
+            | @isbaseofexpr
+            | @isclassexpr
+            | @isconvtoexpr
+            | @isemptyexpr
+            | @isenumexpr
+            | @ispodexpr
+            | @ispolyexpr
+            | @isunionexpr
+            | @typescompexpr
+            | @builtinshufflevector
+            | @builtinconvertvector
+            | @builtinaddressof
+            | @istriviallyconstructibleexpr
+            | @isdestructibleexpr
+            | @isnothrowdestructibleexpr
+            | @istriviallydestructibleexpr
+            | @istriviallyassignableexpr
+            | @isnothrowassignableexpr
+            | @istrivialexpr
+            | @isstandardlayoutexpr
+            | @istriviallycopyableexpr
+            | @isliteraltypeexpr
+            | @hastrivialmoveconstructorexpr
+            | @hastrivialmoveassignexpr
+            | @hasnothrowmoveassignexpr
+            | @isconstructibleexpr
+            | @isnothrowconstructibleexpr
+            | @hasfinalizerexpr
+            | @isdelegateexpr
+            | @isinterfaceclassexpr
+            | @isrefarrayexpr
+            | @isrefclassexpr
+            | @issealedexpr
+            | @issimplevalueclassexpr
+            | @isvalueclassexpr
+            | @isfinalexpr
+            | @builtinchooseexpr
+            | @builtincomplex
+            | @isassignable
+            | @isaggregate
+            | @hasuniqueobjectrepresentations
+            | @builtinbitcast
+            | @builtinshuffle
+            | @issame
+            | @isfunction
+            | @islayoutcompatible
+            | @ispointerinterconvertiblebaseof
+            | @isarray
+            | @arrayrank
+            | @arrayextent
+            | @isarithmetic
+            | @iscompletetype
+            | @iscompound
+            | @isconst
+            | @isfloatingpoint
+            | @isfundamental
+            | @isintegral
+            | @islvaluereference
+            | @ismemberfunctionpointer
+            | @ismemberobjectpointer
+            | @ismemberpointer
+            | @isobject
+            | @ispointer
+            | @isreference
+            | @isrvaluereference
+            | @isscalar
+            | @issigned
+            | @isunsigned
+            | @isvoid
+            | @isvolatile
+            | @istriviallycopyassignable
+            | @isassignablenopreconditioncheck
+            | @referencebindstotemporary
+            | @issameas
+            | @builtinhasattribute
+            | @ispointerinterconvertiblewithclass
+            | @builtinispointerinterconvertiblewithclass
+            | @iscorrespondingmember
+            | @builtiniscorrespondingmember
+            | @isboundedarray
+            | @isunboundedarray
+            | @isreferenceable
+            | @isnothrowconvertible
+            | @referenceconstructsfromtemporary
+            | @referenceconvertsfromtemporary
+            | @isconvertible
+            | @isvalidwinrttype
+            | @iswinclass
+            | @iswininterface
+            | @istriviallyequalitycomparable
+            | @isscopedenum
+            | @istriviallyrelocatable
+            ;
+
+compound_requirement_is_noexcept(
+    int expr: @compound_requirement ref
+);
+
+new_allocated_type(
+    unique int expr: @new_expr ref,
+    int type_id: @type ref
+);
+
+new_array_allocated_type(
+    unique int expr: @new_array_expr ref,
+    int type_id: @type ref
+);
+
+/**
+ * The field being initialized by an initializer expression within an aggregate
+ * initializer for a class/struct/union. Position is used to sort repeated initializers.
+ */
+#keyset[aggregate, position]
+aggregate_field_init(
+    int aggregate: @aggregateliteral ref,
+    int initializer: @expr ref,
+    int field: @membervariable ref,
+    int position: int ref,
+    boolean is_designated: boolean ref
+);
+
+/**
+ * The index of the element being initialized by an initializer expression
+ * within an aggregate initializer for an array. Position is used to sort repeated initializers.
+ */
+#keyset[aggregate, position]
+aggregate_array_init(
+    int aggregate: @aggregateliteral ref,
+    int initializer: @expr ref,
+    int element_index: int ref,
+    int position: int ref,
+    boolean is_designated: boolean ref
+);
+
+@ctorinit = @ctordirectinit
+          | @ctorvirtualinit
+          | @ctorfieldinit
+          | @ctordelegatinginit;
+@dtordestruct = @dtordirectdestruct
+              | @dtorvirtualdestruct
+              | @dtorfielddestruct;
+
+
+condition_decl_bind(
+    unique int expr: @condition_decl ref,
+    unique int decl: @declaration ref
+);
+
+typeid_bind(
+    unique int expr: @type_id ref,
+    int type_id: @type ref
+);
+
+uuidof_bind(
+    unique int expr: @uuidof ref,
+    int type_id: @type ref
+);
+
+@sizeof_or_alignof = @runtime_sizeof | @runtime_alignof | @datasizeof | @sizeof_pack;
+
+sizeof_bind(
+    unique int expr: @sizeof_or_alignof ref,
+    int type_id: @type ref
+);
+
+code_block(
+    unique int block: @literal ref,
+    unique int routine: @function ref
+);
+
+lambdas(
+    unique int expr: @lambdaexpr ref,
+    string default_capture: string ref,
+    boolean has_explicit_return_type: boolean ref
+);
+
+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
+|  38 = @stmt_consteval_if
+|  39 = @stmt_not_consteval_if
+;
+
+type_vla(
+    int type_id: @type ref,
+    int decl: @stmt_vla_decl ref
+);
+
+variable_vla(
+    int var: @variable ref,
+    int decl: @stmt_vla_decl ref
+);
+
+type_is_vla(unique int type_id: @derivedtype ref)
+
+if_initialization(
+    unique int if_stmt: @stmt_if ref,
+    int init_id: @stmt ref
+);
+
+if_then(
+    unique int if_stmt: @stmt_if ref,
+    int then_id: @stmt ref
+);
+
+if_else(
+    unique int if_stmt: @stmt_if ref,
+    int else_id: @stmt ref
+);
+
+constexpr_if_initialization(
+    unique int constexpr_if_stmt: @stmt_constexpr_if ref,
+    int init_id: @stmt ref
+);
+
+constexpr_if_then(
+    unique int constexpr_if_stmt: @stmt_constexpr_if ref,
+    int then_id: @stmt ref
+);
+
+constexpr_if_else(
+    unique int constexpr_if_stmt: @stmt_constexpr_if ref,
+    int else_id: @stmt ref
+);
+
+@stmt_consteval_or_not_consteval_if = @stmt_consteval_if | @stmt_not_consteval_if;
+
+consteval_if_then(
+    unique int constexpr_if_stmt: @stmt_consteval_or_not_consteval_if ref,
+    int then_id: @stmt ref
+);
+
+consteval_if_else(
+    unique int constexpr_if_stmt: @stmt_consteval_or_not_consteval_if ref,
+    int else_id: @stmt ref
+);
+
+while_body(
+    unique int while_stmt: @stmt_while ref,
+    int body_id: @stmt ref
+);
+
+do_body(
+    unique int do_stmt: @stmt_end_test_while ref,
+    int body_id: @stmt ref
+);
+
+switch_initialization(
+    unique int switch_stmt: @stmt_switch ref,
+    int init_id: @stmt ref
+);
+
+#keyset[switch_stmt, index]
+switch_case(
+    int switch_stmt: @stmt_switch ref,
+    int index: int ref,
+    int case_id: @stmt_switch_case ref
+);
+
+switch_body(
+    unique int switch_stmt: @stmt_switch ref,
+    int body_id: @stmt ref
+);
+
+@stmt_for_or_range_based_for = @stmt_for
+                             | @stmt_range_based_for;
+
+for_initialization(
+    unique int for_stmt: @stmt_for_or_range_based_for ref,
+    int init_id: @stmt ref
+);
+
+for_condition(
+    unique int for_stmt: @stmt_for ref,
+    int condition_id: @expr ref
+);
+
+for_update(
+    unique int for_stmt: @stmt_for ref,
+    int update_id: @expr ref
+);
+
+for_body(
+    unique int for_stmt: @stmt_for ref,
+    int body_id: @stmt ref
+);
+
+@stmtparent = @stmt | @expr_stmt ;
+stmtparents(
+    unique int id: @stmt ref,
+    int index: int ref,
+    int parent: @stmtparent ref
+);
+
+ishandler(unique int block: @stmt_block ref);
+
+@cfgnode = @stmt | @expr | @function | @initialiser ;
+
+stmt_decl_bind(
+    int stmt: @stmt_decl ref,
+    int num: int ref,
+    int decl: @declaration ref
+);
+
+stmt_decl_entry_bind(
+    int stmt: @stmt_decl ref,
+    int num: int ref,
+    int decl_entry: @element ref
+);
+
+@parameterized_element = @function | @stmt_block | @requires_expr;
+
+blockscope(
+    unique int block: @stmt_block ref,
+    int enclosing: @parameterized_element ref
+);
+
+@jump = @stmt_goto | @stmt_break | @stmt_continue;
+
+@jumporlabel = @jump | @stmt_label | @literal;
+
+jumpinfo(
+    unique int id: @jumporlabel ref,
+    string str: string ref,
+    int target: @stmt ref
+);
+
+preprocdirects(
+    unique int id: @preprocdirect,
+    int kind: int ref,
+    int location: @location_default ref
+);
+case @preprocdirect.kind of
+   0 = @ppd_if
+|  1 = @ppd_ifdef
+|  2 = @ppd_ifndef
+|  3 = @ppd_elif
+|  4 = @ppd_else
+|  5 = @ppd_endif
+|  6 = @ppd_plain_include
+|  7 = @ppd_define
+|  8 = @ppd_undef
+|  9 = @ppd_line
+| 10 = @ppd_error
+| 11 = @ppd_pragma
+| 12 = @ppd_objc_import
+| 13 = @ppd_include_next
+| 14 = @ppd_ms_import
+| 15 = @ppd_elifdef
+| 16 = @ppd_elifndef
+| 18 = @ppd_warning
+;
+
+@ppd_include = @ppd_plain_include | @ppd_objc_import | @ppd_include_next | @ppd_ms_import;
+
+@ppd_branch = @ppd_if | @ppd_ifdef | @ppd_ifndef | @ppd_elif | @ppd_elifdef | @ppd_elifndef;
+
+preprocpair(
+    int begin : @ppd_branch ref,
+    int elseelifend : @preprocdirect ref
+);
+
+preproctrue(int branch : @ppd_branch ref);
+preprocfalse(int branch : @ppd_branch ref);
+
+preproctext(
+    unique int id: @preprocdirect ref,
+    string head: string ref,
+    string body: string ref
+);
+
+includes(
+    unique int id: @ppd_include ref,
+    int included: @file ref
+);
+
+link_targets(
+    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/9a7c3c14c1076f64b871719117a558733d987b48/semmlecode.cpp.dbscheme b/cpp/ql/lib/upgrades/9a7c3c14c1076f64b871719117a558733d987b48/semmlecode.cpp.dbscheme
new file mode 100644
index 00000000000..af887e83a81
--- /dev/null
+++ b/cpp/ql/lib/upgrades/9a7c3c14c1076f64b871719117a558733d987b48/semmlecode.cpp.dbscheme
@@ -0,0 +1,2492 @@
+
+/**
+ * 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
+);
+
+/**
+ * Optionally, record the build mode for each compilation.
+ */
+compilation_build_mode(
+    unique int id : @compilation ref,
+    int mode : int ref
+);
+
+/*
+case @compilation_build_mode.mode of
+  0 = @build_mode_none
+| 1 = @build_mode_manual
+| 2 = @build_mode_auto
+;
+*/
+
+/**
+ * The source files that are compiled by a compiler invocation.
+ * If `id` is for the compiler invocation
+ *
+ *   gcc -c f1.c f2.c f3.c
+ *
+ * then there will be rows for
+ *
+ * num | arg
+ * --- | ---
+ * 0   | f1.c
+ * 1   | f2.c
+ * 2   | f3.c
+ *
+ * Note that even if those files `#include` headers, those headers
+ * do not appear as rows.
+ */
+#keyset[id, num]
+compilation_compiling_files(
+    int id : @compilation ref,
+    int num : int ref,
+    int file : @file ref
+);
+
+/**
+ * The time taken by the extractor for a compiler invocation.
+ *
+ * For each file `num`, there will be rows for
+ *
+ * kind | seconds
+ * ---- | ---
+ * 1    | CPU seconds used by the extractor frontend
+ * 2    | Elapsed seconds during the extractor frontend
+ * 3    | CPU seconds used by the extractor backend
+ * 4    | Elapsed seconds during the extractor backend
+ */
+#keyset[id, num, kind]
+compilation_time(
+    int id : @compilation ref,
+    int num : int ref,
+    /* kind:
+       1 = frontend_cpu_seconds
+       2 = frontend_elapsed_seconds
+       3 = extractor_cpu_seconds
+       4 = extractor_elapsed_seconds
+    */
+    int kind : int ref,
+    float seconds : float ref
+);
+
+/**
+ * An error or warning generated by the extractor.
+ * The diagnostic message `diagnostic` was generated during compiler
+ * invocation `compilation`, and is the `file_number_diagnostic_number`th
+ * message generated while extracting the `file_number`th file of that
+ * invocation.
+ */
+#keyset[compilation, file_number, file_number_diagnostic_number]
+diagnostic_for(
+    int diagnostic : @diagnostic ref,
+    int compilation : @compilation ref,
+    int file_number : int ref,
+    int file_number_diagnostic_number : int ref
+);
+
+/**
+ * If extraction was successful, then `cpu_seconds` and
+ * `elapsed_seconds` are the CPU time and elapsed time (respectively)
+ * that extraction took for compiler invocation `id`.
+ */
+compilation_finished(
+    unique int id : @compilation ref,
+    float cpu_seconds : float ref,
+    float elapsed_seconds : float ref
+);
+
+
+/**
+ * External data, 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
+ */
+
+extractor_version(
+    string codeql_version: string ref,
+    string frontend_version: string ref
+)
+
+@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
+| 7 = @user_defined_literal
+| 8 = @deduction_guide
+;
+*/
+
+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
+);
+
+/*
+case @coroutine_placeholder_variable.kind of
+  1 = @handle
+| 2 = @promise
+| 3 = @init_await_resume
+;
+*/
+
+coroutine_placeholder_variable(
+  unique int placeholder_variable: @variable ref,
+  int kind: int ref,
+  int function: @function ref
+)
+
+/** The `new` function used for allocating the coroutine state, if any. */
+coroutine_new(
+  unique int function: @function ref,
+  int new: @function ref
+);
+
+/** The `delete` function used for deallocating the coroutine state, if any. */
+coroutine_delete(
+  unique int function: @function ref,
+  int delete: @function ref
+);
+
+purefunctions(unique int id: @function ref);
+
+function_deleted(unique int id: @function ref);
+
+function_defaulted(unique int id: @function ref);
+
+function_prototyped(unique int id: @function ref)
+
+deduction_guide_for_class(
+    int id: @function ref,
+    int class_template: @usertype ref
+)
+
+member_function_this_type(
+    unique int id: @function ref,
+    int this_type: @type ref
+);
+
+#keyset[id, type_id]
+fun_decls(
+    int id: @fun_decl,
+    int function: @function ref,
+    int type_id: @type ref,
+    string name: string ref,
+    int location: @location_default ref
+);
+fun_def(unique int id: @fun_decl ref);
+fun_specialized(unique int id: @fun_decl ref);
+fun_implicit(unique int id: @fun_decl ref);
+fun_decl_specifiers(
+    int id: @fun_decl ref,
+    string name: string ref
+)
+#keyset[fun_decl, index]
+fun_decl_throws(
+    int fun_decl: @fun_decl ref,
+    int index: int ref,
+    int type_id: @type ref
+);
+/* an empty throw specification is different from none */
+fun_decl_empty_throws(unique int fun_decl: @fun_decl ref);
+fun_decl_noexcept(
+    int fun_decl: @fun_decl ref,
+    int constant: @expr ref
+);
+fun_decl_empty_noexcept(int fun_decl: @fun_decl ref);
+fun_decl_typedef_type(
+    unique int fun_decl: @fun_decl ref,
+    int typedeftype_id: @usertype ref
+);
+
+/*
+case @fun_requires.kind of
+  1 = @template_attached
+| 2 = @function_attached
+;
+*/
+
+fun_requires(
+    int id: @fun_decl ref,
+    int kind: int ref,
+    int constraint: @expr ref
+);
+
+param_decl_bind(
+    unique int id: @var_decl ref,
+    int index: int ref,
+    int fun_decl: @fun_decl ref
+);
+
+#keyset[id, type_id]
+var_decls(
+    int id: @var_decl,
+    int variable: @variable ref,
+    int type_id: @type ref,
+    string name: string ref,
+    int location: @location_default ref
+);
+var_def(unique int id: @var_decl ref);
+var_specialized(int id: @var_decl ref);
+var_decl_specifiers(
+    int id: @var_decl ref,
+    string name: string ref
+)
+is_structured_binding(unique int id: @variable ref);
+var_requires(
+    int id: @var_decl ref,
+    int constraint: @expr ref
+);
+
+type_decls(
+    unique int id: @type_decl,
+    int type_id: @type ref,
+    int location: @location_default ref
+);
+type_def(unique int id: @type_decl ref);
+type_decl_top(
+    unique int type_decl: @type_decl ref
+);
+type_requires(
+    int id: @type_decl ref,
+    int constraint: @expr ref
+);
+
+namespace_decls(
+    unique int id: @namespace_decl,
+    int namespace_id: @namespace ref,
+    int location: @location_default ref,
+    int bodylocation: @location_default ref
+);
+
+case @using.kind of
+  1 = @using_declaration
+| 2 = @using_directive
+| 3 = @using_enum_declaration
+;
+
+usings(
+    unique int id: @using,
+    int element_id: @element ref,
+    int location: @location_default ref,
+    int kind: int ref
+);
+
+/** The element which contains the `using` declaration. */
+using_container(
+    int parent: @element ref,
+    int child: @using ref
+);
+
+static_asserts(
+    unique int id: @static_assert,
+    int condition : @expr ref,
+    string message : string ref,
+    int location: @location_default ref,
+    int enclosing : @element ref
+);
+
+// each function has an ordered list of parameters
+#keyset[id, type_id]
+#keyset[function, index, type_id]
+params(
+    int id: @parameter,
+    int function: @parameterized_element ref,
+    int index: int ref,
+    int type_id: @type ref
+);
+
+overrides(
+    int new: @function ref,
+    int old: @function ref
+);
+
+#keyset[id, type_id]
+membervariables(
+    int id: @membervariable,
+    int type_id: @type ref,
+    string name: string ref
+);
+
+#keyset[id, type_id]
+globalvariables(
+    int id: @globalvariable,
+    int type_id: @type ref,
+    string name: string ref
+);
+
+#keyset[id, type_id]
+localvariables(
+    int id: @localvariable,
+    int type_id: @type ref,
+    string name: string ref
+);
+
+autoderivation(
+    unique int var: @variable ref,
+    int derivation_type: @type ref
+);
+
+orphaned_variables(
+    int var: @localvariable ref,
+    int function: @function ref
+)
+
+enumconstants(
+    unique int id: @enumconstant,
+    int parent: @usertype ref,
+    int index: int ref,
+    int type_id: @type ref,
+    string name: string ref,
+    int location: @location_default ref
+);
+
+@variable = @localscopevariable | @globalvariable | @membervariable;
+
+@localscopevariable = @localvariable | @parameter;
+
+/**
+ * Built-in types are the fundamental types, e.g., integral, floating, and void.
+ */
+case @builtintype.kind of
+   1 = @errortype
+|  2 = @unknowntype
+|  3 = @void
+|  4 = @boolean
+|  5 = @char
+|  6 = @unsigned_char
+|  7 = @signed_char
+|  8 = @short
+|  9 = @unsigned_short
+| 10 = @signed_short
+| 11 = @int
+| 12 = @unsigned_int
+| 13 = @signed_int
+| 14 = @long
+| 15 = @unsigned_long
+| 16 = @signed_long
+| 17 = @long_long
+| 18 = @unsigned_long_long
+| 19 = @signed_long_long
+// ... 20 Microsoft-specific __int8
+// ... 21 Microsoft-specific __int16
+// ... 22 Microsoft-specific __int32
+// ... 23 Microsoft-specific __int64
+| 24 = @float
+| 25 = @double
+| 26 = @long_double
+| 27 = @complex_float         // C99-specific _Complex float
+| 28 = @complex_double        // C99-specific _Complex double
+| 29 = @complex_long_double   // C99-specific _Complex long double
+| 30 = @imaginary_float       // C99-specific _Imaginary float
+| 31 = @imaginary_double      // C99-specific _Imaginary double
+| 32 = @imaginary_long_double // C99-specific _Imaginary long double
+| 33 = @wchar_t               // Microsoft-specific
+| 34 = @decltype_nullptr      // C++11
+| 35 = @int128                // __int128
+| 36 = @unsigned_int128       // unsigned __int128
+| 37 = @signed_int128         // signed __int128
+| 38 = @float128              // __float128
+| 39 = @complex_float128      // _Complex __float128
+| 40 = @decimal32             // _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
+| 62 = @mfp8                  // __mfp8
+;
+
+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 or C23 `typeof`/`typeof_unqual`
+ * operator taking an expression as its argument.  For example:
+ * ```
+ * int a;
+ * decltype(1+a) b;
+ * typeof(1+a) c;
+ * ```
+ * Here `expr` is `1+a`.
+ *
+ * Sometimes an additional pair of parentheses around the expression
+ * changes the semantics of the decltype, e.g.
+ * ```
+ * struct A { double x; };
+ * const A* a = new A();
+ * decltype( a->x ); // type is double
+ * decltype((a->x)); // type is const double&
+ * ```
+ * (Please consult the C++11 standard for more details).
+ * `parentheses_would_change_meaning` is `true` iff that is the case.
+ */
+
+/*
+case @decltype.kind of
+|  0 = @decltype
+|  1 = @typeof // The frontend does not differentiate between typeof and typeof_unqual
+;
+*/
+
+#keyset[id, expr]
+decltypes(
+    int id: @decltype,
+    int expr: @expr ref,
+    int kind: int ref,
+    int base_type: @type ref,
+    boolean parentheses_would_change_meaning: boolean ref
+);
+
+/*
+case @type_operator.kind of
+|  0 = @typeof // The frontend does not differentiate between typeof and typeof_unqual
+|  1 = @underlying_type
+|  2 = @bases
+|  3 = @direct_bases
+|  4 = @add_lvalue_reference
+|  5 = @add_pointer
+|  6 = @add_rvalue_reference
+|  7 = @decay
+|  8 = @make_signed
+|  9 = @make_unsigned
+| 10 = @remove_all_extents
+| 11 = @remove_const
+| 12 = @remove_cv
+| 13 = @remove_cvref
+| 14 = @remove_extent
+| 15 = @remove_pointer
+| 16 = @remove_reference_t
+| 17 = @remove_restrict
+| 18 = @remove_volatile
+| 19 = @remove_reference
+;
+*/
+
+type_operators(
+    unique int id: @type_operator,
+    int arg_type: @type ref,
+    int kind: int ref,
+    int base_type: @type ref
+)
+
+/*
+case @usertype.kind of
+|  0 = @unknown_usertype
+|  1 = @struct
+|  2 = @class
+|  3 = @union
+|  4 = @enum
+// ... 5 = @typedef deprecated        // classic C: typedef typedef type name
+// ... 6 = @template deprecated
+|  7 = @template_parameter
+|  8 = @template_template_parameter
+|  9 = @proxy_class                   // a proxy class associated with a template parameter
+// ... 10 objc_class deprecated
+// ... 11 objc_protocol deprecated
+// ... 12 objc_category deprecated
+| 13 = @scoped_enum
+// ... 14 = @using_alias deprecated   // a using name = type style typedef
+| 15 = @template_struct
+| 16 = @template_class
+| 17 = @template_union
+| 18 = @alias
+;
+*/
+
+usertypes(
+    unique int id: @usertype,
+    string name: string ref,
+    int kind: int ref
+);
+
+usertypesize(
+    unique int id: @usertype ref,
+    int size: int ref,
+    int alignment: int ref
+);
+
+usertype_final(unique int id: @usertype ref);
+
+usertype_uuid(
+    unique int id: @usertype ref,
+    string uuid: string ref
+);
+
+/*
+case @usertype.alias_kind of
+| 0 = @typedef
+| 1 = @alias
+*/
+
+usertype_alias_kind(
+    int id: @usertype ref,
+    int alias_kind: int ref
+)
+
+nontype_template_parameters(
+    int id: @expr ref
+);
+
+type_template_type_constraint(
+    int id: @usertype ref,
+    int constraint: @expr ref
+);
+
+mangled_name(
+    unique int id: @declaration ref,
+    int mangled_name : @mangledname,
+    boolean is_complete: boolean ref
+);
+
+is_pod_class(unique int id: @usertype ref);
+is_standard_layout_class(unique int id: @usertype ref);
+
+is_complete(unique int id: @usertype ref);
+
+is_class_template(unique int id: @usertype ref);
+class_instantiation(
+    int to: @usertype ref,
+    int from: @usertype ref
+);
+class_template_argument(
+    int type_id: @usertype ref,
+    int index: int ref,
+    int arg_type: @type ref
+);
+class_template_argument_value(
+    int type_id: @usertype ref,
+    int index: int ref,
+    int arg_value: @expr ref
+);
+
+@user_or_decltype = @usertype | @decltype;
+
+is_proxy_class_for(
+    unique int id: @usertype ref,
+    int templ_param_id: @user_or_decltype ref
+);
+
+type_mentions(
+    unique int id: @type_mention,
+    int type_id: @type ref,
+    int location: @location 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
+);
+
+template_template_instantiation(
+    int to: @usertype ref,
+    int from: @usertype ref
+);
+template_template_argument(
+    int type_id: @usertype ref,
+    int index: int ref,
+    int arg_type: @type ref
+);
+template_template_argument_value(
+    int type_id: @usertype ref,
+    int index: int ref,
+    int arg_value: @expr ref
+);
+
+@concept = @concept_template | @concept_id;
+
+concept_templates(
+    unique int concept_id: @concept_template,
+    string name: string ref,
+    int location: @location_default ref
+);
+concept_instantiation(
+    unique int to: @concept_id ref,
+    int from: @concept_template ref
+);
+is_type_constraint(int concept_id: @concept_id ref);
+concept_template_argument(
+    int concept_id: @concept ref,
+    int index: int ref,
+    int arg_type: @type ref
+);
+concept_template_argument_value(
+    int concept_id: @concept ref,
+    int index: int ref,
+    int arg_value: @expr ref
+);
+
+routinetypes(
+    unique int id: @routinetype,
+    int return_type: @type ref
+);
+
+routinetypeargs(
+    int routine: @routinetype ref,
+    int index: int ref,
+    int type_id: @type ref
+);
+
+ptrtomembers(
+    unique int id: @ptrtomember,
+    int type_id: @type ref,
+    int class_id: @type ref
+);
+
+/*
+ specifiers for types, functions, and variables
+
+    "public",
+    "protected",
+    "private",
+
+    "const",
+    "volatile",
+    "static",
+
+    "pure",
+    "virtual",
+    "sealed", // Microsoft
+    "__interface", // Microsoft
+    "inline",
+    "explicit",
+
+    "near", // near far extension
+    "far", // near far extension
+    "__ptr32", // Microsoft
+    "__ptr64", // Microsoft
+    "__sptr", // Microsoft
+    "__uptr", // Microsoft
+    "dllimport", // Microsoft
+    "dllexport", // Microsoft
+    "thread", // Microsoft
+    "naked", // Microsoft
+    "microsoft_inline", // Microsoft
+    "forceinline", // Microsoft
+    "selectany", // Microsoft
+    "nothrow", // Microsoft
+    "novtable", // Microsoft
+    "noreturn", // Microsoft
+    "noinline", // Microsoft
+    "noalias", // Microsoft
+    "restrict", // Microsoft
+*/
+
+specifiers(
+    unique int id: @specifier,
+    unique string str: string ref
+);
+
+typespecifiers(
+    int type_id: @type ref,
+    int spec_id: @specifier ref
+);
+
+funspecifiers(
+    int func_id: @function ref,
+    int spec_id: @specifier ref
+);
+
+varspecifiers(
+    int var_id: @accessible ref,
+    int spec_id: @specifier ref
+);
+
+explicit_specifier_exprs(
+    unique int func_id: @function ref,
+    int constant: @expr ref
+)
+
+attributes(
+    unique int id: @attribute,
+    int kind: int ref,
+    string name: string ref,
+    string name_space: string ref,
+    int location: @location_default ref
+);
+
+case @attribute.kind of
+  0 = @gnuattribute
+| 1 = @stdattribute
+| 2 = @declspec
+| 3 = @msattribute
+| 4 = @alignas
+// ... 5 @objc_propertyattribute deprecated
+;
+
+attribute_args(
+    unique int id: @attribute_arg,
+    int kind: int ref,
+    int attribute: @attribute ref,
+    int index: int ref,
+    int location: @location_default ref
+);
+
+case @attribute_arg.kind of
+  0 = @attribute_arg_empty
+| 1 = @attribute_arg_token
+| 2 = @attribute_arg_constant
+| 3 = @attribute_arg_type
+| 4 = @attribute_arg_constant_expr
+| 5 = @attribute_arg_expr
+;
+
+attribute_arg_value(
+    unique int arg: @attribute_arg ref,
+    string value: string ref
+);
+attribute_arg_type(
+    unique int arg: @attribute_arg ref,
+    int type_id: @type ref
+);
+attribute_arg_constant(
+    unique int arg: @attribute_arg ref,
+    int constant: @expr ref
+)
+attribute_arg_expr(
+    unique int arg: @attribute_arg ref,
+    int expr: @expr ref
+)
+attribute_arg_name(
+    unique int arg: @attribute_arg ref,
+    string name: string ref
+);
+
+typeattributes(
+    int type_id: @type ref,
+    int spec_id: @attribute ref
+);
+
+funcattributes(
+    int func_id: @function ref,
+    int spec_id: @attribute ref
+);
+
+varattributes(
+    int var_id: @accessible ref,
+    int spec_id: @attribute ref
+);
+
+stmtattributes(
+    int stmt_id: @stmt ref,
+    int spec_id: @attribute ref
+);
+
+@type = @builtintype
+      | @derivedtype
+      | @usertype
+      | @routinetype
+      | @ptrtomember
+      | @decltype
+      | @type_operator;
+
+unspecifiedtype(
+    unique int type_id: @type ref,
+    int unspecified_type_id: @type ref
+);
+
+member(
+    int parent: @type ref,
+    int index: int ref,
+    int child: @member ref
+);
+
+@enclosingfunction_child = @usertype | @variable | @namespace
+
+enclosingfunction(
+    unique int child: @enclosingfunction_child ref,
+    int parent: @function ref
+);
+
+derivations(
+    unique int derivation: @derivation,
+    int sub: @type ref,
+    int index: int ref,
+    int super: @type ref,
+    int location: @location_default ref
+);
+
+derspecifiers(
+    int der_id: @derivation ref,
+    int spec_id: @specifier ref
+);
+
+/**
+ * Contains the byte offset of the base class subobject within the derived
+ * class. Only holds for non-virtual base classes, but see table
+ * `virtual_base_offsets` for offsets of virtual base class subobjects.
+ */
+direct_base_offsets(
+    unique int der_id: @derivation ref,
+    int offset: int ref
+);
+
+/**
+ * Contains the byte offset of the virtual base class subobject for class
+ * `super` within a most-derived object of class `sub`. `super` can be either a
+ * direct or indirect base class.
+ */
+#keyset[sub, super]
+virtual_base_offsets(
+    int sub: @usertype ref,
+    int super: @usertype ref,
+    int offset: int ref
+);
+
+frienddecls(
+    unique int id: @frienddecl,
+    int type_id: @type ref,
+    int decl_id: @declaration ref,
+    int location: @location_default ref
+);
+
+@declaredtype = @usertype ;
+
+@declaration = @function
+             | @declaredtype
+             | @variable
+             | @enumconstant
+             | @frienddecl
+             | @concept_template;
+
+@member = @membervariable
+        | @function
+        | @declaredtype
+        | @enumconstant;
+
+@locatable = @diagnostic
+           | @declaration
+           | @ppd_include
+           | @ppd_define
+           | @macroinvocation
+           /*| @funcall*/
+           | @xmllocatable
+           | @attribute
+           | @attribute_arg;
+
+@namedscope = @namespace | @usertype;
+
+@element = @locatable
+         | @file
+         | @folder
+         | @specifier
+         | @type
+         | @expr
+         | @namespace
+         | @initialiser
+         | @stmt
+         | @derivation
+         | @comment
+         | @preprocdirect
+         | @fun_decl
+         | @var_decl
+         | @type_decl
+         | @namespace_decl
+         | @using
+         | @namequalifier
+         | @specialnamequalifyingelement
+         | @static_assert
+         | @type_mention
+         | @lambdacapture;
+
+@exprparent = @element;
+
+comments(
+    unique int id: @comment,
+    string contents: string ref,
+    int location: @location_default ref
+);
+
+commentbinding(
+    int id: @comment ref,
+    int element: @element ref
+);
+
+exprconv(
+    int converted: @expr ref,
+    unique int conversion: @expr ref
+);
+
+compgenerated(unique int id: @element ref);
+
+/**
+ * `destructor_call` destructs the `i`'th entity that should be
+ * destructed following `element`. Note that entities should be
+ * destructed in reverse construction order, so for a given `element`
+ * these should be called from highest to lowest `i`.
+ */
+#keyset[element, destructor_call]
+#keyset[element, i]
+synthetic_destructor_call(
+    int element: @element ref,
+    int i: int ref,
+    int destructor_call: @routineexpr ref
+);
+
+namespaces(
+    unique int id: @namespace,
+    string name: string ref
+);
+
+namespace_inline(
+    unique int id: @namespace ref
+);
+
+namespacembrs(
+    int parentid: @namespace ref,
+    unique int memberid: @namespacembr ref
+);
+
+@namespacembr = @declaration | @namespace;
+
+exprparents(
+    int expr_id: @expr ref,
+    int child_index: int ref,
+    int parent_id: @exprparent ref
+);
+
+expr_isload(unique int expr_id: @expr ref);
+
+@cast = @c_style_cast
+      | @const_cast
+      | @dynamic_cast
+      | @reinterpret_cast
+      | @static_cast
+      ;
+
+/*
+case @conversion.kind of
+  0 = @simple_conversion           // a numeric conversion, qualification conversion, or a reinterpret_cast
+| 1 = @bool_conversion             // conversion to 'bool'
+| 2 = @base_class_conversion       // a derived-to-base conversion
+| 3 = @derived_class_conversion    // a base-to-derived conversion
+| 4 = @pm_base_class_conversion    // a derived-to-base conversion of a pointer to member
+| 5 = @pm_derived_class_conversion // a base-to-derived conversion of a pointer to member
+| 6 = @glvalue_adjust              // an adjustment of the type of a glvalue
+| 7 = @prvalue_adjust              // an adjustment of the type of a prvalue
+;
+*/
+/**
+ * Describes the semantics represented by a cast expression. This is largely
+ * independent of the source syntax of the cast, so it is separate from the
+ * regular expression kind.
+ */
+conversionkinds(
+    unique int expr_id: @cast ref,
+    int kind: int ref
+);
+
+@conversion = @cast
+            | @array_to_pointer
+            | @parexpr
+            | @reference_to
+            | @ref_indirect
+            | @temp_init
+            | @c11_generic
+            ;
+
+/*
+case @funbindexpr.kind of
+  0 = @normal_call  // a normal call
+| 1 = @virtual_call // a virtual call
+| 2 = @adl_call     // a call whose target is only found by ADL
+;
+*/
+iscall(
+    unique int caller: @funbindexpr ref,
+    int kind: int ref
+);
+
+numtemplatearguments(
+    unique int expr_id: @expr ref,
+    int num: int ref
+);
+
+specialnamequalifyingelements(
+    unique int id: @specialnamequalifyingelement,
+    unique string name: string ref
+);
+
+@namequalifiableelement = @expr | @namequalifier;
+@namequalifyingelement = @namespace
+                       | @specialnamequalifyingelement
+                       | @usertype;
+
+namequalifiers(
+    unique int id: @namequalifier,
+    unique int qualifiableelement: @namequalifiableelement ref,
+    int qualifyingelement: @namequalifyingelement ref,
+    int location: @location_default ref
+);
+
+varbind(
+    int expr: @varbindexpr ref,
+    int var: @accessible ref
+);
+
+funbind(
+    int expr: @funbindexpr ref,
+    int fun: @function ref
+);
+
+@any_new_expr = @new_expr
+              | @new_array_expr;
+
+@new_or_delete_expr = @any_new_expr
+                    | @delete_expr
+                    | @delete_array_expr;
+
+@prefix_crement_expr = @preincrexpr | @predecrexpr;
+
+@postfix_crement_expr = @postincrexpr | @postdecrexpr;
+
+@increment_expr = @preincrexpr | @postincrexpr;
+
+@decrement_expr = @predecrexpr | @postdecrexpr;
+
+@crement_expr = @increment_expr | @decrement_expr;
+
+@un_arith_op_expr = @arithnegexpr
+                  | @unaryplusexpr
+                  | @conjugation
+                  | @realpartexpr
+                  | @imagpartexpr
+                  | @crement_expr
+                  ;
+
+@un_bitwise_op_expr = @complementexpr;
+
+@un_log_op_expr = @notexpr;
+
+@un_op_expr = @address_of
+            | @indirect
+            | @un_arith_op_expr
+            | @un_bitwise_op_expr
+            | @builtinaddressof
+            | @vec_fill
+            | @un_log_op_expr
+            | @co_await
+            | @co_yield
+            ;
+
+@bin_log_op_expr = @andlogicalexpr | @orlogicalexpr;
+
+@cmp_op_expr = @eq_op_expr | @rel_op_expr;
+
+@eq_op_expr = @eqexpr | @neexpr;
+
+@rel_op_expr = @gtexpr
+             | @ltexpr
+             | @geexpr
+             | @leexpr
+             | @spaceshipexpr
+             ;
+
+@bin_bitwise_op_expr = @lshiftexpr
+                     | @rshiftexpr
+                     | @andexpr
+                     | @orexpr
+                     | @xorexpr
+                     ;
+
+@p_arith_op_expr = @paddexpr
+                 | @psubexpr
+                 | @pdiffexpr
+                 ;
+
+@bin_arith_op_expr = @addexpr
+                   | @subexpr
+                   | @mulexpr
+                   | @divexpr
+                   | @remexpr
+                   | @jmulexpr
+                   | @jdivexpr
+                   | @fjaddexpr
+                   | @jfaddexpr
+                   | @fjsubexpr
+                   | @jfsubexpr
+                   | @minexpr
+                   | @maxexpr
+                   | @p_arith_op_expr
+                   ;
+
+@bin_op_expr = @bin_arith_op_expr
+             | @bin_bitwise_op_expr
+             | @cmp_op_expr
+             | @bin_log_op_expr
+             ;
+
+@op_expr = @un_op_expr
+         | @bin_op_expr
+         | @assign_expr
+         | @conditionalexpr
+         ;
+
+@assign_arith_expr = @assignaddexpr
+                   | @assignsubexpr
+                   | @assignmulexpr
+                   | @assigndivexpr
+                   | @assignremexpr
+                   ;
+
+@assign_bitwise_expr = @assignandexpr
+                     | @assignorexpr
+                     | @assignxorexpr
+                     | @assignlshiftexpr
+                     | @assignrshiftexpr
+                     ;
+
+@assign_pointer_expr = @assignpaddexpr
+                     | @assignpsubexpr
+                     ;
+
+@assign_op_expr = @assign_arith_expr
+                | @assign_bitwise_expr
+                | @assign_pointer_expr
+                ;
+
+@assign_expr = @assignexpr | @assign_op_expr | @blockassignexpr
+
+/*
+  Binary encoding of the allocator form.
+
+  case @allocator.form of
+    0 = plain
+  | 1 = alignment
+  ;
+*/
+
+/**
+ * The allocator function associated with a `new` or `new[]` expression.
+ * The `form` column specified whether the allocation call contains an alignment
+ * argument.
+ */
+expr_allocator(
+    unique int expr: @any_new_expr ref,
+    int func: @function ref,
+    int form: int ref
+);
+
+/*
+  Binary encoding of the deallocator form.
+
+  case @deallocator.form of
+    0 = plain
+  | 1 = size
+  | 2 = alignment
+  | 4 = destroying_delete
+  ;
+*/
+
+/**
+ * The deallocator function associated with a `delete`, `delete[]`, `new`, or
+ * `new[]` expression. For a `new` or `new[]` expression, the deallocator is the
+ * one used to free memory if the initialization throws an exception.
+ * The `form` column specifies whether the deallocation call contains a size
+ * argument, and alignment argument, or both.
+ */
+expr_deallocator(
+    unique int expr: @new_or_delete_expr ref,
+    int func: @function ref,
+    int form: int ref
+);
+
+/**
+ * Holds if the `@conditionalexpr` is of the two operand form
+ * `guard ? : false`.
+ */
+expr_cond_two_operand(
+    unique int cond: @conditionalexpr ref
+);
+
+/**
+ * The guard of `@conditionalexpr` `guard ? true : false`
+ */
+expr_cond_guard(
+    unique int cond: @conditionalexpr ref,
+    int guard: @expr ref
+);
+
+/**
+ * The expression used when the guard of `@conditionalexpr`
+ * `guard ? true : false` holds. For the two operand form
+ * `guard ?: false` consider using `expr_cond_guard` instead.
+ */
+expr_cond_true(
+    unique int cond: @conditionalexpr ref,
+    int true: @expr ref
+);
+
+/**
+ * The expression used when the guard of `@conditionalexpr`
+ * `guard ? true : false` does not hold.
+ */
+expr_cond_false(
+    unique int cond: @conditionalexpr ref,
+    int false: @expr ref
+);
+
+/** A string representation of the value. */
+values(
+    unique int id: @value,
+    string str: string ref
+);
+
+/** The actual text in the source code for the value, if any. */
+valuetext(
+    unique int id: @value ref,
+    string text: string ref
+);
+
+valuebind(
+    int val: @value ref,
+    unique int expr: @expr ref
+);
+
+fieldoffsets(
+    unique int id: @variable ref,
+    int byteoffset: int ref,
+    int bitoffset: int ref
+);
+
+bitfield(
+    unique int id: @variable ref,
+    int bits: int ref,
+    int declared_bits: int ref
+);
+
+/* TODO
+memberprefix(
+    int member: @expr ref,
+    int prefix: @expr ref
+);
+*/
+
+/*
+   kind(1) = mbrcallexpr
+   kind(2) = mbrptrcallexpr
+   kind(3) = mbrptrmbrcallexpr
+   kind(4) = ptrmbrptrmbrcallexpr
+   kind(5) = mbrreadexpr // x.y
+   kind(6) = mbrptrreadexpr // p->y
+   kind(7) = mbrptrmbrreadexpr // x.*pm
+   kind(8) = mbrptrmbrptrreadexpr // x->*pm
+   kind(9) = staticmbrreadexpr // static x.y
+   kind(10) = staticmbrptrreadexpr // static p->y
+*/
+/* TODO
+memberaccess(
+    int member: @expr ref,
+    int kind: int ref
+);
+*/
+
+initialisers(
+    unique int init: @initialiser,
+    int var: @accessible ref,
+    unique int expr: @expr ref,
+    int location: @location_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
+);
+
+expr_reuse(
+    int reuse: @expr ref,
+    int original: @expr ref,
+    int value_category: int ref
+)
+
+/*
+  case @value.category of
+    1 = prval
+  | 2 = xval
+  | 3 = lval
+  ;
+*/
+expr_types(
+    int id: @expr ref,
+    int typeid: @type ref,
+    int value_category: int ref
+);
+
+case @expr.kind of
+    1 = @errorexpr
+|   2 = @address_of // & AddressOfExpr
+|   3 = @reference_to // ReferenceToExpr (implicit?)
+|   4 = @indirect // * PointerDereferenceExpr
+|   5 = @ref_indirect // ReferenceDereferenceExpr (implicit?)
+// ...
+|   8 = @array_to_pointer // (???)
+|   9 = @vacuous_destructor_call // VacuousDestructorCall
+// ...
+|  11 = @assume // Microsoft
+|  12 = @parexpr
+|  13 = @arithnegexpr
+|  14 = @unaryplusexpr
+|  15 = @complementexpr
+|  16 = @notexpr
+|  17 = @conjugation // GNU ~ operator
+|  18 = @realpartexpr // GNU __real
+|  19 = @imagpartexpr // GNU __imag
+|  20 = @postincrexpr
+|  21 = @postdecrexpr
+|  22 = @preincrexpr
+|  23 = @predecrexpr
+|  24 = @conditionalexpr
+|  25 = @addexpr
+|  26 = @subexpr
+|  27 = @mulexpr
+|  28 = @divexpr
+|  29 = @remexpr
+|  30 = @jmulexpr // C99 mul imaginary
+|  31 = @jdivexpr // C99 div imaginary
+|  32 = @fjaddexpr // C99 add real + imaginary
+|  33 = @jfaddexpr // C99 add imaginary + real
+|  34 = @fjsubexpr // C99 sub real - imaginary
+|  35 = @jfsubexpr // C99 sub imaginary - real
+|  36 = @paddexpr // pointer add (pointer + int or int + pointer)
+|  37 = @psubexpr // pointer sub (pointer - integer)
+|  38 = @pdiffexpr // difference between two pointers
+|  39 = @lshiftexpr
+|  40 = @rshiftexpr
+|  41 = @andexpr
+|  42 = @orexpr
+|  43 = @xorexpr
+|  44 = @eqexpr
+|  45 = @neexpr
+|  46 = @gtexpr
+|  47 = @ltexpr
+|  48 = @geexpr
+|  49 = @leexpr
+|  50 = @minexpr // GNU minimum
+|  51 = @maxexpr // GNU maximum
+|  52 = @assignexpr
+|  53 = @assignaddexpr
+|  54 = @assignsubexpr
+|  55 = @assignmulexpr
+|  56 = @assigndivexpr
+|  57 = @assignremexpr
+|  58 = @assignlshiftexpr
+|  59 = @assignrshiftexpr
+|  60 = @assignandexpr
+|  61 = @assignorexpr
+|  62 = @assignxorexpr
+|  63 = @assignpaddexpr // assign pointer add
+|  64 = @assignpsubexpr // assign pointer sub
+|  65 = @andlogicalexpr
+|  66 = @orlogicalexpr
+|  67 = @commaexpr
+|  68 = @subscriptexpr // access to member of an array, e.g., a[5]
+// ...  69 @objc_subscriptexpr deprecated
+// ...  70 @cmdaccess deprecated
+// ...
+|  73 = @virtfunptrexpr
+|  74 = @callexpr
+// ...  75 @msgexpr_normal deprecated
+// ...  76 @msgexpr_super deprecated
+// ...  77 @atselectorexpr deprecated
+// ...  78 @atprotocolexpr deprecated
+|  79 = @vastartexpr
+|  80 = @vaargexpr
+|  81 = @vaendexpr
+|  82 = @vacopyexpr
+// ...  83 @atencodeexpr deprecated
+|  84 = @varaccess
+|  85 = @thisaccess
+// ...  86 @objc_box_expr deprecated
+|  87 = @new_expr
+|  88 = @delete_expr
+|  89 = @throw_expr
+|  90 = @condition_decl // a variable declared in a condition, e.g., if(int x = y > 2)
+|  91 = @braced_init_list
+|  92 = @type_id
+|  93 = @runtime_sizeof
+|  94 = @runtime_alignof
+|  95 = @sizeof_pack
+|  96 = @expr_stmt // GNU extension
+|  97 = @routineexpr
+|  98 = @type_operand // used to access a type in certain contexts (haven't found any examples yet....)
+|  99 = @offsetofexpr // offsetof ::= type and field
+| 100 = @hasassignexpr // __has_assign ::= type
+| 101 = @hascopyexpr // __has_copy ::= type
+| 102 = @hasnothrowassign // __has_nothrow_assign ::= type
+| 103 = @hasnothrowconstr // __has_nothrow_constructor ::= type
+| 104 = @hasnothrowcopy // __has_nothrow_copy ::= type
+| 105 = @hastrivialassign // __has_trivial_assign ::= type
+| 106 = @hastrivialconstr // __has_trivial_constructor ::= type
+| 107 = @hastrivialcopy // __has_trivial_copy ::= type
+| 108 = @hasuserdestr // __has_user_destructor ::= type
+| 109 = @hasvirtualdestr // __has_virtual_destructor ::= type
+| 110 = @isabstractexpr // __is_abstract ::= type
+| 111 = @isbaseofexpr // __is_base_of ::= type type
+| 112 = @isclassexpr // __is_class ::= type
+| 113 = @isconvtoexpr // __is_convertible_to ::= type type
+| 114 = @isemptyexpr // __is_empty ::= type
+| 115 = @isenumexpr // __is_enum ::= type
+| 116 = @ispodexpr // __is_pod ::= type
+| 117 = @ispolyexpr // __is_polymorphic ::= type
+| 118 = @isunionexpr // __is_union ::= type
+| 119 = @typescompexpr // GNU __builtin_types_compatible ::= type type
+| 120 = @intaddrexpr // frontend internal builtin, used to implement offsetof
+// ...
+| 122 = @hastrivialdestructor // __has_trivial_destructor ::= type
+| 123 = @literal
+| 124 = @uuidof
+| 127 = @aggregateliteral
+| 128 = @delete_array_expr
+| 129 = @new_array_expr
+// ... 130 @objc_array_literal deprecated
+// ... 131 @objc_dictionary_literal deprecated
+| 132 = @foldexpr
+// ...
+| 200 = @ctordirectinit
+| 201 = @ctorvirtualinit
+| 202 = @ctorfieldinit
+| 203 = @ctordelegatinginit
+| 204 = @dtordirectdestruct
+| 205 = @dtorvirtualdestruct
+| 206 = @dtorfielddestruct
+// ...
+| 210 = @static_cast
+| 211 = @reinterpret_cast
+| 212 = @const_cast
+| 213 = @dynamic_cast
+| 214 = @c_style_cast
+| 215 = @lambdaexpr
+| 216 = @param_ref
+| 217 = @noopexpr
+// ...
+| 294 = @istriviallyconstructibleexpr
+| 295 = @isdestructibleexpr
+| 296 = @isnothrowdestructibleexpr
+| 297 = @istriviallydestructibleexpr
+| 298 = @istriviallyassignableexpr
+| 299 = @isnothrowassignableexpr
+| 300 = @istrivialexpr
+| 301 = @isstandardlayoutexpr
+| 302 = @istriviallycopyableexpr
+| 303 = @isliteraltypeexpr
+| 304 = @hastrivialmoveconstructorexpr
+| 305 = @hastrivialmoveassignexpr
+| 306 = @hasnothrowmoveassignexpr
+| 307 = @isconstructibleexpr
+| 308 = @isnothrowconstructibleexpr
+| 309 = @hasfinalizerexpr
+| 310 = @isdelegateexpr
+| 311 = @isinterfaceclassexpr
+| 312 = @isrefarrayexpr
+| 313 = @isrefclassexpr
+| 314 = @issealedexpr
+| 315 = @issimplevalueclassexpr
+| 316 = @isvalueclassexpr
+| 317 = @isfinalexpr
+| 319 = @noexceptexpr
+| 320 = @builtinshufflevector
+| 321 = @builtinchooseexpr
+| 322 = @builtinaddressof
+| 323 = @vec_fill
+| 324 = @builtinconvertvector
+| 325 = @builtincomplex
+| 326 = @spaceshipexpr
+| 327 = @co_await
+| 328 = @co_yield
+| 329 = @temp_init
+| 330 = @isassignable
+| 331 = @isaggregate
+| 332 = @hasuniqueobjectrepresentations
+| 333 = @builtinbitcast
+| 334 = @builtinshuffle
+| 335 = @blockassignexpr
+| 336 = @issame
+| 337 = @isfunction
+| 338 = @islayoutcompatible
+| 339 = @ispointerinterconvertiblebaseof
+| 340 = @isarray
+| 341 = @arrayrank
+| 342 = @arrayextent
+| 343 = @isarithmetic
+| 344 = @iscompletetype
+| 345 = @iscompound
+| 346 = @isconst
+| 347 = @isfloatingpoint
+| 348 = @isfundamental
+| 349 = @isintegral
+| 350 = @islvaluereference
+| 351 = @ismemberfunctionpointer
+| 352 = @ismemberobjectpointer
+| 353 = @ismemberpointer
+| 354 = @isobject
+| 355 = @ispointer
+| 356 = @isreference
+| 357 = @isrvaluereference
+| 358 = @isscalar
+| 359 = @issigned
+| 360 = @isunsigned
+| 361 = @isvoid
+| 362 = @isvolatile
+| 363 = @reuseexpr
+| 364 = @istriviallycopyassignable
+| 365 = @isassignablenopreconditioncheck
+| 366 = @referencebindstotemporary
+| 367 = @issameas
+| 368 = @builtinhasattribute
+| 369 = @ispointerinterconvertiblewithclass
+| 370 = @builtinispointerinterconvertiblewithclass
+| 371 = @iscorrespondingmember
+| 372 = @builtiniscorrespondingmember
+| 373 = @isboundedarray
+| 374 = @isunboundedarray
+| 375 = @isreferenceable
+| 378 = @isnothrowconvertible
+| 379 = @referenceconstructsfromtemporary
+| 380 = @referenceconvertsfromtemporary
+| 381 = @isconvertible
+| 382 = @isvalidwinrttype
+| 383 = @iswinclass
+| 384 = @iswininterface
+| 385 = @istriviallyequalitycomparable
+| 386 = @isscopedenum
+| 387 = @istriviallyrelocatable
+| 388 = @datasizeof
+| 389 = @c11_generic
+| 390 = @requires_expr
+| 391 = @nested_requirement
+| 392 = @compound_requirement
+| 393 = @concept_id
+;
+
+@var_args_expr = @vastartexpr
+               | @vaendexpr
+               | @vaargexpr
+               | @vacopyexpr
+               ;
+
+@builtin_op = @var_args_expr
+            | @noopexpr
+            | @offsetofexpr
+            | @intaddrexpr
+            | @hasassignexpr
+            | @hascopyexpr
+            | @hasnothrowassign
+            | @hasnothrowconstr
+            | @hasnothrowcopy
+            | @hastrivialassign
+            | @hastrivialconstr
+            | @hastrivialcopy
+            | @hastrivialdestructor
+            | @hasuserdestr
+            | @hasvirtualdestr
+            | @isabstractexpr
+            | @isbaseofexpr
+            | @isclassexpr
+            | @isconvtoexpr
+            | @isemptyexpr
+            | @isenumexpr
+            | @ispodexpr
+            | @ispolyexpr
+            | @isunionexpr
+            | @typescompexpr
+            | @builtinshufflevector
+            | @builtinconvertvector
+            | @builtinaddressof
+            | @istriviallyconstructibleexpr
+            | @isdestructibleexpr
+            | @isnothrowdestructibleexpr
+            | @istriviallydestructibleexpr
+            | @istriviallyassignableexpr
+            | @isnothrowassignableexpr
+            | @istrivialexpr
+            | @isstandardlayoutexpr
+            | @istriviallycopyableexpr
+            | @isliteraltypeexpr
+            | @hastrivialmoveconstructorexpr
+            | @hastrivialmoveassignexpr
+            | @hasnothrowmoveassignexpr
+            | @isconstructibleexpr
+            | @isnothrowconstructibleexpr
+            | @hasfinalizerexpr
+            | @isdelegateexpr
+            | @isinterfaceclassexpr
+            | @isrefarrayexpr
+            | @isrefclassexpr
+            | @issealedexpr
+            | @issimplevalueclassexpr
+            | @isvalueclassexpr
+            | @isfinalexpr
+            | @builtinchooseexpr
+            | @builtincomplex
+            | @isassignable
+            | @isaggregate
+            | @hasuniqueobjectrepresentations
+            | @builtinbitcast
+            | @builtinshuffle
+            | @issame
+            | @isfunction
+            | @islayoutcompatible
+            | @ispointerinterconvertiblebaseof
+            | @isarray
+            | @arrayrank
+            | @arrayextent
+            | @isarithmetic
+            | @iscompletetype
+            | @iscompound
+            | @isconst
+            | @isfloatingpoint
+            | @isfundamental
+            | @isintegral
+            | @islvaluereference
+            | @ismemberfunctionpointer
+            | @ismemberobjectpointer
+            | @ismemberpointer
+            | @isobject
+            | @ispointer
+            | @isreference
+            | @isrvaluereference
+            | @isscalar
+            | @issigned
+            | @isunsigned
+            | @isvoid
+            | @isvolatile
+            | @istriviallycopyassignable
+            | @isassignablenopreconditioncheck
+            | @referencebindstotemporary
+            | @issameas
+            | @builtinhasattribute
+            | @ispointerinterconvertiblewithclass
+            | @builtinispointerinterconvertiblewithclass
+            | @iscorrespondingmember
+            | @builtiniscorrespondingmember
+            | @isboundedarray
+            | @isunboundedarray
+            | @isreferenceable
+            | @isnothrowconvertible
+            | @referenceconstructsfromtemporary
+            | @referenceconvertsfromtemporary
+            | @isconvertible
+            | @isvalidwinrttype
+            | @iswinclass
+            | @iswininterface
+            | @istriviallyequalitycomparable
+            | @isscopedenum
+            | @istriviallyrelocatable
+            ;
+
+compound_requirement_is_noexcept(
+    int expr: @compound_requirement ref
+);
+
+new_allocated_type(
+    unique int expr: @new_expr ref,
+    int type_id: @type ref
+);
+
+new_array_allocated_type(
+    unique int expr: @new_array_expr ref,
+    int type_id: @type ref
+);
+
+/**
+ * The field being initialized by an initializer expression within an aggregate
+ * initializer for a class/struct/union. Position is used to sort repeated initializers.
+ */
+#keyset[aggregate, position]
+aggregate_field_init(
+    int aggregate: @aggregateliteral ref,
+    int initializer: @expr ref,
+    int field: @membervariable ref,
+    int position: int ref,
+    boolean is_designated: boolean ref
+);
+
+/**
+ * The index of the element being initialized by an initializer expression
+ * within an aggregate initializer for an array. Position is used to sort repeated initializers.
+ */
+#keyset[aggregate, position]
+aggregate_array_init(
+    int aggregate: @aggregateliteral ref,
+    int initializer: @expr ref,
+    int element_index: int ref,
+    int position: int ref,
+    boolean is_designated: boolean ref
+);
+
+@ctorinit = @ctordirectinit
+          | @ctorvirtualinit
+          | @ctorfieldinit
+          | @ctordelegatinginit;
+@dtordestruct = @dtordirectdestruct
+              | @dtorvirtualdestruct
+              | @dtorfielddestruct;
+
+
+condition_decl_bind(
+    unique int expr: @condition_decl ref,
+    unique int decl: @declaration ref
+);
+
+typeid_bind(
+    unique int expr: @type_id ref,
+    int type_id: @type ref
+);
+
+uuidof_bind(
+    unique int expr: @uuidof ref,
+    int type_id: @type ref
+);
+
+@sizeof_or_alignof = @runtime_sizeof | @runtime_alignof | @datasizeof | @sizeof_pack;
+
+sizeof_bind(
+    unique int expr: @sizeof_or_alignof ref,
+    int type_id: @type ref
+);
+
+code_block(
+    unique int block: @literal ref,
+    unique int routine: @function ref
+);
+
+lambdas(
+    unique int expr: @lambdaexpr ref,
+    string default_capture: string ref,
+    boolean has_explicit_return_type: boolean ref
+);
+
+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
+|  38 = @stmt_consteval_if
+|  39 = @stmt_not_consteval_if
+;
+
+type_vla(
+    int type_id: @type ref,
+    int decl: @stmt_vla_decl ref
+);
+
+variable_vla(
+    int var: @variable ref,
+    int decl: @stmt_vla_decl ref
+);
+
+type_is_vla(unique int type_id: @derivedtype ref)
+
+if_initialization(
+    unique int if_stmt: @stmt_if ref,
+    int init_id: @stmt ref
+);
+
+if_then(
+    unique int if_stmt: @stmt_if ref,
+    int then_id: @stmt ref
+);
+
+if_else(
+    unique int if_stmt: @stmt_if ref,
+    int else_id: @stmt ref
+);
+
+constexpr_if_initialization(
+    unique int constexpr_if_stmt: @stmt_constexpr_if ref,
+    int init_id: @stmt ref
+);
+
+constexpr_if_then(
+    unique int constexpr_if_stmt: @stmt_constexpr_if ref,
+    int then_id: @stmt ref
+);
+
+constexpr_if_else(
+    unique int constexpr_if_stmt: @stmt_constexpr_if ref,
+    int else_id: @stmt ref
+);
+
+@stmt_consteval_or_not_consteval_if = @stmt_consteval_if | @stmt_not_consteval_if;
+
+consteval_if_then(
+    unique int constexpr_if_stmt: @stmt_consteval_or_not_consteval_if ref,
+    int then_id: @stmt ref
+);
+
+consteval_if_else(
+    unique int constexpr_if_stmt: @stmt_consteval_or_not_consteval_if ref,
+    int else_id: @stmt ref
+);
+
+while_body(
+    unique int while_stmt: @stmt_while ref,
+    int body_id: @stmt ref
+);
+
+do_body(
+    unique int do_stmt: @stmt_end_test_while ref,
+    int body_id: @stmt ref
+);
+
+switch_initialization(
+    unique int switch_stmt: @stmt_switch ref,
+    int init_id: @stmt ref
+);
+
+#keyset[switch_stmt, index]
+switch_case(
+    int switch_stmt: @stmt_switch ref,
+    int index: int ref,
+    int case_id: @stmt_switch_case ref
+);
+
+switch_body(
+    unique int switch_stmt: @stmt_switch ref,
+    int body_id: @stmt ref
+);
+
+@stmt_for_or_range_based_for = @stmt_for
+                             | @stmt_range_based_for;
+
+for_initialization(
+    unique int for_stmt: @stmt_for_or_range_based_for ref,
+    int init_id: @stmt ref
+);
+
+for_condition(
+    unique int for_stmt: @stmt_for ref,
+    int condition_id: @expr ref
+);
+
+for_update(
+    unique int for_stmt: @stmt_for ref,
+    int update_id: @expr ref
+);
+
+for_body(
+    unique int for_stmt: @stmt_for ref,
+    int body_id: @stmt ref
+);
+
+@stmtparent = @stmt | @expr_stmt ;
+stmtparents(
+    unique int id: @stmt ref,
+    int index: int ref,
+    int parent: @stmtparent ref
+);
+
+ishandler(unique int block: @stmt_block ref);
+
+@cfgnode = @stmt | @expr | @function | @initialiser ;
+
+stmt_decl_bind(
+    int stmt: @stmt_decl ref,
+    int num: int ref,
+    int decl: @declaration ref
+);
+
+stmt_decl_entry_bind(
+    int stmt: @stmt_decl ref,
+    int num: int ref,
+    int decl_entry: @element ref
+);
+
+@parameterized_element = @function | @stmt_block | @requires_expr;
+
+blockscope(
+    unique int block: @stmt_block ref,
+    int enclosing: @parameterized_element ref
+);
+
+@jump = @stmt_goto | @stmt_break | @stmt_continue;
+
+@jumporlabel = @jump | @stmt_label | @literal;
+
+jumpinfo(
+    unique int id: @jumporlabel ref,
+    string str: string ref,
+    int target: @stmt ref
+);
+
+preprocdirects(
+    unique int id: @preprocdirect,
+    int kind: int ref,
+    int location: @location_default ref
+);
+case @preprocdirect.kind of
+   0 = @ppd_if
+|  1 = @ppd_ifdef
+|  2 = @ppd_ifndef
+|  3 = @ppd_elif
+|  4 = @ppd_else
+|  5 = @ppd_endif
+|  6 = @ppd_plain_include
+|  7 = @ppd_define
+|  8 = @ppd_undef
+|  9 = @ppd_line
+| 10 = @ppd_error
+| 11 = @ppd_pragma
+| 12 = @ppd_objc_import
+| 13 = @ppd_include_next
+| 14 = @ppd_ms_import
+| 15 = @ppd_elifdef
+| 16 = @ppd_elifndef
+| 18 = @ppd_warning
+;
+
+@ppd_include = @ppd_plain_include | @ppd_objc_import | @ppd_include_next | @ppd_ms_import;
+
+@ppd_branch = @ppd_if | @ppd_ifdef | @ppd_ifndef | @ppd_elif | @ppd_elifdef | @ppd_elifndef;
+
+preprocpair(
+    int begin : @ppd_branch ref,
+    int elseelifend : @preprocdirect ref
+);
+
+preproctrue(int branch : @ppd_branch ref);
+preprocfalse(int branch : @ppd_branch ref);
+
+preproctext(
+    unique int id: @preprocdirect ref,
+    string head: string ref,
+    string body: string ref
+);
+
+includes(
+    unique int id: @ppd_include ref,
+    int included: @file ref
+);
+
+link_targets(
+    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/9a7c3c14c1076f64b871719117a558733d987b48/upgrade.properties b/cpp/ql/lib/upgrades/9a7c3c14c1076f64b871719117a558733d987b48/upgrade.properties
new file mode 100644
index 00000000000..3fdb0aa5a82
--- /dev/null
+++ b/cpp/ql/lib/upgrades/9a7c3c14c1076f64b871719117a558733d987b48/upgrade.properties
@@ -0,0 +1,2 @@
+description: Support __mfp8 type
+compatibility: full
diff --git a/cpp/ql/lib/upgrades/af887e83a815a9cefe774ffa80e2493a1365b9e2/lambdas.ql b/cpp/ql/lib/upgrades/af887e83a815a9cefe774ffa80e2493a1365b9e2/lambdas.ql
new file mode 100644
index 00000000000..f3891442a86
--- /dev/null
+++ b/cpp/ql/lib/upgrades/af887e83a815a9cefe774ffa80e2493a1365b9e2/lambdas.ql
@@ -0,0 +1,7 @@
+class LambdaExpr extends @lambdaexpr {
+  string toString() { none() }
+}
+
+from LambdaExpr lambda, string default_capture, boolean has_explicit_return_type
+where lambdas(lambda, default_capture, has_explicit_return_type)
+select lambda, default_capture, has_explicit_return_type, true
diff --git a/cpp/ql/lib/upgrades/af887e83a815a9cefe774ffa80e2493a1365b9e2/old.dbscheme b/cpp/ql/lib/upgrades/af887e83a815a9cefe774ffa80e2493a1365b9e2/old.dbscheme
new file mode 100644
index 00000000000..af887e83a81
--- /dev/null
+++ b/cpp/ql/lib/upgrades/af887e83a815a9cefe774ffa80e2493a1365b9e2/old.dbscheme
@@ -0,0 +1,2492 @@
+
+/**
+ * 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
+);
+
+/**
+ * Optionally, record the build mode for each compilation.
+ */
+compilation_build_mode(
+    unique int id : @compilation ref,
+    int mode : int ref
+);
+
+/*
+case @compilation_build_mode.mode of
+  0 = @build_mode_none
+| 1 = @build_mode_manual
+| 2 = @build_mode_auto
+;
+*/
+
+/**
+ * The source files that are compiled by a compiler invocation.
+ * If `id` is for the compiler invocation
+ *
+ *   gcc -c f1.c f2.c f3.c
+ *
+ * then there will be rows for
+ *
+ * num | arg
+ * --- | ---
+ * 0   | f1.c
+ * 1   | f2.c
+ * 2   | f3.c
+ *
+ * Note that even if those files `#include` headers, those headers
+ * do not appear as rows.
+ */
+#keyset[id, num]
+compilation_compiling_files(
+    int id : @compilation ref,
+    int num : int ref,
+    int file : @file ref
+);
+
+/**
+ * The time taken by the extractor for a compiler invocation.
+ *
+ * For each file `num`, there will be rows for
+ *
+ * kind | seconds
+ * ---- | ---
+ * 1    | CPU seconds used by the extractor frontend
+ * 2    | Elapsed seconds during the extractor frontend
+ * 3    | CPU seconds used by the extractor backend
+ * 4    | Elapsed seconds during the extractor backend
+ */
+#keyset[id, num, kind]
+compilation_time(
+    int id : @compilation ref,
+    int num : int ref,
+    /* kind:
+       1 = frontend_cpu_seconds
+       2 = frontend_elapsed_seconds
+       3 = extractor_cpu_seconds
+       4 = extractor_elapsed_seconds
+    */
+    int kind : int ref,
+    float seconds : float ref
+);
+
+/**
+ * An error or warning generated by the extractor.
+ * The diagnostic message `diagnostic` was generated during compiler
+ * invocation `compilation`, and is the `file_number_diagnostic_number`th
+ * message generated while extracting the `file_number`th file of that
+ * invocation.
+ */
+#keyset[compilation, file_number, file_number_diagnostic_number]
+diagnostic_for(
+    int diagnostic : @diagnostic ref,
+    int compilation : @compilation ref,
+    int file_number : int ref,
+    int file_number_diagnostic_number : int ref
+);
+
+/**
+ * If extraction was successful, then `cpu_seconds` and
+ * `elapsed_seconds` are the CPU time and elapsed time (respectively)
+ * that extraction took for compiler invocation `id`.
+ */
+compilation_finished(
+    unique int id : @compilation ref,
+    float cpu_seconds : float ref,
+    float elapsed_seconds : float ref
+);
+
+
+/**
+ * External data, 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
+ */
+
+extractor_version(
+    string codeql_version: string ref,
+    string frontend_version: string ref
+)
+
+@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
+| 7 = @user_defined_literal
+| 8 = @deduction_guide
+;
+*/
+
+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
+);
+
+/*
+case @coroutine_placeholder_variable.kind of
+  1 = @handle
+| 2 = @promise
+| 3 = @init_await_resume
+;
+*/
+
+coroutine_placeholder_variable(
+  unique int placeholder_variable: @variable ref,
+  int kind: int ref,
+  int function: @function ref
+)
+
+/** The `new` function used for allocating the coroutine state, if any. */
+coroutine_new(
+  unique int function: @function ref,
+  int new: @function ref
+);
+
+/** The `delete` function used for deallocating the coroutine state, if any. */
+coroutine_delete(
+  unique int function: @function ref,
+  int delete: @function ref
+);
+
+purefunctions(unique int id: @function ref);
+
+function_deleted(unique int id: @function ref);
+
+function_defaulted(unique int id: @function ref);
+
+function_prototyped(unique int id: @function ref)
+
+deduction_guide_for_class(
+    int id: @function ref,
+    int class_template: @usertype ref
+)
+
+member_function_this_type(
+    unique int id: @function ref,
+    int this_type: @type ref
+);
+
+#keyset[id, type_id]
+fun_decls(
+    int id: @fun_decl,
+    int function: @function ref,
+    int type_id: @type ref,
+    string name: string ref,
+    int location: @location_default ref
+);
+fun_def(unique int id: @fun_decl ref);
+fun_specialized(unique int id: @fun_decl ref);
+fun_implicit(unique int id: @fun_decl ref);
+fun_decl_specifiers(
+    int id: @fun_decl ref,
+    string name: string ref
+)
+#keyset[fun_decl, index]
+fun_decl_throws(
+    int fun_decl: @fun_decl ref,
+    int index: int ref,
+    int type_id: @type ref
+);
+/* an empty throw specification is different from none */
+fun_decl_empty_throws(unique int fun_decl: @fun_decl ref);
+fun_decl_noexcept(
+    int fun_decl: @fun_decl ref,
+    int constant: @expr ref
+);
+fun_decl_empty_noexcept(int fun_decl: @fun_decl ref);
+fun_decl_typedef_type(
+    unique int fun_decl: @fun_decl ref,
+    int typedeftype_id: @usertype ref
+);
+
+/*
+case @fun_requires.kind of
+  1 = @template_attached
+| 2 = @function_attached
+;
+*/
+
+fun_requires(
+    int id: @fun_decl ref,
+    int kind: int ref,
+    int constraint: @expr ref
+);
+
+param_decl_bind(
+    unique int id: @var_decl ref,
+    int index: int ref,
+    int fun_decl: @fun_decl ref
+);
+
+#keyset[id, type_id]
+var_decls(
+    int id: @var_decl,
+    int variable: @variable ref,
+    int type_id: @type ref,
+    string name: string ref,
+    int location: @location_default ref
+);
+var_def(unique int id: @var_decl ref);
+var_specialized(int id: @var_decl ref);
+var_decl_specifiers(
+    int id: @var_decl ref,
+    string name: string ref
+)
+is_structured_binding(unique int id: @variable ref);
+var_requires(
+    int id: @var_decl ref,
+    int constraint: @expr ref
+);
+
+type_decls(
+    unique int id: @type_decl,
+    int type_id: @type ref,
+    int location: @location_default ref
+);
+type_def(unique int id: @type_decl ref);
+type_decl_top(
+    unique int type_decl: @type_decl ref
+);
+type_requires(
+    int id: @type_decl ref,
+    int constraint: @expr ref
+);
+
+namespace_decls(
+    unique int id: @namespace_decl,
+    int namespace_id: @namespace ref,
+    int location: @location_default ref,
+    int bodylocation: @location_default ref
+);
+
+case @using.kind of
+  1 = @using_declaration
+| 2 = @using_directive
+| 3 = @using_enum_declaration
+;
+
+usings(
+    unique int id: @using,
+    int element_id: @element ref,
+    int location: @location_default ref,
+    int kind: int ref
+);
+
+/** The element which contains the `using` declaration. */
+using_container(
+    int parent: @element ref,
+    int child: @using ref
+);
+
+static_asserts(
+    unique int id: @static_assert,
+    int condition : @expr ref,
+    string message : string ref,
+    int location: @location_default ref,
+    int enclosing : @element ref
+);
+
+// each function has an ordered list of parameters
+#keyset[id, type_id]
+#keyset[function, index, type_id]
+params(
+    int id: @parameter,
+    int function: @parameterized_element ref,
+    int index: int ref,
+    int type_id: @type ref
+);
+
+overrides(
+    int new: @function ref,
+    int old: @function ref
+);
+
+#keyset[id, type_id]
+membervariables(
+    int id: @membervariable,
+    int type_id: @type ref,
+    string name: string ref
+);
+
+#keyset[id, type_id]
+globalvariables(
+    int id: @globalvariable,
+    int type_id: @type ref,
+    string name: string ref
+);
+
+#keyset[id, type_id]
+localvariables(
+    int id: @localvariable,
+    int type_id: @type ref,
+    string name: string ref
+);
+
+autoderivation(
+    unique int var: @variable ref,
+    int derivation_type: @type ref
+);
+
+orphaned_variables(
+    int var: @localvariable ref,
+    int function: @function ref
+)
+
+enumconstants(
+    unique int id: @enumconstant,
+    int parent: @usertype ref,
+    int index: int ref,
+    int type_id: @type ref,
+    string name: string ref,
+    int location: @location_default ref
+);
+
+@variable = @localscopevariable | @globalvariable | @membervariable;
+
+@localscopevariable = @localvariable | @parameter;
+
+/**
+ * Built-in types are the fundamental types, e.g., integral, floating, and void.
+ */
+case @builtintype.kind of
+   1 = @errortype
+|  2 = @unknowntype
+|  3 = @void
+|  4 = @boolean
+|  5 = @char
+|  6 = @unsigned_char
+|  7 = @signed_char
+|  8 = @short
+|  9 = @unsigned_short
+| 10 = @signed_short
+| 11 = @int
+| 12 = @unsigned_int
+| 13 = @signed_int
+| 14 = @long
+| 15 = @unsigned_long
+| 16 = @signed_long
+| 17 = @long_long
+| 18 = @unsigned_long_long
+| 19 = @signed_long_long
+// ... 20 Microsoft-specific __int8
+// ... 21 Microsoft-specific __int16
+// ... 22 Microsoft-specific __int32
+// ... 23 Microsoft-specific __int64
+| 24 = @float
+| 25 = @double
+| 26 = @long_double
+| 27 = @complex_float         // C99-specific _Complex float
+| 28 = @complex_double        // C99-specific _Complex double
+| 29 = @complex_long_double   // C99-specific _Complex long double
+| 30 = @imaginary_float       // C99-specific _Imaginary float
+| 31 = @imaginary_double      // C99-specific _Imaginary double
+| 32 = @imaginary_long_double // C99-specific _Imaginary long double
+| 33 = @wchar_t               // Microsoft-specific
+| 34 = @decltype_nullptr      // C++11
+| 35 = @int128                // __int128
+| 36 = @unsigned_int128       // unsigned __int128
+| 37 = @signed_int128         // signed __int128
+| 38 = @float128              // __float128
+| 39 = @complex_float128      // _Complex __float128
+| 40 = @decimal32             // _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
+| 62 = @mfp8                  // __mfp8
+;
+
+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 or C23 `typeof`/`typeof_unqual`
+ * operator taking an expression as its argument.  For example:
+ * ```
+ * int a;
+ * decltype(1+a) b;
+ * typeof(1+a) c;
+ * ```
+ * Here `expr` is `1+a`.
+ *
+ * Sometimes an additional pair of parentheses around the expression
+ * changes the semantics of the decltype, e.g.
+ * ```
+ * struct A { double x; };
+ * const A* a = new A();
+ * decltype( a->x ); // type is double
+ * decltype((a->x)); // type is const double&
+ * ```
+ * (Please consult the C++11 standard for more details).
+ * `parentheses_would_change_meaning` is `true` iff that is the case.
+ */
+
+/*
+case @decltype.kind of
+|  0 = @decltype
+|  1 = @typeof // The frontend does not differentiate between typeof and typeof_unqual
+;
+*/
+
+#keyset[id, expr]
+decltypes(
+    int id: @decltype,
+    int expr: @expr ref,
+    int kind: int ref,
+    int base_type: @type ref,
+    boolean parentheses_would_change_meaning: boolean ref
+);
+
+/*
+case @type_operator.kind of
+|  0 = @typeof // The frontend does not differentiate between typeof and typeof_unqual
+|  1 = @underlying_type
+|  2 = @bases
+|  3 = @direct_bases
+|  4 = @add_lvalue_reference
+|  5 = @add_pointer
+|  6 = @add_rvalue_reference
+|  7 = @decay
+|  8 = @make_signed
+|  9 = @make_unsigned
+| 10 = @remove_all_extents
+| 11 = @remove_const
+| 12 = @remove_cv
+| 13 = @remove_cvref
+| 14 = @remove_extent
+| 15 = @remove_pointer
+| 16 = @remove_reference_t
+| 17 = @remove_restrict
+| 18 = @remove_volatile
+| 19 = @remove_reference
+;
+*/
+
+type_operators(
+    unique int id: @type_operator,
+    int arg_type: @type ref,
+    int kind: int ref,
+    int base_type: @type ref
+)
+
+/*
+case @usertype.kind of
+|  0 = @unknown_usertype
+|  1 = @struct
+|  2 = @class
+|  3 = @union
+|  4 = @enum
+// ... 5 = @typedef deprecated        // classic C: typedef typedef type name
+// ... 6 = @template deprecated
+|  7 = @template_parameter
+|  8 = @template_template_parameter
+|  9 = @proxy_class                   // a proxy class associated with a template parameter
+// ... 10 objc_class deprecated
+// ... 11 objc_protocol deprecated
+// ... 12 objc_category deprecated
+| 13 = @scoped_enum
+// ... 14 = @using_alias deprecated   // a using name = type style typedef
+| 15 = @template_struct
+| 16 = @template_class
+| 17 = @template_union
+| 18 = @alias
+;
+*/
+
+usertypes(
+    unique int id: @usertype,
+    string name: string ref,
+    int kind: int ref
+);
+
+usertypesize(
+    unique int id: @usertype ref,
+    int size: int ref,
+    int alignment: int ref
+);
+
+usertype_final(unique int id: @usertype ref);
+
+usertype_uuid(
+    unique int id: @usertype ref,
+    string uuid: string ref
+);
+
+/*
+case @usertype.alias_kind of
+| 0 = @typedef
+| 1 = @alias
+*/
+
+usertype_alias_kind(
+    int id: @usertype ref,
+    int alias_kind: int ref
+)
+
+nontype_template_parameters(
+    int id: @expr ref
+);
+
+type_template_type_constraint(
+    int id: @usertype ref,
+    int constraint: @expr ref
+);
+
+mangled_name(
+    unique int id: @declaration ref,
+    int mangled_name : @mangledname,
+    boolean is_complete: boolean ref
+);
+
+is_pod_class(unique int id: @usertype ref);
+is_standard_layout_class(unique int id: @usertype ref);
+
+is_complete(unique int id: @usertype ref);
+
+is_class_template(unique int id: @usertype ref);
+class_instantiation(
+    int to: @usertype ref,
+    int from: @usertype ref
+);
+class_template_argument(
+    int type_id: @usertype ref,
+    int index: int ref,
+    int arg_type: @type ref
+);
+class_template_argument_value(
+    int type_id: @usertype ref,
+    int index: int ref,
+    int arg_value: @expr ref
+);
+
+@user_or_decltype = @usertype | @decltype;
+
+is_proxy_class_for(
+    unique int id: @usertype ref,
+    int templ_param_id: @user_or_decltype ref
+);
+
+type_mentions(
+    unique int id: @type_mention,
+    int type_id: @type ref,
+    int location: @location 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
+);
+
+template_template_instantiation(
+    int to: @usertype ref,
+    int from: @usertype ref
+);
+template_template_argument(
+    int type_id: @usertype ref,
+    int index: int ref,
+    int arg_type: @type ref
+);
+template_template_argument_value(
+    int type_id: @usertype ref,
+    int index: int ref,
+    int arg_value: @expr ref
+);
+
+@concept = @concept_template | @concept_id;
+
+concept_templates(
+    unique int concept_id: @concept_template,
+    string name: string ref,
+    int location: @location_default ref
+);
+concept_instantiation(
+    unique int to: @concept_id ref,
+    int from: @concept_template ref
+);
+is_type_constraint(int concept_id: @concept_id ref);
+concept_template_argument(
+    int concept_id: @concept ref,
+    int index: int ref,
+    int arg_type: @type ref
+);
+concept_template_argument_value(
+    int concept_id: @concept ref,
+    int index: int ref,
+    int arg_value: @expr ref
+);
+
+routinetypes(
+    unique int id: @routinetype,
+    int return_type: @type ref
+);
+
+routinetypeargs(
+    int routine: @routinetype ref,
+    int index: int ref,
+    int type_id: @type ref
+);
+
+ptrtomembers(
+    unique int id: @ptrtomember,
+    int type_id: @type ref,
+    int class_id: @type ref
+);
+
+/*
+ specifiers for types, functions, and variables
+
+    "public",
+    "protected",
+    "private",
+
+    "const",
+    "volatile",
+    "static",
+
+    "pure",
+    "virtual",
+    "sealed", // Microsoft
+    "__interface", // Microsoft
+    "inline",
+    "explicit",
+
+    "near", // near far extension
+    "far", // near far extension
+    "__ptr32", // Microsoft
+    "__ptr64", // Microsoft
+    "__sptr", // Microsoft
+    "__uptr", // Microsoft
+    "dllimport", // Microsoft
+    "dllexport", // Microsoft
+    "thread", // Microsoft
+    "naked", // Microsoft
+    "microsoft_inline", // Microsoft
+    "forceinline", // Microsoft
+    "selectany", // Microsoft
+    "nothrow", // Microsoft
+    "novtable", // Microsoft
+    "noreturn", // Microsoft
+    "noinline", // Microsoft
+    "noalias", // Microsoft
+    "restrict", // Microsoft
+*/
+
+specifiers(
+    unique int id: @specifier,
+    unique string str: string ref
+);
+
+typespecifiers(
+    int type_id: @type ref,
+    int spec_id: @specifier ref
+);
+
+funspecifiers(
+    int func_id: @function ref,
+    int spec_id: @specifier ref
+);
+
+varspecifiers(
+    int var_id: @accessible ref,
+    int spec_id: @specifier ref
+);
+
+explicit_specifier_exprs(
+    unique int func_id: @function ref,
+    int constant: @expr ref
+)
+
+attributes(
+    unique int id: @attribute,
+    int kind: int ref,
+    string name: string ref,
+    string name_space: string ref,
+    int location: @location_default ref
+);
+
+case @attribute.kind of
+  0 = @gnuattribute
+| 1 = @stdattribute
+| 2 = @declspec
+| 3 = @msattribute
+| 4 = @alignas
+// ... 5 @objc_propertyattribute deprecated
+;
+
+attribute_args(
+    unique int id: @attribute_arg,
+    int kind: int ref,
+    int attribute: @attribute ref,
+    int index: int ref,
+    int location: @location_default ref
+);
+
+case @attribute_arg.kind of
+  0 = @attribute_arg_empty
+| 1 = @attribute_arg_token
+| 2 = @attribute_arg_constant
+| 3 = @attribute_arg_type
+| 4 = @attribute_arg_constant_expr
+| 5 = @attribute_arg_expr
+;
+
+attribute_arg_value(
+    unique int arg: @attribute_arg ref,
+    string value: string ref
+);
+attribute_arg_type(
+    unique int arg: @attribute_arg ref,
+    int type_id: @type ref
+);
+attribute_arg_constant(
+    unique int arg: @attribute_arg ref,
+    int constant: @expr ref
+)
+attribute_arg_expr(
+    unique int arg: @attribute_arg ref,
+    int expr: @expr ref
+)
+attribute_arg_name(
+    unique int arg: @attribute_arg ref,
+    string name: string ref
+);
+
+typeattributes(
+    int type_id: @type ref,
+    int spec_id: @attribute ref
+);
+
+funcattributes(
+    int func_id: @function ref,
+    int spec_id: @attribute ref
+);
+
+varattributes(
+    int var_id: @accessible ref,
+    int spec_id: @attribute ref
+);
+
+stmtattributes(
+    int stmt_id: @stmt ref,
+    int spec_id: @attribute ref
+);
+
+@type = @builtintype
+      | @derivedtype
+      | @usertype
+      | @routinetype
+      | @ptrtomember
+      | @decltype
+      | @type_operator;
+
+unspecifiedtype(
+    unique int type_id: @type ref,
+    int unspecified_type_id: @type ref
+);
+
+member(
+    int parent: @type ref,
+    int index: int ref,
+    int child: @member ref
+);
+
+@enclosingfunction_child = @usertype | @variable | @namespace
+
+enclosingfunction(
+    unique int child: @enclosingfunction_child ref,
+    int parent: @function ref
+);
+
+derivations(
+    unique int derivation: @derivation,
+    int sub: @type ref,
+    int index: int ref,
+    int super: @type ref,
+    int location: @location_default ref
+);
+
+derspecifiers(
+    int der_id: @derivation ref,
+    int spec_id: @specifier ref
+);
+
+/**
+ * Contains the byte offset of the base class subobject within the derived
+ * class. Only holds for non-virtual base classes, but see table
+ * `virtual_base_offsets` for offsets of virtual base class subobjects.
+ */
+direct_base_offsets(
+    unique int der_id: @derivation ref,
+    int offset: int ref
+);
+
+/**
+ * Contains the byte offset of the virtual base class subobject for class
+ * `super` within a most-derived object of class `sub`. `super` can be either a
+ * direct or indirect base class.
+ */
+#keyset[sub, super]
+virtual_base_offsets(
+    int sub: @usertype ref,
+    int super: @usertype ref,
+    int offset: int ref
+);
+
+frienddecls(
+    unique int id: @frienddecl,
+    int type_id: @type ref,
+    int decl_id: @declaration ref,
+    int location: @location_default ref
+);
+
+@declaredtype = @usertype ;
+
+@declaration = @function
+             | @declaredtype
+             | @variable
+             | @enumconstant
+             | @frienddecl
+             | @concept_template;
+
+@member = @membervariable
+        | @function
+        | @declaredtype
+        | @enumconstant;
+
+@locatable = @diagnostic
+           | @declaration
+           | @ppd_include
+           | @ppd_define
+           | @macroinvocation
+           /*| @funcall*/
+           | @xmllocatable
+           | @attribute
+           | @attribute_arg;
+
+@namedscope = @namespace | @usertype;
+
+@element = @locatable
+         | @file
+         | @folder
+         | @specifier
+         | @type
+         | @expr
+         | @namespace
+         | @initialiser
+         | @stmt
+         | @derivation
+         | @comment
+         | @preprocdirect
+         | @fun_decl
+         | @var_decl
+         | @type_decl
+         | @namespace_decl
+         | @using
+         | @namequalifier
+         | @specialnamequalifyingelement
+         | @static_assert
+         | @type_mention
+         | @lambdacapture;
+
+@exprparent = @element;
+
+comments(
+    unique int id: @comment,
+    string contents: string ref,
+    int location: @location_default ref
+);
+
+commentbinding(
+    int id: @comment ref,
+    int element: @element ref
+);
+
+exprconv(
+    int converted: @expr ref,
+    unique int conversion: @expr ref
+);
+
+compgenerated(unique int id: @element ref);
+
+/**
+ * `destructor_call` destructs the `i`'th entity that should be
+ * destructed following `element`. Note that entities should be
+ * destructed in reverse construction order, so for a given `element`
+ * these should be called from highest to lowest `i`.
+ */
+#keyset[element, destructor_call]
+#keyset[element, i]
+synthetic_destructor_call(
+    int element: @element ref,
+    int i: int ref,
+    int destructor_call: @routineexpr ref
+);
+
+namespaces(
+    unique int id: @namespace,
+    string name: string ref
+);
+
+namespace_inline(
+    unique int id: @namespace ref
+);
+
+namespacembrs(
+    int parentid: @namespace ref,
+    unique int memberid: @namespacembr ref
+);
+
+@namespacembr = @declaration | @namespace;
+
+exprparents(
+    int expr_id: @expr ref,
+    int child_index: int ref,
+    int parent_id: @exprparent ref
+);
+
+expr_isload(unique int expr_id: @expr ref);
+
+@cast = @c_style_cast
+      | @const_cast
+      | @dynamic_cast
+      | @reinterpret_cast
+      | @static_cast
+      ;
+
+/*
+case @conversion.kind of
+  0 = @simple_conversion           // a numeric conversion, qualification conversion, or a reinterpret_cast
+| 1 = @bool_conversion             // conversion to 'bool'
+| 2 = @base_class_conversion       // a derived-to-base conversion
+| 3 = @derived_class_conversion    // a base-to-derived conversion
+| 4 = @pm_base_class_conversion    // a derived-to-base conversion of a pointer to member
+| 5 = @pm_derived_class_conversion // a base-to-derived conversion of a pointer to member
+| 6 = @glvalue_adjust              // an adjustment of the type of a glvalue
+| 7 = @prvalue_adjust              // an adjustment of the type of a prvalue
+;
+*/
+/**
+ * Describes the semantics represented by a cast expression. This is largely
+ * independent of the source syntax of the cast, so it is separate from the
+ * regular expression kind.
+ */
+conversionkinds(
+    unique int expr_id: @cast ref,
+    int kind: int ref
+);
+
+@conversion = @cast
+            | @array_to_pointer
+            | @parexpr
+            | @reference_to
+            | @ref_indirect
+            | @temp_init
+            | @c11_generic
+            ;
+
+/*
+case @funbindexpr.kind of
+  0 = @normal_call  // a normal call
+| 1 = @virtual_call // a virtual call
+| 2 = @adl_call     // a call whose target is only found by ADL
+;
+*/
+iscall(
+    unique int caller: @funbindexpr ref,
+    int kind: int ref
+);
+
+numtemplatearguments(
+    unique int expr_id: @expr ref,
+    int num: int ref
+);
+
+specialnamequalifyingelements(
+    unique int id: @specialnamequalifyingelement,
+    unique string name: string ref
+);
+
+@namequalifiableelement = @expr | @namequalifier;
+@namequalifyingelement = @namespace
+                       | @specialnamequalifyingelement
+                       | @usertype;
+
+namequalifiers(
+    unique int id: @namequalifier,
+    unique int qualifiableelement: @namequalifiableelement ref,
+    int qualifyingelement: @namequalifyingelement ref,
+    int location: @location_default ref
+);
+
+varbind(
+    int expr: @varbindexpr ref,
+    int var: @accessible ref
+);
+
+funbind(
+    int expr: @funbindexpr ref,
+    int fun: @function ref
+);
+
+@any_new_expr = @new_expr
+              | @new_array_expr;
+
+@new_or_delete_expr = @any_new_expr
+                    | @delete_expr
+                    | @delete_array_expr;
+
+@prefix_crement_expr = @preincrexpr | @predecrexpr;
+
+@postfix_crement_expr = @postincrexpr | @postdecrexpr;
+
+@increment_expr = @preincrexpr | @postincrexpr;
+
+@decrement_expr = @predecrexpr | @postdecrexpr;
+
+@crement_expr = @increment_expr | @decrement_expr;
+
+@un_arith_op_expr = @arithnegexpr
+                  | @unaryplusexpr
+                  | @conjugation
+                  | @realpartexpr
+                  | @imagpartexpr
+                  | @crement_expr
+                  ;
+
+@un_bitwise_op_expr = @complementexpr;
+
+@un_log_op_expr = @notexpr;
+
+@un_op_expr = @address_of
+            | @indirect
+            | @un_arith_op_expr
+            | @un_bitwise_op_expr
+            | @builtinaddressof
+            | @vec_fill
+            | @un_log_op_expr
+            | @co_await
+            | @co_yield
+            ;
+
+@bin_log_op_expr = @andlogicalexpr | @orlogicalexpr;
+
+@cmp_op_expr = @eq_op_expr | @rel_op_expr;
+
+@eq_op_expr = @eqexpr | @neexpr;
+
+@rel_op_expr = @gtexpr
+             | @ltexpr
+             | @geexpr
+             | @leexpr
+             | @spaceshipexpr
+             ;
+
+@bin_bitwise_op_expr = @lshiftexpr
+                     | @rshiftexpr
+                     | @andexpr
+                     | @orexpr
+                     | @xorexpr
+                     ;
+
+@p_arith_op_expr = @paddexpr
+                 | @psubexpr
+                 | @pdiffexpr
+                 ;
+
+@bin_arith_op_expr = @addexpr
+                   | @subexpr
+                   | @mulexpr
+                   | @divexpr
+                   | @remexpr
+                   | @jmulexpr
+                   | @jdivexpr
+                   | @fjaddexpr
+                   | @jfaddexpr
+                   | @fjsubexpr
+                   | @jfsubexpr
+                   | @minexpr
+                   | @maxexpr
+                   | @p_arith_op_expr
+                   ;
+
+@bin_op_expr = @bin_arith_op_expr
+             | @bin_bitwise_op_expr
+             | @cmp_op_expr
+             | @bin_log_op_expr
+             ;
+
+@op_expr = @un_op_expr
+         | @bin_op_expr
+         | @assign_expr
+         | @conditionalexpr
+         ;
+
+@assign_arith_expr = @assignaddexpr
+                   | @assignsubexpr
+                   | @assignmulexpr
+                   | @assigndivexpr
+                   | @assignremexpr
+                   ;
+
+@assign_bitwise_expr = @assignandexpr
+                     | @assignorexpr
+                     | @assignxorexpr
+                     | @assignlshiftexpr
+                     | @assignrshiftexpr
+                     ;
+
+@assign_pointer_expr = @assignpaddexpr
+                     | @assignpsubexpr
+                     ;
+
+@assign_op_expr = @assign_arith_expr
+                | @assign_bitwise_expr
+                | @assign_pointer_expr
+                ;
+
+@assign_expr = @assignexpr | @assign_op_expr | @blockassignexpr
+
+/*
+  Binary encoding of the allocator form.
+
+  case @allocator.form of
+    0 = plain
+  | 1 = alignment
+  ;
+*/
+
+/**
+ * The allocator function associated with a `new` or `new[]` expression.
+ * The `form` column specified whether the allocation call contains an alignment
+ * argument.
+ */
+expr_allocator(
+    unique int expr: @any_new_expr ref,
+    int func: @function ref,
+    int form: int ref
+);
+
+/*
+  Binary encoding of the deallocator form.
+
+  case @deallocator.form of
+    0 = plain
+  | 1 = size
+  | 2 = alignment
+  | 4 = destroying_delete
+  ;
+*/
+
+/**
+ * The deallocator function associated with a `delete`, `delete[]`, `new`, or
+ * `new[]` expression. For a `new` or `new[]` expression, the deallocator is the
+ * one used to free memory if the initialization throws an exception.
+ * The `form` column specifies whether the deallocation call contains a size
+ * argument, and alignment argument, or both.
+ */
+expr_deallocator(
+    unique int expr: @new_or_delete_expr ref,
+    int func: @function ref,
+    int form: int ref
+);
+
+/**
+ * Holds if the `@conditionalexpr` is of the two operand form
+ * `guard ? : false`.
+ */
+expr_cond_two_operand(
+    unique int cond: @conditionalexpr ref
+);
+
+/**
+ * The guard of `@conditionalexpr` `guard ? true : false`
+ */
+expr_cond_guard(
+    unique int cond: @conditionalexpr ref,
+    int guard: @expr ref
+);
+
+/**
+ * The expression used when the guard of `@conditionalexpr`
+ * `guard ? true : false` holds. For the two operand form
+ * `guard ?: false` consider using `expr_cond_guard` instead.
+ */
+expr_cond_true(
+    unique int cond: @conditionalexpr ref,
+    int true: @expr ref
+);
+
+/**
+ * The expression used when the guard of `@conditionalexpr`
+ * `guard ? true : false` does not hold.
+ */
+expr_cond_false(
+    unique int cond: @conditionalexpr ref,
+    int false: @expr ref
+);
+
+/** A string representation of the value. */
+values(
+    unique int id: @value,
+    string str: string ref
+);
+
+/** The actual text in the source code for the value, if any. */
+valuetext(
+    unique int id: @value ref,
+    string text: string ref
+);
+
+valuebind(
+    int val: @value ref,
+    unique int expr: @expr ref
+);
+
+fieldoffsets(
+    unique int id: @variable ref,
+    int byteoffset: int ref,
+    int bitoffset: int ref
+);
+
+bitfield(
+    unique int id: @variable ref,
+    int bits: int ref,
+    int declared_bits: int ref
+);
+
+/* TODO
+memberprefix(
+    int member: @expr ref,
+    int prefix: @expr ref
+);
+*/
+
+/*
+   kind(1) = mbrcallexpr
+   kind(2) = mbrptrcallexpr
+   kind(3) = mbrptrmbrcallexpr
+   kind(4) = ptrmbrptrmbrcallexpr
+   kind(5) = mbrreadexpr // x.y
+   kind(6) = mbrptrreadexpr // p->y
+   kind(7) = mbrptrmbrreadexpr // x.*pm
+   kind(8) = mbrptrmbrptrreadexpr // x->*pm
+   kind(9) = staticmbrreadexpr // static x.y
+   kind(10) = staticmbrptrreadexpr // static p->y
+*/
+/* TODO
+memberaccess(
+    int member: @expr ref,
+    int kind: int ref
+);
+*/
+
+initialisers(
+    unique int init: @initialiser,
+    int var: @accessible ref,
+    unique int expr: @expr ref,
+    int location: @location_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
+);
+
+expr_reuse(
+    int reuse: @expr ref,
+    int original: @expr ref,
+    int value_category: int ref
+)
+
+/*
+  case @value.category of
+    1 = prval
+  | 2 = xval
+  | 3 = lval
+  ;
+*/
+expr_types(
+    int id: @expr ref,
+    int typeid: @type ref,
+    int value_category: int ref
+);
+
+case @expr.kind of
+    1 = @errorexpr
+|   2 = @address_of // & AddressOfExpr
+|   3 = @reference_to // ReferenceToExpr (implicit?)
+|   4 = @indirect // * PointerDereferenceExpr
+|   5 = @ref_indirect // ReferenceDereferenceExpr (implicit?)
+// ...
+|   8 = @array_to_pointer // (???)
+|   9 = @vacuous_destructor_call // VacuousDestructorCall
+// ...
+|  11 = @assume // Microsoft
+|  12 = @parexpr
+|  13 = @arithnegexpr
+|  14 = @unaryplusexpr
+|  15 = @complementexpr
+|  16 = @notexpr
+|  17 = @conjugation // GNU ~ operator
+|  18 = @realpartexpr // GNU __real
+|  19 = @imagpartexpr // GNU __imag
+|  20 = @postincrexpr
+|  21 = @postdecrexpr
+|  22 = @preincrexpr
+|  23 = @predecrexpr
+|  24 = @conditionalexpr
+|  25 = @addexpr
+|  26 = @subexpr
+|  27 = @mulexpr
+|  28 = @divexpr
+|  29 = @remexpr
+|  30 = @jmulexpr // C99 mul imaginary
+|  31 = @jdivexpr // C99 div imaginary
+|  32 = @fjaddexpr // C99 add real + imaginary
+|  33 = @jfaddexpr // C99 add imaginary + real
+|  34 = @fjsubexpr // C99 sub real - imaginary
+|  35 = @jfsubexpr // C99 sub imaginary - real
+|  36 = @paddexpr // pointer add (pointer + int or int + pointer)
+|  37 = @psubexpr // pointer sub (pointer - integer)
+|  38 = @pdiffexpr // difference between two pointers
+|  39 = @lshiftexpr
+|  40 = @rshiftexpr
+|  41 = @andexpr
+|  42 = @orexpr
+|  43 = @xorexpr
+|  44 = @eqexpr
+|  45 = @neexpr
+|  46 = @gtexpr
+|  47 = @ltexpr
+|  48 = @geexpr
+|  49 = @leexpr
+|  50 = @minexpr // GNU minimum
+|  51 = @maxexpr // GNU maximum
+|  52 = @assignexpr
+|  53 = @assignaddexpr
+|  54 = @assignsubexpr
+|  55 = @assignmulexpr
+|  56 = @assigndivexpr
+|  57 = @assignremexpr
+|  58 = @assignlshiftexpr
+|  59 = @assignrshiftexpr
+|  60 = @assignandexpr
+|  61 = @assignorexpr
+|  62 = @assignxorexpr
+|  63 = @assignpaddexpr // assign pointer add
+|  64 = @assignpsubexpr // assign pointer sub
+|  65 = @andlogicalexpr
+|  66 = @orlogicalexpr
+|  67 = @commaexpr
+|  68 = @subscriptexpr // access to member of an array, e.g., a[5]
+// ...  69 @objc_subscriptexpr deprecated
+// ...  70 @cmdaccess deprecated
+// ...
+|  73 = @virtfunptrexpr
+|  74 = @callexpr
+// ...  75 @msgexpr_normal deprecated
+// ...  76 @msgexpr_super deprecated
+// ...  77 @atselectorexpr deprecated
+// ...  78 @atprotocolexpr deprecated
+|  79 = @vastartexpr
+|  80 = @vaargexpr
+|  81 = @vaendexpr
+|  82 = @vacopyexpr
+// ...  83 @atencodeexpr deprecated
+|  84 = @varaccess
+|  85 = @thisaccess
+// ...  86 @objc_box_expr deprecated
+|  87 = @new_expr
+|  88 = @delete_expr
+|  89 = @throw_expr
+|  90 = @condition_decl // a variable declared in a condition, e.g., if(int x = y > 2)
+|  91 = @braced_init_list
+|  92 = @type_id
+|  93 = @runtime_sizeof
+|  94 = @runtime_alignof
+|  95 = @sizeof_pack
+|  96 = @expr_stmt // GNU extension
+|  97 = @routineexpr
+|  98 = @type_operand // used to access a type in certain contexts (haven't found any examples yet....)
+|  99 = @offsetofexpr // offsetof ::= type and field
+| 100 = @hasassignexpr // __has_assign ::= type
+| 101 = @hascopyexpr // __has_copy ::= type
+| 102 = @hasnothrowassign // __has_nothrow_assign ::= type
+| 103 = @hasnothrowconstr // __has_nothrow_constructor ::= type
+| 104 = @hasnothrowcopy // __has_nothrow_copy ::= type
+| 105 = @hastrivialassign // __has_trivial_assign ::= type
+| 106 = @hastrivialconstr // __has_trivial_constructor ::= type
+| 107 = @hastrivialcopy // __has_trivial_copy ::= type
+| 108 = @hasuserdestr // __has_user_destructor ::= type
+| 109 = @hasvirtualdestr // __has_virtual_destructor ::= type
+| 110 = @isabstractexpr // __is_abstract ::= type
+| 111 = @isbaseofexpr // __is_base_of ::= type type
+| 112 = @isclassexpr // __is_class ::= type
+| 113 = @isconvtoexpr // __is_convertible_to ::= type type
+| 114 = @isemptyexpr // __is_empty ::= type
+| 115 = @isenumexpr // __is_enum ::= type
+| 116 = @ispodexpr // __is_pod ::= type
+| 117 = @ispolyexpr // __is_polymorphic ::= type
+| 118 = @isunionexpr // __is_union ::= type
+| 119 = @typescompexpr // GNU __builtin_types_compatible ::= type type
+| 120 = @intaddrexpr // frontend internal builtin, used to implement offsetof
+// ...
+| 122 = @hastrivialdestructor // __has_trivial_destructor ::= type
+| 123 = @literal
+| 124 = @uuidof
+| 127 = @aggregateliteral
+| 128 = @delete_array_expr
+| 129 = @new_array_expr
+// ... 130 @objc_array_literal deprecated
+// ... 131 @objc_dictionary_literal deprecated
+| 132 = @foldexpr
+// ...
+| 200 = @ctordirectinit
+| 201 = @ctorvirtualinit
+| 202 = @ctorfieldinit
+| 203 = @ctordelegatinginit
+| 204 = @dtordirectdestruct
+| 205 = @dtorvirtualdestruct
+| 206 = @dtorfielddestruct
+// ...
+| 210 = @static_cast
+| 211 = @reinterpret_cast
+| 212 = @const_cast
+| 213 = @dynamic_cast
+| 214 = @c_style_cast
+| 215 = @lambdaexpr
+| 216 = @param_ref
+| 217 = @noopexpr
+// ...
+| 294 = @istriviallyconstructibleexpr
+| 295 = @isdestructibleexpr
+| 296 = @isnothrowdestructibleexpr
+| 297 = @istriviallydestructibleexpr
+| 298 = @istriviallyassignableexpr
+| 299 = @isnothrowassignableexpr
+| 300 = @istrivialexpr
+| 301 = @isstandardlayoutexpr
+| 302 = @istriviallycopyableexpr
+| 303 = @isliteraltypeexpr
+| 304 = @hastrivialmoveconstructorexpr
+| 305 = @hastrivialmoveassignexpr
+| 306 = @hasnothrowmoveassignexpr
+| 307 = @isconstructibleexpr
+| 308 = @isnothrowconstructibleexpr
+| 309 = @hasfinalizerexpr
+| 310 = @isdelegateexpr
+| 311 = @isinterfaceclassexpr
+| 312 = @isrefarrayexpr
+| 313 = @isrefclassexpr
+| 314 = @issealedexpr
+| 315 = @issimplevalueclassexpr
+| 316 = @isvalueclassexpr
+| 317 = @isfinalexpr
+| 319 = @noexceptexpr
+| 320 = @builtinshufflevector
+| 321 = @builtinchooseexpr
+| 322 = @builtinaddressof
+| 323 = @vec_fill
+| 324 = @builtinconvertvector
+| 325 = @builtincomplex
+| 326 = @spaceshipexpr
+| 327 = @co_await
+| 328 = @co_yield
+| 329 = @temp_init
+| 330 = @isassignable
+| 331 = @isaggregate
+| 332 = @hasuniqueobjectrepresentations
+| 333 = @builtinbitcast
+| 334 = @builtinshuffle
+| 335 = @blockassignexpr
+| 336 = @issame
+| 337 = @isfunction
+| 338 = @islayoutcompatible
+| 339 = @ispointerinterconvertiblebaseof
+| 340 = @isarray
+| 341 = @arrayrank
+| 342 = @arrayextent
+| 343 = @isarithmetic
+| 344 = @iscompletetype
+| 345 = @iscompound
+| 346 = @isconst
+| 347 = @isfloatingpoint
+| 348 = @isfundamental
+| 349 = @isintegral
+| 350 = @islvaluereference
+| 351 = @ismemberfunctionpointer
+| 352 = @ismemberobjectpointer
+| 353 = @ismemberpointer
+| 354 = @isobject
+| 355 = @ispointer
+| 356 = @isreference
+| 357 = @isrvaluereference
+| 358 = @isscalar
+| 359 = @issigned
+| 360 = @isunsigned
+| 361 = @isvoid
+| 362 = @isvolatile
+| 363 = @reuseexpr
+| 364 = @istriviallycopyassignable
+| 365 = @isassignablenopreconditioncheck
+| 366 = @referencebindstotemporary
+| 367 = @issameas
+| 368 = @builtinhasattribute
+| 369 = @ispointerinterconvertiblewithclass
+| 370 = @builtinispointerinterconvertiblewithclass
+| 371 = @iscorrespondingmember
+| 372 = @builtiniscorrespondingmember
+| 373 = @isboundedarray
+| 374 = @isunboundedarray
+| 375 = @isreferenceable
+| 378 = @isnothrowconvertible
+| 379 = @referenceconstructsfromtemporary
+| 380 = @referenceconvertsfromtemporary
+| 381 = @isconvertible
+| 382 = @isvalidwinrttype
+| 383 = @iswinclass
+| 384 = @iswininterface
+| 385 = @istriviallyequalitycomparable
+| 386 = @isscopedenum
+| 387 = @istriviallyrelocatable
+| 388 = @datasizeof
+| 389 = @c11_generic
+| 390 = @requires_expr
+| 391 = @nested_requirement
+| 392 = @compound_requirement
+| 393 = @concept_id
+;
+
+@var_args_expr = @vastartexpr
+               | @vaendexpr
+               | @vaargexpr
+               | @vacopyexpr
+               ;
+
+@builtin_op = @var_args_expr
+            | @noopexpr
+            | @offsetofexpr
+            | @intaddrexpr
+            | @hasassignexpr
+            | @hascopyexpr
+            | @hasnothrowassign
+            | @hasnothrowconstr
+            | @hasnothrowcopy
+            | @hastrivialassign
+            | @hastrivialconstr
+            | @hastrivialcopy
+            | @hastrivialdestructor
+            | @hasuserdestr
+            | @hasvirtualdestr
+            | @isabstractexpr
+            | @isbaseofexpr
+            | @isclassexpr
+            | @isconvtoexpr
+            | @isemptyexpr
+            | @isenumexpr
+            | @ispodexpr
+            | @ispolyexpr
+            | @isunionexpr
+            | @typescompexpr
+            | @builtinshufflevector
+            | @builtinconvertvector
+            | @builtinaddressof
+            | @istriviallyconstructibleexpr
+            | @isdestructibleexpr
+            | @isnothrowdestructibleexpr
+            | @istriviallydestructibleexpr
+            | @istriviallyassignableexpr
+            | @isnothrowassignableexpr
+            | @istrivialexpr
+            | @isstandardlayoutexpr
+            | @istriviallycopyableexpr
+            | @isliteraltypeexpr
+            | @hastrivialmoveconstructorexpr
+            | @hastrivialmoveassignexpr
+            | @hasnothrowmoveassignexpr
+            | @isconstructibleexpr
+            | @isnothrowconstructibleexpr
+            | @hasfinalizerexpr
+            | @isdelegateexpr
+            | @isinterfaceclassexpr
+            | @isrefarrayexpr
+            | @isrefclassexpr
+            | @issealedexpr
+            | @issimplevalueclassexpr
+            | @isvalueclassexpr
+            | @isfinalexpr
+            | @builtinchooseexpr
+            | @builtincomplex
+            | @isassignable
+            | @isaggregate
+            | @hasuniqueobjectrepresentations
+            | @builtinbitcast
+            | @builtinshuffle
+            | @issame
+            | @isfunction
+            | @islayoutcompatible
+            | @ispointerinterconvertiblebaseof
+            | @isarray
+            | @arrayrank
+            | @arrayextent
+            | @isarithmetic
+            | @iscompletetype
+            | @iscompound
+            | @isconst
+            | @isfloatingpoint
+            | @isfundamental
+            | @isintegral
+            | @islvaluereference
+            | @ismemberfunctionpointer
+            | @ismemberobjectpointer
+            | @ismemberpointer
+            | @isobject
+            | @ispointer
+            | @isreference
+            | @isrvaluereference
+            | @isscalar
+            | @issigned
+            | @isunsigned
+            | @isvoid
+            | @isvolatile
+            | @istriviallycopyassignable
+            | @isassignablenopreconditioncheck
+            | @referencebindstotemporary
+            | @issameas
+            | @builtinhasattribute
+            | @ispointerinterconvertiblewithclass
+            | @builtinispointerinterconvertiblewithclass
+            | @iscorrespondingmember
+            | @builtiniscorrespondingmember
+            | @isboundedarray
+            | @isunboundedarray
+            | @isreferenceable
+            | @isnothrowconvertible
+            | @referenceconstructsfromtemporary
+            | @referenceconvertsfromtemporary
+            | @isconvertible
+            | @isvalidwinrttype
+            | @iswinclass
+            | @iswininterface
+            | @istriviallyequalitycomparable
+            | @isscopedenum
+            | @istriviallyrelocatable
+            ;
+
+compound_requirement_is_noexcept(
+    int expr: @compound_requirement ref
+);
+
+new_allocated_type(
+    unique int expr: @new_expr ref,
+    int type_id: @type ref
+);
+
+new_array_allocated_type(
+    unique int expr: @new_array_expr ref,
+    int type_id: @type ref
+);
+
+/**
+ * The field being initialized by an initializer expression within an aggregate
+ * initializer for a class/struct/union. Position is used to sort repeated initializers.
+ */
+#keyset[aggregate, position]
+aggregate_field_init(
+    int aggregate: @aggregateliteral ref,
+    int initializer: @expr ref,
+    int field: @membervariable ref,
+    int position: int ref,
+    boolean is_designated: boolean ref
+);
+
+/**
+ * The index of the element being initialized by an initializer expression
+ * within an aggregate initializer for an array. Position is used to sort repeated initializers.
+ */
+#keyset[aggregate, position]
+aggregate_array_init(
+    int aggregate: @aggregateliteral ref,
+    int initializer: @expr ref,
+    int element_index: int ref,
+    int position: int ref,
+    boolean is_designated: boolean ref
+);
+
+@ctorinit = @ctordirectinit
+          | @ctorvirtualinit
+          | @ctorfieldinit
+          | @ctordelegatinginit;
+@dtordestruct = @dtordirectdestruct
+              | @dtorvirtualdestruct
+              | @dtorfielddestruct;
+
+
+condition_decl_bind(
+    unique int expr: @condition_decl ref,
+    unique int decl: @declaration ref
+);
+
+typeid_bind(
+    unique int expr: @type_id ref,
+    int type_id: @type ref
+);
+
+uuidof_bind(
+    unique int expr: @uuidof ref,
+    int type_id: @type ref
+);
+
+@sizeof_or_alignof = @runtime_sizeof | @runtime_alignof | @datasizeof | @sizeof_pack;
+
+sizeof_bind(
+    unique int expr: @sizeof_or_alignof ref,
+    int type_id: @type ref
+);
+
+code_block(
+    unique int block: @literal ref,
+    unique int routine: @function ref
+);
+
+lambdas(
+    unique int expr: @lambdaexpr ref,
+    string default_capture: string ref,
+    boolean has_explicit_return_type: boolean ref
+);
+
+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
+|  38 = @stmt_consteval_if
+|  39 = @stmt_not_consteval_if
+;
+
+type_vla(
+    int type_id: @type ref,
+    int decl: @stmt_vla_decl ref
+);
+
+variable_vla(
+    int var: @variable ref,
+    int decl: @stmt_vla_decl ref
+);
+
+type_is_vla(unique int type_id: @derivedtype ref)
+
+if_initialization(
+    unique int if_stmt: @stmt_if ref,
+    int init_id: @stmt ref
+);
+
+if_then(
+    unique int if_stmt: @stmt_if ref,
+    int then_id: @stmt ref
+);
+
+if_else(
+    unique int if_stmt: @stmt_if ref,
+    int else_id: @stmt ref
+);
+
+constexpr_if_initialization(
+    unique int constexpr_if_stmt: @stmt_constexpr_if ref,
+    int init_id: @stmt ref
+);
+
+constexpr_if_then(
+    unique int constexpr_if_stmt: @stmt_constexpr_if ref,
+    int then_id: @stmt ref
+);
+
+constexpr_if_else(
+    unique int constexpr_if_stmt: @stmt_constexpr_if ref,
+    int else_id: @stmt ref
+);
+
+@stmt_consteval_or_not_consteval_if = @stmt_consteval_if | @stmt_not_consteval_if;
+
+consteval_if_then(
+    unique int constexpr_if_stmt: @stmt_consteval_or_not_consteval_if ref,
+    int then_id: @stmt ref
+);
+
+consteval_if_else(
+    unique int constexpr_if_stmt: @stmt_consteval_or_not_consteval_if ref,
+    int else_id: @stmt ref
+);
+
+while_body(
+    unique int while_stmt: @stmt_while ref,
+    int body_id: @stmt ref
+);
+
+do_body(
+    unique int do_stmt: @stmt_end_test_while ref,
+    int body_id: @stmt ref
+);
+
+switch_initialization(
+    unique int switch_stmt: @stmt_switch ref,
+    int init_id: @stmt ref
+);
+
+#keyset[switch_stmt, index]
+switch_case(
+    int switch_stmt: @stmt_switch ref,
+    int index: int ref,
+    int case_id: @stmt_switch_case ref
+);
+
+switch_body(
+    unique int switch_stmt: @stmt_switch ref,
+    int body_id: @stmt ref
+);
+
+@stmt_for_or_range_based_for = @stmt_for
+                             | @stmt_range_based_for;
+
+for_initialization(
+    unique int for_stmt: @stmt_for_or_range_based_for ref,
+    int init_id: @stmt ref
+);
+
+for_condition(
+    unique int for_stmt: @stmt_for ref,
+    int condition_id: @expr ref
+);
+
+for_update(
+    unique int for_stmt: @stmt_for ref,
+    int update_id: @expr ref
+);
+
+for_body(
+    unique int for_stmt: @stmt_for ref,
+    int body_id: @stmt ref
+);
+
+@stmtparent = @stmt | @expr_stmt ;
+stmtparents(
+    unique int id: @stmt ref,
+    int index: int ref,
+    int parent: @stmtparent ref
+);
+
+ishandler(unique int block: @stmt_block ref);
+
+@cfgnode = @stmt | @expr | @function | @initialiser ;
+
+stmt_decl_bind(
+    int stmt: @stmt_decl ref,
+    int num: int ref,
+    int decl: @declaration ref
+);
+
+stmt_decl_entry_bind(
+    int stmt: @stmt_decl ref,
+    int num: int ref,
+    int decl_entry: @element ref
+);
+
+@parameterized_element = @function | @stmt_block | @requires_expr;
+
+blockscope(
+    unique int block: @stmt_block ref,
+    int enclosing: @parameterized_element ref
+);
+
+@jump = @stmt_goto | @stmt_break | @stmt_continue;
+
+@jumporlabel = @jump | @stmt_label | @literal;
+
+jumpinfo(
+    unique int id: @jumporlabel ref,
+    string str: string ref,
+    int target: @stmt ref
+);
+
+preprocdirects(
+    unique int id: @preprocdirect,
+    int kind: int ref,
+    int location: @location_default ref
+);
+case @preprocdirect.kind of
+   0 = @ppd_if
+|  1 = @ppd_ifdef
+|  2 = @ppd_ifndef
+|  3 = @ppd_elif
+|  4 = @ppd_else
+|  5 = @ppd_endif
+|  6 = @ppd_plain_include
+|  7 = @ppd_define
+|  8 = @ppd_undef
+|  9 = @ppd_line
+| 10 = @ppd_error
+| 11 = @ppd_pragma
+| 12 = @ppd_objc_import
+| 13 = @ppd_include_next
+| 14 = @ppd_ms_import
+| 15 = @ppd_elifdef
+| 16 = @ppd_elifndef
+| 18 = @ppd_warning
+;
+
+@ppd_include = @ppd_plain_include | @ppd_objc_import | @ppd_include_next | @ppd_ms_import;
+
+@ppd_branch = @ppd_if | @ppd_ifdef | @ppd_ifndef | @ppd_elif | @ppd_elifdef | @ppd_elifndef;
+
+preprocpair(
+    int begin : @ppd_branch ref,
+    int elseelifend : @preprocdirect ref
+);
+
+preproctrue(int branch : @ppd_branch ref);
+preprocfalse(int branch : @ppd_branch ref);
+
+preproctext(
+    unique int id: @preprocdirect ref,
+    string head: string ref,
+    string body: string ref
+);
+
+includes(
+    unique int id: @ppd_include ref,
+    int included: @file ref
+);
+
+link_targets(
+    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/af887e83a815a9cefe774ffa80e2493a1365b9e2/semmlecode.cpp.dbscheme b/cpp/ql/lib/upgrades/af887e83a815a9cefe774ffa80e2493a1365b9e2/semmlecode.cpp.dbscheme
new file mode 100644
index 00000000000..3c45f8b9e71
--- /dev/null
+++ b/cpp/ql/lib/upgrades/af887e83a815a9cefe774ffa80e2493a1365b9e2/semmlecode.cpp.dbscheme
@@ -0,0 +1,2493 @@
+
+/**
+ * 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
+);
+
+/**
+ * Optionally, record the build mode for each compilation.
+ */
+compilation_build_mode(
+    unique int id : @compilation ref,
+    int mode : int ref
+);
+
+/*
+case @compilation_build_mode.mode of
+  0 = @build_mode_none
+| 1 = @build_mode_manual
+| 2 = @build_mode_auto
+;
+*/
+
+/**
+ * The source files that are compiled by a compiler invocation.
+ * If `id` is for the compiler invocation
+ *
+ *   gcc -c f1.c f2.c f3.c
+ *
+ * then there will be rows for
+ *
+ * num | arg
+ * --- | ---
+ * 0   | f1.c
+ * 1   | f2.c
+ * 2   | f3.c
+ *
+ * Note that even if those files `#include` headers, those headers
+ * do not appear as rows.
+ */
+#keyset[id, num]
+compilation_compiling_files(
+    int id : @compilation ref,
+    int num : int ref,
+    int file : @file ref
+);
+
+/**
+ * The time taken by the extractor for a compiler invocation.
+ *
+ * For each file `num`, there will be rows for
+ *
+ * kind | seconds
+ * ---- | ---
+ * 1    | CPU seconds used by the extractor frontend
+ * 2    | Elapsed seconds during the extractor frontend
+ * 3    | CPU seconds used by the extractor backend
+ * 4    | Elapsed seconds during the extractor backend
+ */
+#keyset[id, num, kind]
+compilation_time(
+    int id : @compilation ref,
+    int num : int ref,
+    /* kind:
+       1 = frontend_cpu_seconds
+       2 = frontend_elapsed_seconds
+       3 = extractor_cpu_seconds
+       4 = extractor_elapsed_seconds
+    */
+    int kind : int ref,
+    float seconds : float ref
+);
+
+/**
+ * An error or warning generated by the extractor.
+ * The diagnostic message `diagnostic` was generated during compiler
+ * invocation `compilation`, and is the `file_number_diagnostic_number`th
+ * message generated while extracting the `file_number`th file of that
+ * invocation.
+ */
+#keyset[compilation, file_number, file_number_diagnostic_number]
+diagnostic_for(
+    int diagnostic : @diagnostic ref,
+    int compilation : @compilation ref,
+    int file_number : int ref,
+    int file_number_diagnostic_number : int ref
+);
+
+/**
+ * If extraction was successful, then `cpu_seconds` and
+ * `elapsed_seconds` are the CPU time and elapsed time (respectively)
+ * that extraction took for compiler invocation `id`.
+ */
+compilation_finished(
+    unique int id : @compilation ref,
+    float cpu_seconds : float ref,
+    float elapsed_seconds : float ref
+);
+
+
+/**
+ * External data, 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
+ */
+
+extractor_version(
+    string codeql_version: string ref,
+    string frontend_version: string ref
+)
+
+@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
+| 7 = @user_defined_literal
+| 8 = @deduction_guide
+;
+*/
+
+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
+);
+
+/*
+case @coroutine_placeholder_variable.kind of
+  1 = @handle
+| 2 = @promise
+| 3 = @init_await_resume
+;
+*/
+
+coroutine_placeholder_variable(
+  unique int placeholder_variable: @variable ref,
+  int kind: int ref,
+  int function: @function ref
+)
+
+/** The `new` function used for allocating the coroutine state, if any. */
+coroutine_new(
+  unique int function: @function ref,
+  int new: @function ref
+);
+
+/** The `delete` function used for deallocating the coroutine state, if any. */
+coroutine_delete(
+  unique int function: @function ref,
+  int delete: @function ref
+);
+
+purefunctions(unique int id: @function ref);
+
+function_deleted(unique int id: @function ref);
+
+function_defaulted(unique int id: @function ref);
+
+function_prototyped(unique int id: @function ref)
+
+deduction_guide_for_class(
+    int id: @function ref,
+    int class_template: @usertype ref
+)
+
+member_function_this_type(
+    unique int id: @function ref,
+    int this_type: @type ref
+);
+
+#keyset[id, type_id]
+fun_decls(
+    int id: @fun_decl,
+    int function: @function ref,
+    int type_id: @type ref,
+    string name: string ref,
+    int location: @location_default ref
+);
+fun_def(unique int id: @fun_decl ref);
+fun_specialized(unique int id: @fun_decl ref);
+fun_implicit(unique int id: @fun_decl ref);
+fun_decl_specifiers(
+    int id: @fun_decl ref,
+    string name: string ref
+)
+#keyset[fun_decl, index]
+fun_decl_throws(
+    int fun_decl: @fun_decl ref,
+    int index: int ref,
+    int type_id: @type ref
+);
+/* an empty throw specification is different from none */
+fun_decl_empty_throws(unique int fun_decl: @fun_decl ref);
+fun_decl_noexcept(
+    int fun_decl: @fun_decl ref,
+    int constant: @expr ref
+);
+fun_decl_empty_noexcept(int fun_decl: @fun_decl ref);
+fun_decl_typedef_type(
+    unique int fun_decl: @fun_decl ref,
+    int typedeftype_id: @usertype ref
+);
+
+/*
+case @fun_requires.kind of
+  1 = @template_attached
+| 2 = @function_attached
+;
+*/
+
+fun_requires(
+    int id: @fun_decl ref,
+    int kind: int ref,
+    int constraint: @expr ref
+);
+
+param_decl_bind(
+    unique int id: @var_decl ref,
+    int index: int ref,
+    int fun_decl: @fun_decl ref
+);
+
+#keyset[id, type_id]
+var_decls(
+    int id: @var_decl,
+    int variable: @variable ref,
+    int type_id: @type ref,
+    string name: string ref,
+    int location: @location_default ref
+);
+var_def(unique int id: @var_decl ref);
+var_specialized(int id: @var_decl ref);
+var_decl_specifiers(
+    int id: @var_decl ref,
+    string name: string ref
+)
+is_structured_binding(unique int id: @variable ref);
+var_requires(
+    int id: @var_decl ref,
+    int constraint: @expr ref
+);
+
+type_decls(
+    unique int id: @type_decl,
+    int type_id: @type ref,
+    int location: @location_default ref
+);
+type_def(unique int id: @type_decl ref);
+type_decl_top(
+    unique int type_decl: @type_decl ref
+);
+type_requires(
+    int id: @type_decl ref,
+    int constraint: @expr ref
+);
+
+namespace_decls(
+    unique int id: @namespace_decl,
+    int namespace_id: @namespace ref,
+    int location: @location_default ref,
+    int bodylocation: @location_default ref
+);
+
+case @using.kind of
+  1 = @using_declaration
+| 2 = @using_directive
+| 3 = @using_enum_declaration
+;
+
+usings(
+    unique int id: @using,
+    int element_id: @element ref,
+    int location: @location_default ref,
+    int kind: int ref
+);
+
+/** The element which contains the `using` declaration. */
+using_container(
+    int parent: @element ref,
+    int child: @using ref
+);
+
+static_asserts(
+    unique int id: @static_assert,
+    int condition : @expr ref,
+    string message : string ref,
+    int location: @location_default ref,
+    int enclosing : @element ref
+);
+
+// each function has an ordered list of parameters
+#keyset[id, type_id]
+#keyset[function, index, type_id]
+params(
+    int id: @parameter,
+    int function: @parameterized_element ref,
+    int index: int ref,
+    int type_id: @type ref
+);
+
+overrides(
+    int new: @function ref,
+    int old: @function ref
+);
+
+#keyset[id, type_id]
+membervariables(
+    int id: @membervariable,
+    int type_id: @type ref,
+    string name: string ref
+);
+
+#keyset[id, type_id]
+globalvariables(
+    int id: @globalvariable,
+    int type_id: @type ref,
+    string name: string ref
+);
+
+#keyset[id, type_id]
+localvariables(
+    int id: @localvariable,
+    int type_id: @type ref,
+    string name: string ref
+);
+
+autoderivation(
+    unique int var: @variable ref,
+    int derivation_type: @type ref
+);
+
+orphaned_variables(
+    int var: @localvariable ref,
+    int function: @function ref
+)
+
+enumconstants(
+    unique int id: @enumconstant,
+    int parent: @usertype ref,
+    int index: int ref,
+    int type_id: @type ref,
+    string name: string ref,
+    int location: @location_default ref
+);
+
+@variable = @localscopevariable | @globalvariable | @membervariable;
+
+@localscopevariable = @localvariable | @parameter;
+
+/**
+ * Built-in types are the fundamental types, e.g., integral, floating, and void.
+ */
+case @builtintype.kind of
+   1 = @errortype
+|  2 = @unknowntype
+|  3 = @void
+|  4 = @boolean
+|  5 = @char
+|  6 = @unsigned_char
+|  7 = @signed_char
+|  8 = @short
+|  9 = @unsigned_short
+| 10 = @signed_short
+| 11 = @int
+| 12 = @unsigned_int
+| 13 = @signed_int
+| 14 = @long
+| 15 = @unsigned_long
+| 16 = @signed_long
+| 17 = @long_long
+| 18 = @unsigned_long_long
+| 19 = @signed_long_long
+// ... 20 Microsoft-specific __int8
+// ... 21 Microsoft-specific __int16
+// ... 22 Microsoft-specific __int32
+// ... 23 Microsoft-specific __int64
+| 24 = @float
+| 25 = @double
+| 26 = @long_double
+| 27 = @complex_float         // C99-specific _Complex float
+| 28 = @complex_double        // C99-specific _Complex double
+| 29 = @complex_long_double   // C99-specific _Complex long double
+| 30 = @imaginary_float       // C99-specific _Imaginary float
+| 31 = @imaginary_double      // C99-specific _Imaginary double
+| 32 = @imaginary_long_double // C99-specific _Imaginary long double
+| 33 = @wchar_t               // Microsoft-specific
+| 34 = @decltype_nullptr      // C++11
+| 35 = @int128                // __int128
+| 36 = @unsigned_int128       // unsigned __int128
+| 37 = @signed_int128         // signed __int128
+| 38 = @float128              // __float128
+| 39 = @complex_float128      // _Complex __float128
+| 40 = @decimal32             // _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
+| 62 = @mfp8                  // __mfp8
+;
+
+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 or C23 `typeof`/`typeof_unqual`
+ * operator taking an expression as its argument.  For example:
+ * ```
+ * int a;
+ * decltype(1+a) b;
+ * typeof(1+a) c;
+ * ```
+ * Here `expr` is `1+a`.
+ *
+ * Sometimes an additional pair of parentheses around the expression
+ * changes the semantics of the decltype, e.g.
+ * ```
+ * struct A { double x; };
+ * const A* a = new A();
+ * decltype( a->x ); // type is double
+ * decltype((a->x)); // type is const double&
+ * ```
+ * (Please consult the C++11 standard for more details).
+ * `parentheses_would_change_meaning` is `true` iff that is the case.
+ */
+
+/*
+case @decltype.kind of
+|  0 = @decltype
+|  1 = @typeof // The frontend does not differentiate between typeof and typeof_unqual
+;
+*/
+
+#keyset[id, expr]
+decltypes(
+    int id: @decltype,
+    int expr: @expr ref,
+    int kind: int ref,
+    int base_type: @type ref,
+    boolean parentheses_would_change_meaning: boolean ref
+);
+
+/*
+case @type_operator.kind of
+|  0 = @typeof // The frontend does not differentiate between typeof and typeof_unqual
+|  1 = @underlying_type
+|  2 = @bases
+|  3 = @direct_bases
+|  4 = @add_lvalue_reference
+|  5 = @add_pointer
+|  6 = @add_rvalue_reference
+|  7 = @decay
+|  8 = @make_signed
+|  9 = @make_unsigned
+| 10 = @remove_all_extents
+| 11 = @remove_const
+| 12 = @remove_cv
+| 13 = @remove_cvref
+| 14 = @remove_extent
+| 15 = @remove_pointer
+| 16 = @remove_reference_t
+| 17 = @remove_restrict
+| 18 = @remove_volatile
+| 19 = @remove_reference
+;
+*/
+
+type_operators(
+    unique int id: @type_operator,
+    int arg_type: @type ref,
+    int kind: int ref,
+    int base_type: @type ref
+)
+
+/*
+case @usertype.kind of
+|  0 = @unknown_usertype
+|  1 = @struct
+|  2 = @class
+|  3 = @union
+|  4 = @enum
+// ... 5 = @typedef deprecated        // classic C: typedef typedef type name
+// ... 6 = @template deprecated
+|  7 = @template_parameter
+|  8 = @template_template_parameter
+|  9 = @proxy_class                   // a proxy class associated with a template parameter
+// ... 10 objc_class deprecated
+// ... 11 objc_protocol deprecated
+// ... 12 objc_category deprecated
+| 13 = @scoped_enum
+// ... 14 = @using_alias deprecated   // a using name = type style typedef
+| 15 = @template_struct
+| 16 = @template_class
+| 17 = @template_union
+| 18 = @alias
+;
+*/
+
+usertypes(
+    unique int id: @usertype,
+    string name: string ref,
+    int kind: int ref
+);
+
+usertypesize(
+    unique int id: @usertype ref,
+    int size: int ref,
+    int alignment: int ref
+);
+
+usertype_final(unique int id: @usertype ref);
+
+usertype_uuid(
+    unique int id: @usertype ref,
+    string uuid: string ref
+);
+
+/*
+case @usertype.alias_kind of
+| 0 = @typedef
+| 1 = @alias
+*/
+
+usertype_alias_kind(
+    int id: @usertype ref,
+    int alias_kind: int ref
+)
+
+nontype_template_parameters(
+    int id: @expr ref
+);
+
+type_template_type_constraint(
+    int id: @usertype ref,
+    int constraint: @expr ref
+);
+
+mangled_name(
+    unique int id: @declaration ref,
+    int mangled_name : @mangledname,
+    boolean is_complete: boolean ref
+);
+
+is_pod_class(unique int id: @usertype ref);
+is_standard_layout_class(unique int id: @usertype ref);
+
+is_complete(unique int id: @usertype ref);
+
+is_class_template(unique int id: @usertype ref);
+class_instantiation(
+    int to: @usertype ref,
+    int from: @usertype ref
+);
+class_template_argument(
+    int type_id: @usertype ref,
+    int index: int ref,
+    int arg_type: @type ref
+);
+class_template_argument_value(
+    int type_id: @usertype ref,
+    int index: int ref,
+    int arg_value: @expr ref
+);
+
+@user_or_decltype = @usertype | @decltype;
+
+is_proxy_class_for(
+    unique int id: @usertype ref,
+    int templ_param_id: @user_or_decltype ref
+);
+
+type_mentions(
+    unique int id: @type_mention,
+    int type_id: @type ref,
+    int location: @location 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
+);
+
+template_template_instantiation(
+    int to: @usertype ref,
+    int from: @usertype ref
+);
+template_template_argument(
+    int type_id: @usertype ref,
+    int index: int ref,
+    int arg_type: @type ref
+);
+template_template_argument_value(
+    int type_id: @usertype ref,
+    int index: int ref,
+    int arg_value: @expr ref
+);
+
+@concept = @concept_template | @concept_id;
+
+concept_templates(
+    unique int concept_id: @concept_template,
+    string name: string ref,
+    int location: @location_default ref
+);
+concept_instantiation(
+    unique int to: @concept_id ref,
+    int from: @concept_template ref
+);
+is_type_constraint(int concept_id: @concept_id ref);
+concept_template_argument(
+    int concept_id: @concept ref,
+    int index: int ref,
+    int arg_type: @type ref
+);
+concept_template_argument_value(
+    int concept_id: @concept ref,
+    int index: int ref,
+    int arg_value: @expr ref
+);
+
+routinetypes(
+    unique int id: @routinetype,
+    int return_type: @type ref
+);
+
+routinetypeargs(
+    int routine: @routinetype ref,
+    int index: int ref,
+    int type_id: @type ref
+);
+
+ptrtomembers(
+    unique int id: @ptrtomember,
+    int type_id: @type ref,
+    int class_id: @type ref
+);
+
+/*
+ specifiers for types, functions, and variables
+
+    "public",
+    "protected",
+    "private",
+
+    "const",
+    "volatile",
+    "static",
+
+    "pure",
+    "virtual",
+    "sealed", // Microsoft
+    "__interface", // Microsoft
+    "inline",
+    "explicit",
+
+    "near", // near far extension
+    "far", // near far extension
+    "__ptr32", // Microsoft
+    "__ptr64", // Microsoft
+    "__sptr", // Microsoft
+    "__uptr", // Microsoft
+    "dllimport", // Microsoft
+    "dllexport", // Microsoft
+    "thread", // Microsoft
+    "naked", // Microsoft
+    "microsoft_inline", // Microsoft
+    "forceinline", // Microsoft
+    "selectany", // Microsoft
+    "nothrow", // Microsoft
+    "novtable", // Microsoft
+    "noreturn", // Microsoft
+    "noinline", // Microsoft
+    "noalias", // Microsoft
+    "restrict", // Microsoft
+*/
+
+specifiers(
+    unique int id: @specifier,
+    unique string str: string ref
+);
+
+typespecifiers(
+    int type_id: @type ref,
+    int spec_id: @specifier ref
+);
+
+funspecifiers(
+    int func_id: @function ref,
+    int spec_id: @specifier ref
+);
+
+varspecifiers(
+    int var_id: @accessible ref,
+    int spec_id: @specifier ref
+);
+
+explicit_specifier_exprs(
+    unique int func_id: @function ref,
+    int constant: @expr ref
+)
+
+attributes(
+    unique int id: @attribute,
+    int kind: int ref,
+    string name: string ref,
+    string name_space: string ref,
+    int location: @location_default ref
+);
+
+case @attribute.kind of
+  0 = @gnuattribute
+| 1 = @stdattribute
+| 2 = @declspec
+| 3 = @msattribute
+| 4 = @alignas
+// ... 5 @objc_propertyattribute deprecated
+;
+
+attribute_args(
+    unique int id: @attribute_arg,
+    int kind: int ref,
+    int attribute: @attribute ref,
+    int index: int ref,
+    int location: @location_default ref
+);
+
+case @attribute_arg.kind of
+  0 = @attribute_arg_empty
+| 1 = @attribute_arg_token
+| 2 = @attribute_arg_constant
+| 3 = @attribute_arg_type
+| 4 = @attribute_arg_constant_expr
+| 5 = @attribute_arg_expr
+;
+
+attribute_arg_value(
+    unique int arg: @attribute_arg ref,
+    string value: string ref
+);
+attribute_arg_type(
+    unique int arg: @attribute_arg ref,
+    int type_id: @type ref
+);
+attribute_arg_constant(
+    unique int arg: @attribute_arg ref,
+    int constant: @expr ref
+)
+attribute_arg_expr(
+    unique int arg: @attribute_arg ref,
+    int expr: @expr ref
+)
+attribute_arg_name(
+    unique int arg: @attribute_arg ref,
+    string name: string ref
+);
+
+typeattributes(
+    int type_id: @type ref,
+    int spec_id: @attribute ref
+);
+
+funcattributes(
+    int func_id: @function ref,
+    int spec_id: @attribute ref
+);
+
+varattributes(
+    int var_id: @accessible ref,
+    int spec_id: @attribute ref
+);
+
+stmtattributes(
+    int stmt_id: @stmt ref,
+    int spec_id: @attribute ref
+);
+
+@type = @builtintype
+      | @derivedtype
+      | @usertype
+      | @routinetype
+      | @ptrtomember
+      | @decltype
+      | @type_operator;
+
+unspecifiedtype(
+    unique int type_id: @type ref,
+    int unspecified_type_id: @type ref
+);
+
+member(
+    int parent: @type ref,
+    int index: int ref,
+    int child: @member ref
+);
+
+@enclosingfunction_child = @usertype | @variable | @namespace
+
+enclosingfunction(
+    unique int child: @enclosingfunction_child ref,
+    int parent: @function ref
+);
+
+derivations(
+    unique int derivation: @derivation,
+    int sub: @type ref,
+    int index: int ref,
+    int super: @type ref,
+    int location: @location_default ref
+);
+
+derspecifiers(
+    int der_id: @derivation ref,
+    int spec_id: @specifier ref
+);
+
+/**
+ * Contains the byte offset of the base class subobject within the derived
+ * class. Only holds for non-virtual base classes, but see table
+ * `virtual_base_offsets` for offsets of virtual base class subobjects.
+ */
+direct_base_offsets(
+    unique int der_id: @derivation ref,
+    int offset: int ref
+);
+
+/**
+ * Contains the byte offset of the virtual base class subobject for class
+ * `super` within a most-derived object of class `sub`. `super` can be either a
+ * direct or indirect base class.
+ */
+#keyset[sub, super]
+virtual_base_offsets(
+    int sub: @usertype ref,
+    int super: @usertype ref,
+    int offset: int ref
+);
+
+frienddecls(
+    unique int id: @frienddecl,
+    int type_id: @type ref,
+    int decl_id: @declaration ref,
+    int location: @location_default ref
+);
+
+@declaredtype = @usertype ;
+
+@declaration = @function
+             | @declaredtype
+             | @variable
+             | @enumconstant
+             | @frienddecl
+             | @concept_template;
+
+@member = @membervariable
+        | @function
+        | @declaredtype
+        | @enumconstant;
+
+@locatable = @diagnostic
+           | @declaration
+           | @ppd_include
+           | @ppd_define
+           | @macroinvocation
+           /*| @funcall*/
+           | @xmllocatable
+           | @attribute
+           | @attribute_arg;
+
+@namedscope = @namespace | @usertype;
+
+@element = @locatable
+         | @file
+         | @folder
+         | @specifier
+         | @type
+         | @expr
+         | @namespace
+         | @initialiser
+         | @stmt
+         | @derivation
+         | @comment
+         | @preprocdirect
+         | @fun_decl
+         | @var_decl
+         | @type_decl
+         | @namespace_decl
+         | @using
+         | @namequalifier
+         | @specialnamequalifyingelement
+         | @static_assert
+         | @type_mention
+         | @lambdacapture;
+
+@exprparent = @element;
+
+comments(
+    unique int id: @comment,
+    string contents: string ref,
+    int location: @location_default ref
+);
+
+commentbinding(
+    int id: @comment ref,
+    int element: @element ref
+);
+
+exprconv(
+    int converted: @expr ref,
+    unique int conversion: @expr ref
+);
+
+compgenerated(unique int id: @element ref);
+
+/**
+ * `destructor_call` destructs the `i`'th entity that should be
+ * destructed following `element`. Note that entities should be
+ * destructed in reverse construction order, so for a given `element`
+ * these should be called from highest to lowest `i`.
+ */
+#keyset[element, destructor_call]
+#keyset[element, i]
+synthetic_destructor_call(
+    int element: @element ref,
+    int i: int ref,
+    int destructor_call: @routineexpr ref
+);
+
+namespaces(
+    unique int id: @namespace,
+    string name: string ref
+);
+
+namespace_inline(
+    unique int id: @namespace ref
+);
+
+namespacembrs(
+    int parentid: @namespace ref,
+    unique int memberid: @namespacembr ref
+);
+
+@namespacembr = @declaration | @namespace;
+
+exprparents(
+    int expr_id: @expr ref,
+    int child_index: int ref,
+    int parent_id: @exprparent ref
+);
+
+expr_isload(unique int expr_id: @expr ref);
+
+@cast = @c_style_cast
+      | @const_cast
+      | @dynamic_cast
+      | @reinterpret_cast
+      | @static_cast
+      ;
+
+/*
+case @conversion.kind of
+  0 = @simple_conversion           // a numeric conversion, qualification conversion, or a reinterpret_cast
+| 1 = @bool_conversion             // conversion to 'bool'
+| 2 = @base_class_conversion       // a derived-to-base conversion
+| 3 = @derived_class_conversion    // a base-to-derived conversion
+| 4 = @pm_base_class_conversion    // a derived-to-base conversion of a pointer to member
+| 5 = @pm_derived_class_conversion // a base-to-derived conversion of a pointer to member
+| 6 = @glvalue_adjust              // an adjustment of the type of a glvalue
+| 7 = @prvalue_adjust              // an adjustment of the type of a prvalue
+;
+*/
+/**
+ * Describes the semantics represented by a cast expression. This is largely
+ * independent of the source syntax of the cast, so it is separate from the
+ * regular expression kind.
+ */
+conversionkinds(
+    unique int expr_id: @cast ref,
+    int kind: int ref
+);
+
+@conversion = @cast
+            | @array_to_pointer
+            | @parexpr
+            | @reference_to
+            | @ref_indirect
+            | @temp_init
+            | @c11_generic
+            ;
+
+/*
+case @funbindexpr.kind of
+  0 = @normal_call  // a normal call
+| 1 = @virtual_call // a virtual call
+| 2 = @adl_call     // a call whose target is only found by ADL
+;
+*/
+iscall(
+    unique int caller: @funbindexpr ref,
+    int kind: int ref
+);
+
+numtemplatearguments(
+    unique int expr_id: @expr ref,
+    int num: int ref
+);
+
+specialnamequalifyingelements(
+    unique int id: @specialnamequalifyingelement,
+    unique string name: string ref
+);
+
+@namequalifiableelement = @expr | @namequalifier;
+@namequalifyingelement = @namespace
+                       | @specialnamequalifyingelement
+                       | @usertype;
+
+namequalifiers(
+    unique int id: @namequalifier,
+    unique int qualifiableelement: @namequalifiableelement ref,
+    int qualifyingelement: @namequalifyingelement ref,
+    int location: @location_default ref
+);
+
+varbind(
+    int expr: @varbindexpr ref,
+    int var: @accessible ref
+);
+
+funbind(
+    int expr: @funbindexpr ref,
+    int fun: @function ref
+);
+
+@any_new_expr = @new_expr
+              | @new_array_expr;
+
+@new_or_delete_expr = @any_new_expr
+                    | @delete_expr
+                    | @delete_array_expr;
+
+@prefix_crement_expr = @preincrexpr | @predecrexpr;
+
+@postfix_crement_expr = @postincrexpr | @postdecrexpr;
+
+@increment_expr = @preincrexpr | @postincrexpr;
+
+@decrement_expr = @predecrexpr | @postdecrexpr;
+
+@crement_expr = @increment_expr | @decrement_expr;
+
+@un_arith_op_expr = @arithnegexpr
+                  | @unaryplusexpr
+                  | @conjugation
+                  | @realpartexpr
+                  | @imagpartexpr
+                  | @crement_expr
+                  ;
+
+@un_bitwise_op_expr = @complementexpr;
+
+@un_log_op_expr = @notexpr;
+
+@un_op_expr = @address_of
+            | @indirect
+            | @un_arith_op_expr
+            | @un_bitwise_op_expr
+            | @builtinaddressof
+            | @vec_fill
+            | @un_log_op_expr
+            | @co_await
+            | @co_yield
+            ;
+
+@bin_log_op_expr = @andlogicalexpr | @orlogicalexpr;
+
+@cmp_op_expr = @eq_op_expr | @rel_op_expr;
+
+@eq_op_expr = @eqexpr | @neexpr;
+
+@rel_op_expr = @gtexpr
+             | @ltexpr
+             | @geexpr
+             | @leexpr
+             | @spaceshipexpr
+             ;
+
+@bin_bitwise_op_expr = @lshiftexpr
+                     | @rshiftexpr
+                     | @andexpr
+                     | @orexpr
+                     | @xorexpr
+                     ;
+
+@p_arith_op_expr = @paddexpr
+                 | @psubexpr
+                 | @pdiffexpr
+                 ;
+
+@bin_arith_op_expr = @addexpr
+                   | @subexpr
+                   | @mulexpr
+                   | @divexpr
+                   | @remexpr
+                   | @jmulexpr
+                   | @jdivexpr
+                   | @fjaddexpr
+                   | @jfaddexpr
+                   | @fjsubexpr
+                   | @jfsubexpr
+                   | @minexpr
+                   | @maxexpr
+                   | @p_arith_op_expr
+                   ;
+
+@bin_op_expr = @bin_arith_op_expr
+             | @bin_bitwise_op_expr
+             | @cmp_op_expr
+             | @bin_log_op_expr
+             ;
+
+@op_expr = @un_op_expr
+         | @bin_op_expr
+         | @assign_expr
+         | @conditionalexpr
+         ;
+
+@assign_arith_expr = @assignaddexpr
+                   | @assignsubexpr
+                   | @assignmulexpr
+                   | @assigndivexpr
+                   | @assignremexpr
+                   ;
+
+@assign_bitwise_expr = @assignandexpr
+                     | @assignorexpr
+                     | @assignxorexpr
+                     | @assignlshiftexpr
+                     | @assignrshiftexpr
+                     ;
+
+@assign_pointer_expr = @assignpaddexpr
+                     | @assignpsubexpr
+                     ;
+
+@assign_op_expr = @assign_arith_expr
+                | @assign_bitwise_expr
+                | @assign_pointer_expr
+                ;
+
+@assign_expr = @assignexpr | @assign_op_expr | @blockassignexpr
+
+/*
+  Binary encoding of the allocator form.
+
+  case @allocator.form of
+    0 = plain
+  | 1 = alignment
+  ;
+*/
+
+/**
+ * The allocator function associated with a `new` or `new[]` expression.
+ * The `form` column specified whether the allocation call contains an alignment
+ * argument.
+ */
+expr_allocator(
+    unique int expr: @any_new_expr ref,
+    int func: @function ref,
+    int form: int ref
+);
+
+/*
+  Binary encoding of the deallocator form.
+
+  case @deallocator.form of
+    0 = plain
+  | 1 = size
+  | 2 = alignment
+  | 4 = destroying_delete
+  ;
+*/
+
+/**
+ * The deallocator function associated with a `delete`, `delete[]`, `new`, or
+ * `new[]` expression. For a `new` or `new[]` expression, the deallocator is the
+ * one used to free memory if the initialization throws an exception.
+ * The `form` column specifies whether the deallocation call contains a size
+ * argument, and alignment argument, or both.
+ */
+expr_deallocator(
+    unique int expr: @new_or_delete_expr ref,
+    int func: @function ref,
+    int form: int ref
+);
+
+/**
+ * Holds if the `@conditionalexpr` is of the two operand form
+ * `guard ? : false`.
+ */
+expr_cond_two_operand(
+    unique int cond: @conditionalexpr ref
+);
+
+/**
+ * The guard of `@conditionalexpr` `guard ? true : false`
+ */
+expr_cond_guard(
+    unique int cond: @conditionalexpr ref,
+    int guard: @expr ref
+);
+
+/**
+ * The expression used when the guard of `@conditionalexpr`
+ * `guard ? true : false` holds. For the two operand form
+ * `guard ?: false` consider using `expr_cond_guard` instead.
+ */
+expr_cond_true(
+    unique int cond: @conditionalexpr ref,
+    int true: @expr ref
+);
+
+/**
+ * The expression used when the guard of `@conditionalexpr`
+ * `guard ? true : false` does not hold.
+ */
+expr_cond_false(
+    unique int cond: @conditionalexpr ref,
+    int false: @expr ref
+);
+
+/** A string representation of the value. */
+values(
+    unique int id: @value,
+    string str: string ref
+);
+
+/** The actual text in the source code for the value, if any. */
+valuetext(
+    unique int id: @value ref,
+    string text: string ref
+);
+
+valuebind(
+    int val: @value ref,
+    unique int expr: @expr ref
+);
+
+fieldoffsets(
+    unique int id: @variable ref,
+    int byteoffset: int ref,
+    int bitoffset: int ref
+);
+
+bitfield(
+    unique int id: @variable ref,
+    int bits: int ref,
+    int declared_bits: int ref
+);
+
+/* TODO
+memberprefix(
+    int member: @expr ref,
+    int prefix: @expr ref
+);
+*/
+
+/*
+   kind(1) = mbrcallexpr
+   kind(2) = mbrptrcallexpr
+   kind(3) = mbrptrmbrcallexpr
+   kind(4) = ptrmbrptrmbrcallexpr
+   kind(5) = mbrreadexpr // x.y
+   kind(6) = mbrptrreadexpr // p->y
+   kind(7) = mbrptrmbrreadexpr // x.*pm
+   kind(8) = mbrptrmbrptrreadexpr // x->*pm
+   kind(9) = staticmbrreadexpr // static x.y
+   kind(10) = staticmbrptrreadexpr // static p->y
+*/
+/* TODO
+memberaccess(
+    int member: @expr ref,
+    int kind: int ref
+);
+*/
+
+initialisers(
+    unique int init: @initialiser,
+    int var: @accessible ref,
+    unique int expr: @expr ref,
+    int location: @location_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
+);
+
+expr_reuse(
+    int reuse: @expr ref,
+    int original: @expr ref,
+    int value_category: int ref
+)
+
+/*
+  case @value.category of
+    1 = prval
+  | 2 = xval
+  | 3 = lval
+  ;
+*/
+expr_types(
+    int id: @expr ref,
+    int typeid: @type ref,
+    int value_category: int ref
+);
+
+case @expr.kind of
+    1 = @errorexpr
+|   2 = @address_of // & AddressOfExpr
+|   3 = @reference_to // ReferenceToExpr (implicit?)
+|   4 = @indirect // * PointerDereferenceExpr
+|   5 = @ref_indirect // ReferenceDereferenceExpr (implicit?)
+// ...
+|   8 = @array_to_pointer // (???)
+|   9 = @vacuous_destructor_call // VacuousDestructorCall
+// ...
+|  11 = @assume // Microsoft
+|  12 = @parexpr
+|  13 = @arithnegexpr
+|  14 = @unaryplusexpr
+|  15 = @complementexpr
+|  16 = @notexpr
+|  17 = @conjugation // GNU ~ operator
+|  18 = @realpartexpr // GNU __real
+|  19 = @imagpartexpr // GNU __imag
+|  20 = @postincrexpr
+|  21 = @postdecrexpr
+|  22 = @preincrexpr
+|  23 = @predecrexpr
+|  24 = @conditionalexpr
+|  25 = @addexpr
+|  26 = @subexpr
+|  27 = @mulexpr
+|  28 = @divexpr
+|  29 = @remexpr
+|  30 = @jmulexpr // C99 mul imaginary
+|  31 = @jdivexpr // C99 div imaginary
+|  32 = @fjaddexpr // C99 add real + imaginary
+|  33 = @jfaddexpr // C99 add imaginary + real
+|  34 = @fjsubexpr // C99 sub real - imaginary
+|  35 = @jfsubexpr // C99 sub imaginary - real
+|  36 = @paddexpr // pointer add (pointer + int or int + pointer)
+|  37 = @psubexpr // pointer sub (pointer - integer)
+|  38 = @pdiffexpr // difference between two pointers
+|  39 = @lshiftexpr
+|  40 = @rshiftexpr
+|  41 = @andexpr
+|  42 = @orexpr
+|  43 = @xorexpr
+|  44 = @eqexpr
+|  45 = @neexpr
+|  46 = @gtexpr
+|  47 = @ltexpr
+|  48 = @geexpr
+|  49 = @leexpr
+|  50 = @minexpr // GNU minimum
+|  51 = @maxexpr // GNU maximum
+|  52 = @assignexpr
+|  53 = @assignaddexpr
+|  54 = @assignsubexpr
+|  55 = @assignmulexpr
+|  56 = @assigndivexpr
+|  57 = @assignremexpr
+|  58 = @assignlshiftexpr
+|  59 = @assignrshiftexpr
+|  60 = @assignandexpr
+|  61 = @assignorexpr
+|  62 = @assignxorexpr
+|  63 = @assignpaddexpr // assign pointer add
+|  64 = @assignpsubexpr // assign pointer sub
+|  65 = @andlogicalexpr
+|  66 = @orlogicalexpr
+|  67 = @commaexpr
+|  68 = @subscriptexpr // access to member of an array, e.g., a[5]
+// ...  69 @objc_subscriptexpr deprecated
+// ...  70 @cmdaccess deprecated
+// ...
+|  73 = @virtfunptrexpr
+|  74 = @callexpr
+// ...  75 @msgexpr_normal deprecated
+// ...  76 @msgexpr_super deprecated
+// ...  77 @atselectorexpr deprecated
+// ...  78 @atprotocolexpr deprecated
+|  79 = @vastartexpr
+|  80 = @vaargexpr
+|  81 = @vaendexpr
+|  82 = @vacopyexpr
+// ...  83 @atencodeexpr deprecated
+|  84 = @varaccess
+|  85 = @thisaccess
+// ...  86 @objc_box_expr deprecated
+|  87 = @new_expr
+|  88 = @delete_expr
+|  89 = @throw_expr
+|  90 = @condition_decl // a variable declared in a condition, e.g., if(int x = y > 2)
+|  91 = @braced_init_list
+|  92 = @type_id
+|  93 = @runtime_sizeof
+|  94 = @runtime_alignof
+|  95 = @sizeof_pack
+|  96 = @expr_stmt // GNU extension
+|  97 = @routineexpr
+|  98 = @type_operand // used to access a type in certain contexts (haven't found any examples yet....)
+|  99 = @offsetofexpr // offsetof ::= type and field
+| 100 = @hasassignexpr // __has_assign ::= type
+| 101 = @hascopyexpr // __has_copy ::= type
+| 102 = @hasnothrowassign // __has_nothrow_assign ::= type
+| 103 = @hasnothrowconstr // __has_nothrow_constructor ::= type
+| 104 = @hasnothrowcopy // __has_nothrow_copy ::= type
+| 105 = @hastrivialassign // __has_trivial_assign ::= type
+| 106 = @hastrivialconstr // __has_trivial_constructor ::= type
+| 107 = @hastrivialcopy // __has_trivial_copy ::= type
+| 108 = @hasuserdestr // __has_user_destructor ::= type
+| 109 = @hasvirtualdestr // __has_virtual_destructor ::= type
+| 110 = @isabstractexpr // __is_abstract ::= type
+| 111 = @isbaseofexpr // __is_base_of ::= type type
+| 112 = @isclassexpr // __is_class ::= type
+| 113 = @isconvtoexpr // __is_convertible_to ::= type type
+| 114 = @isemptyexpr // __is_empty ::= type
+| 115 = @isenumexpr // __is_enum ::= type
+| 116 = @ispodexpr // __is_pod ::= type
+| 117 = @ispolyexpr // __is_polymorphic ::= type
+| 118 = @isunionexpr // __is_union ::= type
+| 119 = @typescompexpr // GNU __builtin_types_compatible ::= type type
+| 120 = @intaddrexpr // frontend internal builtin, used to implement offsetof
+// ...
+| 122 = @hastrivialdestructor // __has_trivial_destructor ::= type
+| 123 = @literal
+| 124 = @uuidof
+| 127 = @aggregateliteral
+| 128 = @delete_array_expr
+| 129 = @new_array_expr
+// ... 130 @objc_array_literal deprecated
+// ... 131 @objc_dictionary_literal deprecated
+| 132 = @foldexpr
+// ...
+| 200 = @ctordirectinit
+| 201 = @ctorvirtualinit
+| 202 = @ctorfieldinit
+| 203 = @ctordelegatinginit
+| 204 = @dtordirectdestruct
+| 205 = @dtorvirtualdestruct
+| 206 = @dtorfielddestruct
+// ...
+| 210 = @static_cast
+| 211 = @reinterpret_cast
+| 212 = @const_cast
+| 213 = @dynamic_cast
+| 214 = @c_style_cast
+| 215 = @lambdaexpr
+| 216 = @param_ref
+| 217 = @noopexpr
+// ...
+| 294 = @istriviallyconstructibleexpr
+| 295 = @isdestructibleexpr
+| 296 = @isnothrowdestructibleexpr
+| 297 = @istriviallydestructibleexpr
+| 298 = @istriviallyassignableexpr
+| 299 = @isnothrowassignableexpr
+| 300 = @istrivialexpr
+| 301 = @isstandardlayoutexpr
+| 302 = @istriviallycopyableexpr
+| 303 = @isliteraltypeexpr
+| 304 = @hastrivialmoveconstructorexpr
+| 305 = @hastrivialmoveassignexpr
+| 306 = @hasnothrowmoveassignexpr
+| 307 = @isconstructibleexpr
+| 308 = @isnothrowconstructibleexpr
+| 309 = @hasfinalizerexpr
+| 310 = @isdelegateexpr
+| 311 = @isinterfaceclassexpr
+| 312 = @isrefarrayexpr
+| 313 = @isrefclassexpr
+| 314 = @issealedexpr
+| 315 = @issimplevalueclassexpr
+| 316 = @isvalueclassexpr
+| 317 = @isfinalexpr
+| 319 = @noexceptexpr
+| 320 = @builtinshufflevector
+| 321 = @builtinchooseexpr
+| 322 = @builtinaddressof
+| 323 = @vec_fill
+| 324 = @builtinconvertvector
+| 325 = @builtincomplex
+| 326 = @spaceshipexpr
+| 327 = @co_await
+| 328 = @co_yield
+| 329 = @temp_init
+| 330 = @isassignable
+| 331 = @isaggregate
+| 332 = @hasuniqueobjectrepresentations
+| 333 = @builtinbitcast
+| 334 = @builtinshuffle
+| 335 = @blockassignexpr
+| 336 = @issame
+| 337 = @isfunction
+| 338 = @islayoutcompatible
+| 339 = @ispointerinterconvertiblebaseof
+| 340 = @isarray
+| 341 = @arrayrank
+| 342 = @arrayextent
+| 343 = @isarithmetic
+| 344 = @iscompletetype
+| 345 = @iscompound
+| 346 = @isconst
+| 347 = @isfloatingpoint
+| 348 = @isfundamental
+| 349 = @isintegral
+| 350 = @islvaluereference
+| 351 = @ismemberfunctionpointer
+| 352 = @ismemberobjectpointer
+| 353 = @ismemberpointer
+| 354 = @isobject
+| 355 = @ispointer
+| 356 = @isreference
+| 357 = @isrvaluereference
+| 358 = @isscalar
+| 359 = @issigned
+| 360 = @isunsigned
+| 361 = @isvoid
+| 362 = @isvolatile
+| 363 = @reuseexpr
+| 364 = @istriviallycopyassignable
+| 365 = @isassignablenopreconditioncheck
+| 366 = @referencebindstotemporary
+| 367 = @issameas
+| 368 = @builtinhasattribute
+| 369 = @ispointerinterconvertiblewithclass
+| 370 = @builtinispointerinterconvertiblewithclass
+| 371 = @iscorrespondingmember
+| 372 = @builtiniscorrespondingmember
+| 373 = @isboundedarray
+| 374 = @isunboundedarray
+| 375 = @isreferenceable
+| 378 = @isnothrowconvertible
+| 379 = @referenceconstructsfromtemporary
+| 380 = @referenceconvertsfromtemporary
+| 381 = @isconvertible
+| 382 = @isvalidwinrttype
+| 383 = @iswinclass
+| 384 = @iswininterface
+| 385 = @istriviallyequalitycomparable
+| 386 = @isscopedenum
+| 387 = @istriviallyrelocatable
+| 388 = @datasizeof
+| 389 = @c11_generic
+| 390 = @requires_expr
+| 391 = @nested_requirement
+| 392 = @compound_requirement
+| 393 = @concept_id
+;
+
+@var_args_expr = @vastartexpr
+               | @vaendexpr
+               | @vaargexpr
+               | @vacopyexpr
+               ;
+
+@builtin_op = @var_args_expr
+            | @noopexpr
+            | @offsetofexpr
+            | @intaddrexpr
+            | @hasassignexpr
+            | @hascopyexpr
+            | @hasnothrowassign
+            | @hasnothrowconstr
+            | @hasnothrowcopy
+            | @hastrivialassign
+            | @hastrivialconstr
+            | @hastrivialcopy
+            | @hastrivialdestructor
+            | @hasuserdestr
+            | @hasvirtualdestr
+            | @isabstractexpr
+            | @isbaseofexpr
+            | @isclassexpr
+            | @isconvtoexpr
+            | @isemptyexpr
+            | @isenumexpr
+            | @ispodexpr
+            | @ispolyexpr
+            | @isunionexpr
+            | @typescompexpr
+            | @builtinshufflevector
+            | @builtinconvertvector
+            | @builtinaddressof
+            | @istriviallyconstructibleexpr
+            | @isdestructibleexpr
+            | @isnothrowdestructibleexpr
+            | @istriviallydestructibleexpr
+            | @istriviallyassignableexpr
+            | @isnothrowassignableexpr
+            | @istrivialexpr
+            | @isstandardlayoutexpr
+            | @istriviallycopyableexpr
+            | @isliteraltypeexpr
+            | @hastrivialmoveconstructorexpr
+            | @hastrivialmoveassignexpr
+            | @hasnothrowmoveassignexpr
+            | @isconstructibleexpr
+            | @isnothrowconstructibleexpr
+            | @hasfinalizerexpr
+            | @isdelegateexpr
+            | @isinterfaceclassexpr
+            | @isrefarrayexpr
+            | @isrefclassexpr
+            | @issealedexpr
+            | @issimplevalueclassexpr
+            | @isvalueclassexpr
+            | @isfinalexpr
+            | @builtinchooseexpr
+            | @builtincomplex
+            | @isassignable
+            | @isaggregate
+            | @hasuniqueobjectrepresentations
+            | @builtinbitcast
+            | @builtinshuffle
+            | @issame
+            | @isfunction
+            | @islayoutcompatible
+            | @ispointerinterconvertiblebaseof
+            | @isarray
+            | @arrayrank
+            | @arrayextent
+            | @isarithmetic
+            | @iscompletetype
+            | @iscompound
+            | @isconst
+            | @isfloatingpoint
+            | @isfundamental
+            | @isintegral
+            | @islvaluereference
+            | @ismemberfunctionpointer
+            | @ismemberobjectpointer
+            | @ismemberpointer
+            | @isobject
+            | @ispointer
+            | @isreference
+            | @isrvaluereference
+            | @isscalar
+            | @issigned
+            | @isunsigned
+            | @isvoid
+            | @isvolatile
+            | @istriviallycopyassignable
+            | @isassignablenopreconditioncheck
+            | @referencebindstotemporary
+            | @issameas
+            | @builtinhasattribute
+            | @ispointerinterconvertiblewithclass
+            | @builtinispointerinterconvertiblewithclass
+            | @iscorrespondingmember
+            | @builtiniscorrespondingmember
+            | @isboundedarray
+            | @isunboundedarray
+            | @isreferenceable
+            | @isnothrowconvertible
+            | @referenceconstructsfromtemporary
+            | @referenceconvertsfromtemporary
+            | @isconvertible
+            | @isvalidwinrttype
+            | @iswinclass
+            | @iswininterface
+            | @istriviallyequalitycomparable
+            | @isscopedenum
+            | @istriviallyrelocatable
+            ;
+
+compound_requirement_is_noexcept(
+    int expr: @compound_requirement ref
+);
+
+new_allocated_type(
+    unique int expr: @new_expr ref,
+    int type_id: @type ref
+);
+
+new_array_allocated_type(
+    unique int expr: @new_array_expr ref,
+    int type_id: @type ref
+);
+
+/**
+ * The field being initialized by an initializer expression within an aggregate
+ * initializer for a class/struct/union. Position is used to sort repeated initializers.
+ */
+#keyset[aggregate, position]
+aggregate_field_init(
+    int aggregate: @aggregateliteral ref,
+    int initializer: @expr ref,
+    int field: @membervariable ref,
+    int position: int ref,
+    boolean is_designated: boolean ref
+);
+
+/**
+ * The index of the element being initialized by an initializer expression
+ * within an aggregate initializer for an array. Position is used to sort repeated initializers.
+ */
+#keyset[aggregate, position]
+aggregate_array_init(
+    int aggregate: @aggregateliteral ref,
+    int initializer: @expr ref,
+    int element_index: int ref,
+    int position: int ref,
+    boolean is_designated: boolean ref
+);
+
+@ctorinit = @ctordirectinit
+          | @ctorvirtualinit
+          | @ctorfieldinit
+          | @ctordelegatinginit;
+@dtordestruct = @dtordirectdestruct
+              | @dtorvirtualdestruct
+              | @dtorfielddestruct;
+
+
+condition_decl_bind(
+    unique int expr: @condition_decl ref,
+    unique int decl: @declaration ref
+);
+
+typeid_bind(
+    unique int expr: @type_id ref,
+    int type_id: @type ref
+);
+
+uuidof_bind(
+    unique int expr: @uuidof ref,
+    int type_id: @type ref
+);
+
+@sizeof_or_alignof = @runtime_sizeof | @runtime_alignof | @datasizeof | @sizeof_pack;
+
+sizeof_bind(
+    unique int expr: @sizeof_or_alignof ref,
+    int type_id: @type ref
+);
+
+code_block(
+    unique int block: @literal ref,
+    unique int routine: @function ref
+);
+
+lambdas(
+    unique int expr: @lambdaexpr ref,
+    string default_capture: string ref,
+    boolean has_explicit_return_type: boolean ref,
+    boolean has_explicit_parameter_list: boolean ref
+);
+
+lambda_capture(
+    unique int id: @lambdacapture,
+    int lambda: @lambdaexpr ref,
+    int index: int ref,
+    int field: @membervariable ref,
+    boolean captured_by_reference: boolean ref,
+    boolean is_implicit: boolean ref,
+    int location: @location_default ref
+);
+
+@funbindexpr = @routineexpr
+             | @new_expr
+             | @delete_expr
+             | @delete_array_expr
+             | @ctordirectinit
+             | @ctorvirtualinit
+             | @ctordelegatinginit
+             | @dtordirectdestruct
+             | @dtorvirtualdestruct;
+
+@varbindexpr = @varaccess | @ctorfieldinit | @dtorfielddestruct;
+@addressable = @function | @variable ;
+@accessible = @addressable | @enumconstant ;
+
+@access = @varaccess | @routineexpr ;
+
+fold(
+    int expr: @foldexpr ref,
+    string operator: string ref,
+    boolean is_left_fold: boolean ref
+);
+
+stmts(
+    unique int id: @stmt,
+    int kind: int ref,
+    int location: @location_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
+|  38 = @stmt_consteval_if
+|  39 = @stmt_not_consteval_if
+;
+
+type_vla(
+    int type_id: @type ref,
+    int decl: @stmt_vla_decl ref
+);
+
+variable_vla(
+    int var: @variable ref,
+    int decl: @stmt_vla_decl ref
+);
+
+type_is_vla(unique int type_id: @derivedtype ref)
+
+if_initialization(
+    unique int if_stmt: @stmt_if ref,
+    int init_id: @stmt ref
+);
+
+if_then(
+    unique int if_stmt: @stmt_if ref,
+    int then_id: @stmt ref
+);
+
+if_else(
+    unique int if_stmt: @stmt_if ref,
+    int else_id: @stmt ref
+);
+
+constexpr_if_initialization(
+    unique int constexpr_if_stmt: @stmt_constexpr_if ref,
+    int init_id: @stmt ref
+);
+
+constexpr_if_then(
+    unique int constexpr_if_stmt: @stmt_constexpr_if ref,
+    int then_id: @stmt ref
+);
+
+constexpr_if_else(
+    unique int constexpr_if_stmt: @stmt_constexpr_if ref,
+    int else_id: @stmt ref
+);
+
+@stmt_consteval_or_not_consteval_if = @stmt_consteval_if | @stmt_not_consteval_if;
+
+consteval_if_then(
+    unique int constexpr_if_stmt: @stmt_consteval_or_not_consteval_if ref,
+    int then_id: @stmt ref
+);
+
+consteval_if_else(
+    unique int constexpr_if_stmt: @stmt_consteval_or_not_consteval_if ref,
+    int else_id: @stmt ref
+);
+
+while_body(
+    unique int while_stmt: @stmt_while ref,
+    int body_id: @stmt ref
+);
+
+do_body(
+    unique int do_stmt: @stmt_end_test_while ref,
+    int body_id: @stmt ref
+);
+
+switch_initialization(
+    unique int switch_stmt: @stmt_switch ref,
+    int init_id: @stmt ref
+);
+
+#keyset[switch_stmt, index]
+switch_case(
+    int switch_stmt: @stmt_switch ref,
+    int index: int ref,
+    int case_id: @stmt_switch_case ref
+);
+
+switch_body(
+    unique int switch_stmt: @stmt_switch ref,
+    int body_id: @stmt ref
+);
+
+@stmt_for_or_range_based_for = @stmt_for
+                             | @stmt_range_based_for;
+
+for_initialization(
+    unique int for_stmt: @stmt_for_or_range_based_for ref,
+    int init_id: @stmt ref
+);
+
+for_condition(
+    unique int for_stmt: @stmt_for ref,
+    int condition_id: @expr ref
+);
+
+for_update(
+    unique int for_stmt: @stmt_for ref,
+    int update_id: @expr ref
+);
+
+for_body(
+    unique int for_stmt: @stmt_for ref,
+    int body_id: @stmt ref
+);
+
+@stmtparent = @stmt | @expr_stmt ;
+stmtparents(
+    unique int id: @stmt ref,
+    int index: int ref,
+    int parent: @stmtparent ref
+);
+
+ishandler(unique int block: @stmt_block ref);
+
+@cfgnode = @stmt | @expr | @function | @initialiser ;
+
+stmt_decl_bind(
+    int stmt: @stmt_decl ref,
+    int num: int ref,
+    int decl: @declaration ref
+);
+
+stmt_decl_entry_bind(
+    int stmt: @stmt_decl ref,
+    int num: int ref,
+    int decl_entry: @element ref
+);
+
+@parameterized_element = @function | @stmt_block | @requires_expr;
+
+blockscope(
+    unique int block: @stmt_block ref,
+    int enclosing: @parameterized_element ref
+);
+
+@jump = @stmt_goto | @stmt_break | @stmt_continue;
+
+@jumporlabel = @jump | @stmt_label | @literal;
+
+jumpinfo(
+    unique int id: @jumporlabel ref,
+    string str: string ref,
+    int target: @stmt ref
+);
+
+preprocdirects(
+    unique int id: @preprocdirect,
+    int kind: int ref,
+    int location: @location_default ref
+);
+case @preprocdirect.kind of
+   0 = @ppd_if
+|  1 = @ppd_ifdef
+|  2 = @ppd_ifndef
+|  3 = @ppd_elif
+|  4 = @ppd_else
+|  5 = @ppd_endif
+|  6 = @ppd_plain_include
+|  7 = @ppd_define
+|  8 = @ppd_undef
+|  9 = @ppd_line
+| 10 = @ppd_error
+| 11 = @ppd_pragma
+| 12 = @ppd_objc_import
+| 13 = @ppd_include_next
+| 14 = @ppd_ms_import
+| 15 = @ppd_elifdef
+| 16 = @ppd_elifndef
+| 18 = @ppd_warning
+;
+
+@ppd_include = @ppd_plain_include | @ppd_objc_import | @ppd_include_next | @ppd_ms_import;
+
+@ppd_branch = @ppd_if | @ppd_ifdef | @ppd_ifndef | @ppd_elif | @ppd_elifdef | @ppd_elifndef;
+
+preprocpair(
+    int begin : @ppd_branch ref,
+    int elseelifend : @preprocdirect ref
+);
+
+preproctrue(int branch : @ppd_branch ref);
+preprocfalse(int branch : @ppd_branch ref);
+
+preproctext(
+    unique int id: @preprocdirect ref,
+    string head: string ref,
+    string body: string ref
+);
+
+includes(
+    unique int id: @ppd_include ref,
+    int included: @file ref
+);
+
+link_targets(
+    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/af887e83a815a9cefe774ffa80e2493a1365b9e2/upgrade.properties b/cpp/ql/lib/upgrades/af887e83a815a9cefe774ffa80e2493a1365b9e2/upgrade.properties
new file mode 100644
index 00000000000..9dc80bb35fc
--- /dev/null
+++ b/cpp/ql/lib/upgrades/af887e83a815a9cefe774ffa80e2493a1365b9e2/upgrade.properties
@@ -0,0 +1,3 @@
+description: capture whether a lambda has an explicitly specified parameter list.
+compatibility: backwards
+lambdas.rel: run lambdas.qlo
diff --git a/cpp/ql/test/library-tests/ir/ir/PrintAST.expected b/cpp/ql/test/library-tests/ir/ir/PrintAST.expected
index 0b825a0a855..b9ffaf71656 100644
--- a/cpp/ql/test/library-tests/ir/ir/PrintAST.expected
+++ b/cpp/ql/test/library-tests/ir/ir/PrintAST.expected
@@ -58,6 +58,77 @@
 #-----|         Type = [LongType] unsigned long
 #-----|     getParameter(1): [Parameter] (unnamed parameter 1)
 #-----|         Type = [ScopedEnum] align_val_t
+arm.cpp:
+#    6| [TopLevelFunction] uint8x8_t vadd_u8(uint8x8_t, uint8x8_t)
+#    6|   <params>: 
+#    6|     getParameter(0): [Parameter] a
+#    6|         Type = [CTypedefType] uint8x8_t
+#    6|     getParameter(1): [Parameter] b
+#    6|         Type = [CTypedefType] uint8x8_t
+#    6|   getEntryPoint(): [BlockStmt] { ... }
+#    7|     getStmt(0): [ReturnStmt] return ...
+#    7|       getExpr(): [AddExpr] ... + ...
+#    7|           Type = [GNUVectorType] __attribute((neon_vector_type(8))) unsigned char
+#    7|           ValueCategory = prvalue
+#    7|         getLeftOperand(): [VariableAccess] a
+#    7|             Type = [CTypedefType] uint8x8_t
+#    7|             ValueCategory = prvalue(load)
+#    7|         getRightOperand(): [VariableAccess] b
+#    7|             Type = [CTypedefType] uint8x8_t
+#    7|             ValueCategory = prvalue(load)
+#   12| [TopLevelFunction] uint16x8_t __builtin_aarch64_uaddlv8qi_uuu(uint8x8_t, uint8x8_t)
+#   12|   <params>: 
+#   12|     getParameter(0): [Parameter] (unnamed parameter 0)
+#   12|         Type = [CTypedefType] uint8x8_t
+#   12|     getParameter(1): [Parameter] (unnamed parameter 1)
+#   12|         Type = [CTypedefType] uint8x8_t
+#   14| [TopLevelFunction] uint16x8_t vaddl_u8(uint8x8_t, uint8x8_t)
+#   14|   <params>: 
+#   14|     getParameter(0): [Parameter] a
+#   14|         Type = [CTypedefType] uint8x8_t
+#   14|     getParameter(1): [Parameter] b
+#   14|         Type = [CTypedefType] uint8x8_t
+#   14|   getEntryPoint(): [BlockStmt] { ... }
+#   15|     getStmt(0): [ReturnStmt] return ...
+#   15|       getExpr(): [FunctionCall] call to __builtin_aarch64_uaddlv8qi_uuu
+#   15|           Type = [CTypedefType] uint16x8_t
+#   15|           ValueCategory = prvalue
+#   15|         getArgument(0): [VariableAccess] a
+#   15|             Type = [CTypedefType] uint8x8_t
+#   15|             ValueCategory = prvalue(load)
+#   15|         getArgument(1): [VariableAccess] b
+#   15|             Type = [CTypedefType] uint8x8_t
+#   15|             ValueCategory = prvalue(load)
+#   18| [TopLevelFunction] uint16x8_t arm_add(uint8x8_t, uint8x8_t)
+#   18|   <params>: 
+#   18|     getParameter(0): [Parameter] a
+#   18|         Type = [CTypedefType] uint8x8_t
+#   18|     getParameter(1): [Parameter] b
+#   18|         Type = [CTypedefType] uint8x8_t
+#   18|   getEntryPoint(): [BlockStmt] { ... }
+#   19|     getStmt(0): [DeclStmt] declaration
+#   19|       getDeclarationEntry(0): [VariableDeclarationEntry] definition of c
+#   19|           Type = [CTypedefType] uint8x8_t
+#   19|         getVariable().getInitializer(): [Initializer] initializer for c
+#   19|           getExpr(): [FunctionCall] call to vadd_u8
+#   19|               Type = [CTypedefType] uint8x8_t
+#   19|               ValueCategory = prvalue
+#   19|             getArgument(0): [VariableAccess] a
+#   19|                 Type = [CTypedefType] uint8x8_t
+#   19|                 ValueCategory = prvalue(load)
+#   19|             getArgument(1): [VariableAccess] b
+#   19|                 Type = [CTypedefType] uint8x8_t
+#   19|                 ValueCategory = prvalue(load)
+#   20|     getStmt(1): [ReturnStmt] return ...
+#   20|       getExpr(): [FunctionCall] call to vaddl_u8
+#   20|           Type = [CTypedefType] uint16x8_t
+#   20|           ValueCategory = prvalue
+#   20|         getArgument(0): [VariableAccess] a
+#   20|             Type = [CTypedefType] uint8x8_t
+#   20|             ValueCategory = prvalue(load)
+#   20|         getArgument(1): [VariableAccess] c
+#   20|             Type = [CTypedefType] uint8x8_t
+#   20|             ValueCategory = prvalue(load)
 bad_asts.cpp:
 #    5| [CopyAssignmentOperator] Bad::S& Bad::S::operator=(Bad::S const&)
 #    5|   <params>: 
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 20d593e2379..fbd0db5e796 100644
--- a/cpp/ql/test/library-tests/ir/ir/aliased_ir.expected
+++ b/cpp/ql/test/library-tests/ir/ir/aliased_ir.expected
@@ -1,3 +1,86 @@
+arm.cpp:
+#    6| uint8x8_t vadd_u8(uint8x8_t, uint8x8_t)
+#    6|   Block 0
+#    6|     v6_1(void)                                                    = EnterFunction            : 
+#    6|     m6_2(unknown)                                                 = AliasedDefinition        : 
+#    6|     m6_3(unknown)                                                 = InitializeNonLocal       : 
+#    6|     m6_4(unknown)                                                 = Chi                      : total:m6_2, partial:m6_3
+#    6|     r6_5(glval<__attribute((neon_vector_type(8))) unsigned char>) = VariableAddress[a]       : 
+#    6|     m6_6(__attribute((neon_vector_type(8))) unsigned char)        = InitializeParameter[a]   : &:r6_5
+#    6|     r6_7(glval<__attribute((neon_vector_type(8))) unsigned char>) = VariableAddress[b]       : 
+#    6|     m6_8(__attribute((neon_vector_type(8))) unsigned char)        = InitializeParameter[b]   : &:r6_7
+#    7|     r7_1(glval<__attribute((neon_vector_type(8))) unsigned char>) = VariableAddress[#return] : 
+#    7|     r7_2(glval<__attribute((neon_vector_type(8))) unsigned char>) = VariableAddress[a]       : 
+#    7|     r7_3(__attribute((neon_vector_type(8))) unsigned char)        = Load[a]                  : &:r7_2, m6_6
+#    7|     r7_4(glval<__attribute((neon_vector_type(8))) unsigned char>) = VariableAddress[b]       : 
+#    7|     r7_5(__attribute((neon_vector_type(8))) unsigned char)        = Load[b]                  : &:r7_4, m6_8
+#    7|     r7_6(__attribute((neon_vector_type(8))) unsigned char)        = Add                      : r7_3, r7_5
+#    7|     m7_7(__attribute((neon_vector_type(8))) unsigned char)        = Store[#return]           : &:r7_1, r7_6
+#    6|     r6_9(glval<__attribute((neon_vector_type(8))) unsigned char>) = VariableAddress[#return] : 
+#    6|     v6_10(void)                                                   = ReturnValue              : &:r6_9, m7_7
+#    6|     v6_11(void)                                                   = AliasedUse               : m6_3
+#    6|     v6_12(void)                                                   = ExitFunction             : 
+
+#   14| uint16x8_t vaddl_u8(uint8x8_t, uint8x8_t)
+#   14|   Block 0
+#   14|     v14_1(void)                                                     = EnterFunction                                    : 
+#   14|     m14_2(unknown)                                                  = AliasedDefinition                                : 
+#   14|     m14_3(unknown)                                                  = InitializeNonLocal                               : 
+#   14|     m14_4(unknown)                                                  = Chi                                              : total:m14_2, partial:m14_3
+#   14|     r14_5(glval<__attribute((neon_vector_type(8))) unsigned char>)  = VariableAddress[a]                               : 
+#   14|     m14_6(__attribute((neon_vector_type(8))) unsigned char)         = InitializeParameter[a]                           : &:r14_5
+#   14|     r14_7(glval<__attribute((neon_vector_type(8))) unsigned char>)  = VariableAddress[b]                               : 
+#   14|     m14_8(__attribute((neon_vector_type(8))) unsigned char)         = InitializeParameter[b]                           : &:r14_7
+#   15|     r15_1(glval<__attribute((neon_vector_type(8))) unsigned short>) = VariableAddress[#return]                         : 
+#   15|     r15_2(glval<unknown>)                                           = FunctionAddress[__builtin_aarch64_uaddlv8qi_uuu] : 
+#   15|     r15_3(glval<__attribute((neon_vector_type(8))) unsigned char>)  = VariableAddress[a]                               : 
+#   15|     r15_4(__attribute((neon_vector_type(8))) unsigned char)         = Load[a]                                          : &:r15_3, m14_6
+#   15|     r15_5(glval<__attribute((neon_vector_type(8))) unsigned char>)  = VariableAddress[b]                               : 
+#   15|     r15_6(__attribute((neon_vector_type(8))) unsigned char)         = Load[b]                                          : &:r15_5, m14_8
+#   15|     r15_7(__attribute((neon_vector_type(8))) unsigned short)        = Call[__builtin_aarch64_uaddlv8qi_uuu]            : func:r15_2, 0:r15_4, 1:r15_6
+#   15|     m15_8(unknown)                                                  = ^CallSideEffect                                  : ~m14_4
+#   15|     m15_9(unknown)                                                  = Chi                                              : total:m14_4, partial:m15_8
+#   15|     m15_10(__attribute((neon_vector_type(8))) unsigned short)       = Store[#return]                                   : &:r15_1, r15_7
+#   14|     r14_9(glval<__attribute((neon_vector_type(8))) unsigned short>) = VariableAddress[#return]                         : 
+#   14|     v14_10(void)                                                    = ReturnValue                                      : &:r14_9, m15_10
+#   14|     v14_11(void)                                                    = AliasedUse                                       : ~m15_9
+#   14|     v14_12(void)                                                    = ExitFunction                                     : 
+
+#   18| uint16x8_t arm_add(uint8x8_t, uint8x8_t)
+#   18|   Block 0
+#   18|     v18_1(void)                                                     = EnterFunction             : 
+#   18|     m18_2(unknown)                                                  = AliasedDefinition         : 
+#   18|     m18_3(unknown)                                                  = InitializeNonLocal        : 
+#   18|     m18_4(unknown)                                                  = Chi                       : total:m18_2, partial:m18_3
+#   18|     r18_5(glval<__attribute((neon_vector_type(8))) unsigned char>)  = VariableAddress[a]        : 
+#   18|     m18_6(__attribute((neon_vector_type(8))) unsigned char)         = InitializeParameter[a]    : &:r18_5
+#   18|     r18_7(glval<__attribute((neon_vector_type(8))) unsigned char>)  = VariableAddress[b]        : 
+#   18|     m18_8(__attribute((neon_vector_type(8))) unsigned char)         = InitializeParameter[b]    : &:r18_7
+#   19|     r19_1(glval<__attribute((neon_vector_type(8))) unsigned char>)  = VariableAddress[c]        : 
+#   19|     r19_2(glval<unknown>)                                           = FunctionAddress[vadd_u8]  : 
+#   19|     r19_3(glval<__attribute((neon_vector_type(8))) unsigned char>)  = VariableAddress[a]        : 
+#   19|     r19_4(__attribute((neon_vector_type(8))) unsigned char)         = Load[a]                   : &:r19_3, m18_6
+#   19|     r19_5(glval<__attribute((neon_vector_type(8))) unsigned char>)  = VariableAddress[b]        : 
+#   19|     r19_6(__attribute((neon_vector_type(8))) unsigned char)         = Load[b]                   : &:r19_5, m18_8
+#   19|     r19_7(__attribute((neon_vector_type(8))) unsigned char)         = Call[vadd_u8]             : func:r19_2, 0:r19_4, 1:r19_6
+#   19|     m19_8(unknown)                                                  = ^CallSideEffect           : ~m18_4
+#   19|     m19_9(unknown)                                                  = Chi                       : total:m18_4, partial:m19_8
+#   19|     m19_10(__attribute((neon_vector_type(8))) unsigned char)        = Store[c]                  : &:r19_1, r19_7
+#   20|     r20_1(glval<__attribute((neon_vector_type(8))) unsigned short>) = VariableAddress[#return]  : 
+#   20|     r20_2(glval<unknown>)                                           = FunctionAddress[vaddl_u8] : 
+#   20|     r20_3(glval<__attribute((neon_vector_type(8))) unsigned char>)  = VariableAddress[a]        : 
+#   20|     r20_4(__attribute((neon_vector_type(8))) unsigned char)         = Load[a]                   : &:r20_3, m18_6
+#   20|     r20_5(glval<__attribute((neon_vector_type(8))) unsigned char>)  = VariableAddress[c]        : 
+#   20|     r20_6(__attribute((neon_vector_type(8))) unsigned char)         = Load[c]                   : &:r20_5, m19_10
+#   20|     r20_7(__attribute((neon_vector_type(8))) unsigned short)        = Call[vaddl_u8]            : func:r20_2, 0:r20_4, 1:r20_6
+#   20|     m20_8(unknown)                                                  = ^CallSideEffect           : ~m19_9
+#   20|     m20_9(unknown)                                                  = Chi                       : total:m19_9, partial:m20_8
+#   20|     m20_10(__attribute((neon_vector_type(8))) unsigned short)       = Store[#return]            : &:r20_1, r20_7
+#   18|     r18_9(glval<__attribute((neon_vector_type(8))) unsigned short>) = VariableAddress[#return]  : 
+#   18|     v18_10(void)                                                    = ReturnValue               : &:r18_9, m20_10
+#   18|     v18_11(void)                                                    = AliasedUse                : ~m20_9
+#   18|     v18_12(void)                                                    = ExitFunction              : 
+
 bad_asts.cpp:
 #    9| int Bad::S::MemberFunction<int 6>(int)
 #    9|   Block 0
diff --git a/cpp/ql/test/library-tests/ir/ir/arm.cpp b/cpp/ql/test/library-tests/ir/ir/arm.cpp
new file mode 100644
index 00000000000..36e20715bc5
--- /dev/null
+++ b/cpp/ql/test/library-tests/ir/ir/arm.cpp
@@ -0,0 +1,21 @@
+// semmle-extractor-options: --edg --target --edg linux_arm64
+
+typedef __Uint8x8_t uint8x8_t;
+typedef __Uint16x8_t uint16x8_t;
+
+uint8x8_t vadd_u8(uint8x8_t a, uint8x8_t b) {
+  return a + b;
+}
+
+// Workaround: the frontend only exposes this when the arm_neon.h
+// header is encountered.
+uint16x8_t __builtin_aarch64_uaddlv8qi_uuu(uint8x8_t, uint8x8_t);
+
+uint16x8_t vaddl_u8(uint8x8_t a, uint8x8_t b) {
+  return __builtin_aarch64_uaddlv8qi_uuu (a, b);
+}
+
+uint16x8_t arm_add(uint8x8_t a, uint8x8_t b) {
+  uint8x8_t c = vadd_u8(a, b);
+  return vaddl_u8(a, c);
+}
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 11d74a2a26b..978d05d4b16 100644
--- a/cpp/ql/test/library-tests/ir/ir/raw_ir.expected
+++ b/cpp/ql/test/library-tests/ir/ir/raw_ir.expected
@@ -1,3 +1,80 @@
+arm.cpp:
+#    6| uint8x8_t vadd_u8(uint8x8_t, uint8x8_t)
+#    6|   Block 0
+#    6|     v6_1(void)                                                    = EnterFunction            : 
+#    6|     mu6_2(unknown)                                                = AliasedDefinition        : 
+#    6|     mu6_3(unknown)                                                = InitializeNonLocal       : 
+#    6|     r6_4(glval<__attribute((neon_vector_type(8))) unsigned char>) = VariableAddress[a]       : 
+#    6|     mu6_5(__attribute((neon_vector_type(8))) unsigned char)       = InitializeParameter[a]   : &:r6_4
+#    6|     r6_6(glval<__attribute((neon_vector_type(8))) unsigned char>) = VariableAddress[b]       : 
+#    6|     mu6_7(__attribute((neon_vector_type(8))) unsigned char)       = InitializeParameter[b]   : &:r6_6
+#    7|     r7_1(glval<__attribute((neon_vector_type(8))) unsigned char>) = VariableAddress[#return] : 
+#    7|     r7_2(glval<__attribute((neon_vector_type(8))) unsigned char>) = VariableAddress[a]       : 
+#    7|     r7_3(__attribute((neon_vector_type(8))) unsigned char)        = Load[a]                  : &:r7_2, ~m?
+#    7|     r7_4(glval<__attribute((neon_vector_type(8))) unsigned char>) = VariableAddress[b]       : 
+#    7|     r7_5(__attribute((neon_vector_type(8))) unsigned char)        = Load[b]                  : &:r7_4, ~m?
+#    7|     r7_6(__attribute((neon_vector_type(8))) unsigned char)        = Add                      : r7_3, r7_5
+#    7|     mu7_7(__attribute((neon_vector_type(8))) unsigned char)       = Store[#return]           : &:r7_1, r7_6
+#    6|     r6_8(glval<__attribute((neon_vector_type(8))) unsigned char>) = VariableAddress[#return] : 
+#    6|     v6_9(void)                                                    = ReturnValue              : &:r6_8, ~m?
+#    6|     v6_10(void)                                                   = AliasedUse               : ~m?
+#    6|     v6_11(void)                                                   = ExitFunction             : 
+
+#   14| uint16x8_t vaddl_u8(uint8x8_t, uint8x8_t)
+#   14|   Block 0
+#   14|     v14_1(void)                                                     = EnterFunction                                    : 
+#   14|     mu14_2(unknown)                                                 = AliasedDefinition                                : 
+#   14|     mu14_3(unknown)                                                 = InitializeNonLocal                               : 
+#   14|     r14_4(glval<__attribute((neon_vector_type(8))) unsigned char>)  = VariableAddress[a]                               : 
+#   14|     mu14_5(__attribute((neon_vector_type(8))) unsigned char)        = InitializeParameter[a]                           : &:r14_4
+#   14|     r14_6(glval<__attribute((neon_vector_type(8))) unsigned char>)  = VariableAddress[b]                               : 
+#   14|     mu14_7(__attribute((neon_vector_type(8))) unsigned char)        = InitializeParameter[b]                           : &:r14_6
+#   15|     r15_1(glval<__attribute((neon_vector_type(8))) unsigned short>) = VariableAddress[#return]                         : 
+#   15|     r15_2(glval<unknown>)                                           = FunctionAddress[__builtin_aarch64_uaddlv8qi_uuu] : 
+#   15|     r15_3(glval<__attribute((neon_vector_type(8))) unsigned char>)  = VariableAddress[a]                               : 
+#   15|     r15_4(__attribute((neon_vector_type(8))) unsigned char)         = Load[a]                                          : &:r15_3, ~m?
+#   15|     r15_5(glval<__attribute((neon_vector_type(8))) unsigned char>)  = VariableAddress[b]                               : 
+#   15|     r15_6(__attribute((neon_vector_type(8))) unsigned char)         = Load[b]                                          : &:r15_5, ~m?
+#   15|     r15_7(__attribute((neon_vector_type(8))) unsigned short)        = Call[__builtin_aarch64_uaddlv8qi_uuu]            : func:r15_2, 0:r15_4, 1:r15_6
+#   15|     mu15_8(unknown)                                                 = ^CallSideEffect                                  : ~m?
+#   15|     mu15_9(__attribute((neon_vector_type(8))) unsigned short)       = Store[#return]                                   : &:r15_1, r15_7
+#   14|     r14_8(glval<__attribute((neon_vector_type(8))) unsigned short>) = VariableAddress[#return]                         : 
+#   14|     v14_9(void)                                                     = ReturnValue                                      : &:r14_8, ~m?
+#   14|     v14_10(void)                                                    = AliasedUse                                       : ~m?
+#   14|     v14_11(void)                                                    = ExitFunction                                     : 
+
+#   18| uint16x8_t arm_add(uint8x8_t, uint8x8_t)
+#   18|   Block 0
+#   18|     v18_1(void)                                                     = EnterFunction             : 
+#   18|     mu18_2(unknown)                                                 = AliasedDefinition         : 
+#   18|     mu18_3(unknown)                                                 = InitializeNonLocal        : 
+#   18|     r18_4(glval<__attribute((neon_vector_type(8))) unsigned char>)  = VariableAddress[a]        : 
+#   18|     mu18_5(__attribute((neon_vector_type(8))) unsigned char)        = InitializeParameter[a]    : &:r18_4
+#   18|     r18_6(glval<__attribute((neon_vector_type(8))) unsigned char>)  = VariableAddress[b]        : 
+#   18|     mu18_7(__attribute((neon_vector_type(8))) unsigned char)        = InitializeParameter[b]    : &:r18_6
+#   19|     r19_1(glval<__attribute((neon_vector_type(8))) unsigned char>)  = VariableAddress[c]        : 
+#   19|     r19_2(glval<unknown>)                                           = FunctionAddress[vadd_u8]  : 
+#   19|     r19_3(glval<__attribute((neon_vector_type(8))) unsigned char>)  = VariableAddress[a]        : 
+#   19|     r19_4(__attribute((neon_vector_type(8))) unsigned char)         = Load[a]                   : &:r19_3, ~m?
+#   19|     r19_5(glval<__attribute((neon_vector_type(8))) unsigned char>)  = VariableAddress[b]        : 
+#   19|     r19_6(__attribute((neon_vector_type(8))) unsigned char)         = Load[b]                   : &:r19_5, ~m?
+#   19|     r19_7(__attribute((neon_vector_type(8))) unsigned char)         = Call[vadd_u8]             : func:r19_2, 0:r19_4, 1:r19_6
+#   19|     mu19_8(unknown)                                                 = ^CallSideEffect           : ~m?
+#   19|     mu19_9(__attribute((neon_vector_type(8))) unsigned char)        = Store[c]                  : &:r19_1, r19_7
+#   20|     r20_1(glval<__attribute((neon_vector_type(8))) unsigned short>) = VariableAddress[#return]  : 
+#   20|     r20_2(glval<unknown>)                                           = FunctionAddress[vaddl_u8] : 
+#   20|     r20_3(glval<__attribute((neon_vector_type(8))) unsigned char>)  = VariableAddress[a]        : 
+#   20|     r20_4(__attribute((neon_vector_type(8))) unsigned char)         = Load[a]                   : &:r20_3, ~m?
+#   20|     r20_5(glval<__attribute((neon_vector_type(8))) unsigned char>)  = VariableAddress[c]        : 
+#   20|     r20_6(__attribute((neon_vector_type(8))) unsigned char)         = Load[c]                   : &:r20_5, ~m?
+#   20|     r20_7(__attribute((neon_vector_type(8))) unsigned short)        = Call[vaddl_u8]            : func:r20_2, 0:r20_4, 1:r20_6
+#   20|     mu20_8(unknown)                                                 = ^CallSideEffect           : ~m?
+#   20|     mu20_9(__attribute((neon_vector_type(8))) unsigned short)       = Store[#return]            : &:r20_1, r20_7
+#   18|     r18_8(glval<__attribute((neon_vector_type(8))) unsigned short>) = VariableAddress[#return]  : 
+#   18|     v18_9(void)                                                     = ReturnValue               : &:r18_8, ~m?
+#   18|     v18_10(void)                                                    = AliasedUse                : ~m?
+#   18|     v18_11(void)                                                    = ExitFunction              : 
+
 bad_asts.cpp:
 #    9| int Bad::S::MemberFunction<int 6>(int)
 #    9|   Block 0
diff --git a/cpp/ql/test/library-tests/lambdas/syntax/empty_declarator.expected b/cpp/ql/test/library-tests/lambdas/syntax/empty_declarator.expected
new file mode 100644
index 00000000000..1beb3eed3b3
--- /dev/null
+++ b/cpp/ql/test/library-tests/lambdas/syntax/empty_declarator.expected
@@ -0,0 +1,11 @@
+| parameters.cpp:2:5:2:23 | [...](...){...} | with list | 2 |
+| parameters.cpp:4:5:4:22 | [...](...){...} | with list | 1 |
+| parameters.cpp:6:5:6:17 | [...](...){...} | with list | 1 |
+| parameters.cpp:8:5:8:20 | [...](...){...} | with list | 0 |
+| parameters.cpp:10:5:10:26 | [...](...){...} | with list | 0 |
+| parameters.cpp:11:5:11:24 | [...](...){...} | without list | 0 |
+| parameters.cpp:13:5:13:20 | [...](...){...} | with list | 0 |
+| parameters.cpp:16:5:18:5 | [...](...){...} | with list | 0 |
+| parameters.cpp:20:5:22:5 | [...](...){...} | without list | 0 |
+| parameters.cpp:24:5:24:10 | [...](...){...} | without list | 0 |
+| parameters.cpp:25:5:25:14 | [...](...){...} | with list | 0 |
diff --git a/cpp/ql/test/library-tests/lambdas/syntax/empty_declarator.ql b/cpp/ql/test/library-tests/lambdas/syntax/empty_declarator.ql
new file mode 100644
index 00000000000..ae2043687a0
--- /dev/null
+++ b/cpp/ql/test/library-tests/lambdas/syntax/empty_declarator.ql
@@ -0,0 +1,5 @@
+import cpp
+
+from LambdaExpression e, string parameterList
+where if e.hasParameterList() then parameterList = "with list" else parameterList = "without list"
+select e, parameterList, e.getLambdaFunction().getNumberOfParameters()
diff --git a/cpp/ql/test/library-tests/lambdas/syntax/parameters.cpp b/cpp/ql/test/library-tests/lambdas/syntax/parameters.cpp
new file mode 100644
index 00000000000..6d9bca191b1
--- /dev/null
+++ b/cpp/ql/test/library-tests/lambdas/syntax/parameters.cpp
@@ -0,0 +1,26 @@
+void test_lambda_declarator() {
+    [=](int, float) { };
+
+    [](int x = 42) { };
+
+    [](int x) { };
+
+    []() mutable { };
+
+    []() [[nodiscard]] { };
+    [] [[nodiscard]] { };
+
+    []() -> void { };
+
+    int i;
+    [&i]() {
+        i += 1;
+    };
+
+    [&i] {
+        i += 1;
+    };
+
+    [] { };
+    [=] () { };
+}
\ No newline at end of file
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 3539e52eecf..a86ab5e7bbd 100644
--- a/cpp/ql/test/library-tests/templates/type_instantiations/types.expected
+++ b/cpp/ql/test/library-tests/templates/type_instantiations/types.expected
@@ -25,6 +25,7 @@
 | file://:0:0:0:0 | __float128 |
 | file://:0:0:0:0 | __fp16 |
 | file://:0:0:0:0 | __int128 |
+| file://:0:0:0:0 | __mfp8 |
 | file://:0:0:0:0 | __va_list_tag |
 | file://:0:0:0:0 | __va_list_tag & |
 | file://:0:0:0:0 | __va_list_tag && |
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 b7bc9e04fe3..08e8b26f525 100644
--- a/cpp/ql/test/library-tests/type_sizes/type_sizes.expected
+++ b/cpp/ql/test/library-tests/type_sizes/type_sizes.expected
@@ -46,6 +46,7 @@
 | 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 | __mfp8 | 1 |
 | file://:0:0:0:0 | __va_list_tag | 24 |
 | file://:0:0:0:0 | __va_list_tag & | 8 |
 | file://:0:0:0:0 | __va_list_tag && | 8 |
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 00ae3fa5d8f..2e5091754b9 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
@@ -27,6 +27,7 @@
 | 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 | __mfp8 | __mfp8 |
 | file://:0:0:0:0 | __va_list_tag & | __va_list_tag & |
 | file://:0:0:0:0 | __va_list_tag && | __va_list_tag && |
 | file://:0:0:0:0 | auto | auto |
diff --git a/cpp/ql/test/library-tests/variables/variables/types.expected b/cpp/ql/test/library-tests/variables/variables/types.expected
index 6ecf14875ca..1d091ac2571 100644
--- a/cpp/ql/test/library-tests/variables/variables/types.expected
+++ b/cpp/ql/test/library-tests/variables/variables/types.expected
@@ -26,6 +26,7 @@
 | __float128 | Float128Type |  |  |  |  |
 | __fp16 | BinaryFloatingPointType, RealNumberType |  |  |  |  |
 | __int128 | Int128Type |  |  |  |  |
+| __mfp8 | BinaryFloatingPointType, RealNumberType |  |  |  |  |
 | __va_list_tag | DirectAccessHolder, MetricClass, Struct, StructLikeClass |  |  |  |  |
 | __va_list_tag & | LValueReferenceType, PointerOrArrayOrReferenceType, PointerOrArrayOrReferenceTypeIndirection |  | __va_list_tag |  |  |
 | __va_list_tag && | PointerOrArrayOrReferenceType, PointerOrArrayOrReferenceTypeIndirection, RValueReferenceType |  | __va_list_tag |  |  |
diff --git a/csharp/ql/integration-tests/posix/query-suite/csharp-code-quality.qls.expected b/csharp/ql/integration-tests/posix/query-suite/csharp-code-quality.qls.expected
index 14934899e0d..89e7cff7f29 100644
--- a/csharp/ql/integration-tests/posix/query-suite/csharp-code-quality.qls.expected
+++ b/csharp/ql/integration-tests/posix/query-suite/csharp-code-quality.qls.expected
@@ -2,6 +2,8 @@ ql/csharp/ql/src/API Abuse/CallToGCCollect.ql
 ql/csharp/ql/src/API Abuse/FormatInvalid.ql
 ql/csharp/ql/src/API Abuse/NoDisposeCallOnLocalIDisposable.ql
 ql/csharp/ql/src/Bad Practices/Control-Flow/ConstantCondition.ql
+ql/csharp/ql/src/CSI/NullAlways.ql
+ql/csharp/ql/src/CSI/NullMaybe.ql
 ql/csharp/ql/src/Dead Code/DeadStoreOfLocal.ql
 ql/csharp/ql/src/Language Abuse/MissedReadonlyOpportunity.ql
 ql/csharp/ql/src/Likely Bugs/Collections/ContainerLengthCmpOffByOne.ql
@@ -11,6 +13,7 @@ ql/csharp/ql/src/Likely Bugs/EqualityCheckOnFloats.ql
 ql/csharp/ql/src/Likely Bugs/ReferenceEqualsOnValueTypes.ql
 ql/csharp/ql/src/Likely Bugs/SelfAssignment.ql
 ql/csharp/ql/src/Likely Bugs/UncheckedCastInEquals.ql
+ql/csharp/ql/src/Performance/StringConcatenationInLoop.ql
 ql/csharp/ql/src/Performance/UseTryGetValue.ql
 ql/csharp/ql/src/Useless code/DefaultToString.ql
 ql/csharp/ql/src/Useless code/IntGetHashCode.ql
diff --git a/csharp/ql/lib/semmle/code/csharp/dataflow/Nullness.qll b/csharp/ql/lib/semmle/code/csharp/dataflow/Nullness.qll
index a990455f430..7e8ed0aadc0 100644
--- a/csharp/ql/lib/semmle/code/csharp/dataflow/Nullness.qll
+++ b/csharp/ql/lib/semmle/code/csharp/dataflow/Nullness.qll
@@ -544,8 +544,13 @@ class Dereference extends G::DereferenceableExpr {
         p.hasExtensionMethodModifier() and
         not emc.isConditional()
       |
-        p.fromSource() // assume all non-source extension methods perform a dereference
-        implies
+        // Assume all non-source extension methods on
+        // (1) nullable types are null-safe
+        // (2) non-nullable types are doing a dereference.
+        p.fromLibrary() and
+        not p.getAnnotatedType().isNullableRefType()
+        or
+        p.fromSource() and
         exists(
           Ssa::ImplicitParameterDefinition def,
           AssignableDefinitions::ImplicitParameterDefinition pdef
diff --git a/csharp/ql/lib/semmle/code/csharp/frameworks/system/Diagnostics.qll b/csharp/ql/lib/semmle/code/csharp/frameworks/system/Diagnostics.qll
index 14d7497ec33..b5c036fa9f4 100644
--- a/csharp/ql/lib/semmle/code/csharp/frameworks/system/Diagnostics.qll
+++ b/csharp/ql/lib/semmle/code/csharp/frameworks/system/Diagnostics.qll
@@ -41,9 +41,7 @@ class SystemDiagnosticsDebugClass extends SystemDiagnosticsClass {
   /** Gets an `Assert(bool, ...)` method. */
   Method getAssertMethod() {
     result.getDeclaringType() = this and
-    result.hasName("Assert") and
-    result.getParameter(0).getType() instanceof BoolType and
-    result.getReturnType() instanceof VoidType
+    result.hasName("Assert")
   }
 }
 
diff --git a/csharp/ql/src/CSI/NullAlways.ql b/csharp/ql/src/CSI/NullAlways.ql
index e52abdc3cd5..1696f857fde 100644
--- a/csharp/ql/src/CSI/NullAlways.ql
+++ b/csharp/ql/src/CSI/NullAlways.ql
@@ -9,6 +9,7 @@
  *       correctness
  *       exceptions
  *       external/cwe/cwe-476
+ *       quality
  */
 
 import csharp
diff --git a/csharp/ql/src/CSI/NullMaybe.ql b/csharp/ql/src/CSI/NullMaybe.ql
index bb886f19929..c69df839958 100644
--- a/csharp/ql/src/CSI/NullMaybe.ql
+++ b/csharp/ql/src/CSI/NullMaybe.ql
@@ -10,6 +10,7 @@
  *       correctness
  *       exceptions
  *       external/cwe/cwe-476
+ *       quality
  */
 
 import csharp
diff --git a/csharp/ql/src/Performance/StringConcatenationInLoop.ql b/csharp/ql/src/Performance/StringConcatenationInLoop.ql
index aba7d3b7436..b1b420434e9 100644
--- a/csharp/ql/src/Performance/StringConcatenationInLoop.ql
+++ b/csharp/ql/src/Performance/StringConcatenationInLoop.ql
@@ -7,6 +7,7 @@
  * @id cs/string-concatenation-in-loop
  * @tags efficiency
  *       maintainability
+ *       quality
  */
 
 import csharp
diff --git a/csharp/ql/src/Security Features/CWE-134/UncontrolledFormatString.ql b/csharp/ql/src/Security Features/CWE-134/UncontrolledFormatString.ql
index b99839226c5..3fc132eb301 100644
--- a/csharp/ql/src/Security Features/CWE-134/UncontrolledFormatString.ql	
+++ b/csharp/ql/src/Security Features/CWE-134/UncontrolledFormatString.ql	
@@ -4,7 +4,7 @@
  *              and cause a denial of service.
  * @kind path-problem
  * @problem.severity error
- * @security-severity 9.3
+ * @security-severity 7.3
  * @precision high
  * @id cs/uncontrolled-format-string
  * @tags security
diff --git a/csharp/ql/src/change-notes/2025-06-03-dereferece-extension-method.md b/csharp/ql/src/change-notes/2025-06-03-dereferece-extension-method.md
new file mode 100644
index 00000000000..b12ec9768d5
--- /dev/null
+++ b/csharp/ql/src/change-notes/2025-06-03-dereferece-extension-method.md
@@ -0,0 +1,4 @@
+---
+category: minorAnalysis
+---
+* The queries `cs/dereferenced-value-is-always-null` and `cs/dereferenced-value-may-be-null` have been improved to reduce false positives. The queries no longer assume that expressions are dereferenced when passed as the receiver (`this` parameter) to extension methods where that parameter is a nullable type.
diff --git a/csharp/ql/src/change-notes/2025-06-06-reduce-CWE-134-for-memory-safe-languages.md b/csharp/ql/src/change-notes/2025-06-06-reduce-CWE-134-for-memory-safe-languages.md
new file mode 100644
index 00000000000..60006391ac6
--- /dev/null
+++ b/csharp/ql/src/change-notes/2025-06-06-reduce-CWE-134-for-memory-safe-languages.md
@@ -0,0 +1,4 @@
+---
+category: queryMetadata
+---
+* Adjusts the `@security-severity` from 9.3 to 7.3 for `cs/uncontrolled-format-string` to align `CWE-134` severity for memory safe languages to better reflect their impact.
diff --git a/csharp/ql/src/codeql-suites/csharp-security-and-quality.qls b/csharp/ql/src/codeql-suites/csharp-security-and-quality.qls
index 5bb3a54f6ee..b224499edce 100644
--- a/csharp/ql/src/codeql-suites/csharp-security-and-quality.qls
+++ b/csharp/ql/src/codeql-suites/csharp-security-and-quality.qls
@@ -1,4 +1,143 @@
 - description: Security-and-quality queries for C#
 - queries: .
-- apply: security-and-quality-selectors.yml
-  from: codeql/suite-helpers
+- include:
+    kind:
+    - problem
+    - path-problem
+    precision:
+    - high
+    - very-high
+    tags contain:
+    - security
+- include:
+    kind:
+    - problem
+    - path-problem
+    precision: medium
+    problem.severity:
+    - error
+    - warning
+    tags contain:
+    - security
+- include:
+    id:
+      - cs/asp/response-write
+      - cs/call-to-gc
+      - cs/call-to-object-tostring
+      - cs/call-to-obsolete-method
+      - cs/call-to-unmanaged-code
+      - cs/cast-from-abstract-to-concrete-collection
+      - cs/cast-of-this-to-type-parameter
+      - cs/catch-nullreferenceexception
+      - cs/catch-of-all-exceptions
+      - cs/chained-type-tests
+      - cs/class-implements-icloneable
+      - cs/class-missing-equals
+      - cs/class-name-comparison
+      - cs/class-name-matches-base-class
+      - cs/coalesce-of-identical-expressions
+      - cs/comparison-of-identical-expressions
+      - cs/complex-block
+      - cs/complex-condition
+      - cs/constant-comparison
+      - cs/constant-condition
+      - cs/coupled-types
+      - cs/dereferenced-value-is-always-null
+      - cs/dereferenced-value-may-be-null
+      - cs/dispose-not-called-on-throw
+      - cs/downcast-of-this
+      - cs/empty-block
+      - cs/empty-catch-block
+      - cs/empty-collection
+      - cs/empty-lock-statement
+      - cs/equality-on-floats
+      - cs/equals-on-arrays
+      - cs/equals-on-unrelated-types
+      - cs/equals-uses-as
+      - cs/equals-uses-is
+      - cs/expose-implementation
+      - cs/field-masks-base-field
+      - cs/gethashcode-is-not-defined
+      - cs/impossible-array-cast
+      - cs/inconsistent-compareto-and-equals
+      - cs/inconsistent-equals-and-gethashcode
+      - cs/inconsistent-lock-sequence
+      - cs/index-out-of-bounds
+      - cs/inefficient-containskey
+      - cs/invalid-dynamic-call
+      - cs/invalid-string-formatting
+      - cs/linq/inconsistent-enumeration
+      - cs/linq/missed-all
+      - cs/linq/missed-cast
+      - cs/linq/missed-oftype
+      - cs/linq/missed-select
+      - cs/linq/missed-where
+      - cs/linq/useless-select
+      - cs/local-not-disposed
+      - cs/local-shadows-member
+      - cs/lock-this
+      - cs/locked-wait
+      - cs/loss-of-precision
+      - cs/mishandling-japanese-era
+      - cs/misleading-indentation
+      - cs/missed-readonly-modifier
+      - cs/missed-ternary-operator
+      - cs/missed-using-statement
+      - cs/nested-if-statements
+      - cs/nested-loops-with-same-variable
+      - cs/non-short-circuit
+      - cs/null-argument-to-equals
+      - cs/path-combine
+      - cs/recursive-equals-call
+      - cs/recursive-operator-equals-call
+      - cs/reference-equality-on-valuetypes
+      - cs/reference-equality-with-object
+      - cs/rethrown-exception-variable
+      - cs/self-assignment
+      - cs/simplifiable-boolean-expression
+      - cs/static-field-written-by-instance
+      - cs/string-concatenation-in-loop
+      - cs/stringbuilder-creation-in-loop
+      - cs/stringbuilder-initialized-with-character
+      - cs/test-for-negative-container-size
+      - cs/too-many-ref-parameters
+      - cs/type-test-of-this
+      - cs/unchecked-cast-in-equals
+      - cs/unmanaged-code
+      - cs/unsafe-double-checked-lock
+      - cs/unsafe-sync-on-field
+      - cs/unsafe-year-construction
+      - cs/unsynchronized-getter
+      - cs/unsynchronized-static-access
+      - cs/unused-collection
+      - cs/unused-label
+      - cs/unused-property-value
+      - cs/useless-assignment-to-local
+      - cs/useless-cast-to-self
+      - cs/useless-gethashcode-call
+      - cs/useless-if-statement
+      - cs/useless-tostring-call
+      - cs/useless-type-test
+      - cs/useless-upcast
+      - cs/virtual-call-in-constructor
+      - cs/wrong-compareto-signature
+      - cs/wrong-equals-signature
+      - cs/xmldoc/missing-summary
+- include:
+    kind:
+    - diagnostic
+- include:
+    kind:
+    - metric
+    tags contain:
+    - summary
+- exclude:
+    deprecated: //
+- exclude:
+    query path:
+      - /^experimental\/.*/
+      - Metrics/Summaries/FrameworkCoverage.ql
+- exclude:
+    tags contain:
+      - modeleditor
+      - modelgenerator
diff --git a/csharp/ql/test/query-tests/Nullness/A.cs b/csharp/ql/test/query-tests/Nullness/A.cs
index 51bbc280e3c..12f5d74d5a2 100644
--- a/csharp/ql/test/query-tests/Nullness/A.cs
+++ b/csharp/ql/test/query-tests/Nullness/A.cs
@@ -5,7 +5,7 @@ class A
     public void Lock()
     {
         object synchronizedAlways = null;
-        lock (synchronizedAlways) // BAD (always)
+        lock (synchronizedAlways) // $ Alert[cs/dereferenced-value-is-always-null]
         {
             synchronizedAlways.GetHashCode(); // GOOD
         }
@@ -14,7 +14,7 @@ class A
     public void ArrayAssignTest()
     {
         int[] arrayNull = null;
-        arrayNull[0] = 10; // BAD (always)
+        arrayNull[0] = 10; // $ Alert[cs/dereferenced-value-is-always-null]
 
         int[] arrayOk;
         arrayOk = new int[10];
@@ -28,10 +28,10 @@ class A
         object methodAccess = null;
         object methodCall = null;
 
-        Console.WriteLine(arrayAccess[1]); // BAD (always)
-        Console.WriteLine(fieldAccess.Length); // BAD (always)
-        Func<String> tmp = methodAccess.ToString; // BAD (always)
-        Console.WriteLine(methodCall.ToString()); // BAD (always)
+        Console.WriteLine(arrayAccess[1]); // $ Alert[cs/dereferenced-value-is-always-null]
+        Console.WriteLine(fieldAccess.Length); // $ Alert[cs/dereferenced-value-is-always-null]
+        Func<String> tmp = methodAccess.ToString; // $ Alert[cs/dereferenced-value-is-always-null]
+        Console.WriteLine(methodCall.ToString()); // $ Alert[cs/dereferenced-value-is-always-null]
 
         Console.WriteLine(arrayAccess[1]); // GOOD
         Console.WriteLine(fieldAccess.Length); // GOOD
@@ -47,7 +47,7 @@ class A
 
         object varRef = null;
         TestMethod2(ref varRef);
-        varRef.ToString(); // BAD (always)
+        varRef.ToString(); // $ Alert[cs/dereferenced-value-is-always-null]
 
         varRef = null;
         TestMethod3(ref varRef);
diff --git a/csharp/ql/test/query-tests/Nullness/Assert.cs b/csharp/ql/test/query-tests/Nullness/Assert.cs
index 0236977aa39..86a99708a1f 100644
--- a/csharp/ql/test/query-tests/Nullness/Assert.cs
+++ b/csharp/ql/test/query-tests/Nullness/Assert.cs
@@ -12,7 +12,7 @@ class AssertTests
 
         s = b ? null : "";
         Assert.IsNull(s);
-        Console.WriteLine(s.Length); // BAD (always)
+        Console.WriteLine(s.Length); // $ Alert[cs/dereferenced-value-is-always-null]
 
         s = b ? null : "";
         Assert.IsNotNull(s);
@@ -20,7 +20,7 @@ class AssertTests
 
         s = b ? null : "";
         Assert.IsTrue(s == null);
-        Console.WriteLine(s.Length); // BAD (always)
+        Console.WriteLine(s.Length); // $ Alert[cs/dereferenced-value-is-always-null]
 
         s = b ? null : "";
         Assert.IsTrue(s != null);
@@ -28,7 +28,7 @@ class AssertTests
 
         s = b ? null : "";
         Assert.IsFalse(s != null);
-        Console.WriteLine(s.Length); // BAD (always)
+        Console.WriteLine(s.Length); // $ Alert[cs/dereferenced-value-is-always-null]
 
         s = b ? null : "";
         Assert.IsFalse(s == null);
@@ -44,10 +44,10 @@ class AssertTests
 
         s = b ? null : "";
         Assert.IsTrue(s == null && b);
-        Console.WriteLine(s.Length); // BAD (always)
+        Console.WriteLine(s.Length); // $ Alert[cs/dereferenced-value-is-always-null]
 
         s = b ? null : "";
         Assert.IsFalse(s != null || !b);
-        Console.WriteLine(s.Length); // BAD (always)
+        Console.WriteLine(s.Length); // $ Alert[cs/dereferenced-value-is-always-null]
     }
 }
diff --git a/csharp/ql/test/query-tests/Nullness/B.cs b/csharp/ql/test/query-tests/Nullness/B.cs
index 76ebb6ffd8e..946bacecefb 100644
--- a/csharp/ql/test/query-tests/Nullness/B.cs
+++ b/csharp/ql/test/query-tests/Nullness/B.cs
@@ -10,7 +10,7 @@ class B
         B neqCallAlways = null;
 
         if (eqCallAlways == null)
-            eqCallAlways.ToString(); // BAD (always)
+            eqCallAlways.ToString(); // $ Alert[cs/dereferenced-value-is-always-null]
 
         if (b2 != null)
             b2.ToString(); // GOOD
@@ -21,7 +21,7 @@ class B
 
         if (neqCallAlways != null) { }
         else
-            neqCallAlways.ToString(); // BAD (always)
+            neqCallAlways.ToString(); // $ Alert[cs/dereferenced-value-is-always-null]
     }
 
     public static bool operator ==(B b1, B b2)
diff --git a/csharp/ql/test/query-tests/Nullness/C.cs b/csharp/ql/test/query-tests/Nullness/C.cs
index 805d9e2cae4..405dceb74d5 100644
--- a/csharp/ql/test/query-tests/Nullness/C.cs
+++ b/csharp/ql/test/query-tests/Nullness/C.cs
@@ -15,7 +15,7 @@ public class C
 
         if (!(o != null))
         {
-            o.GetHashCode(); // BAD (always)
+            o.GetHashCode(); // $ Alert[cs/dereferenced-value-is-always-null]
         }
     }
 
@@ -39,7 +39,7 @@ public class C
     {
         var s = Maybe() ? null : "";
         Debug.Assert(s == null);
-        s.ToString(); // BAD (always)
+        s.ToString(); // $ Alert[cs/dereferenced-value-is-always-null]
 
         s = Maybe() ? null : "";
         Debug.Assert(s != null);
@@ -50,22 +50,22 @@ public class C
     {
         var o1 = new object();
         AssertNull(o1);
-        o1.ToString(); // BAD (always) (false negative)
+        o1.ToString(); // $ MISSING: Alert[cs/dereferenced-value-is-always-null]
 
         var o2 = Maybe() ? null : "";
         Assert.IsNull(o2);
-        o2.ToString(); // BAD (always)
+        o2.ToString(); // $ Alert[cs/dereferenced-value-is-always-null]
     }
 
     public void AssertNotNullTest()
     {
-        var o1 = Maybe() ? null : new object();
+        var o1 = Maybe() ? null : new object(); // $ Source[cs/dereferenced-value-may-be-null]
         AssertNonNull(o1);
-        o1.ToString(); // GOOD (false positive)
+        o1.ToString(); // $ SPURIOUS (false positive): Alert[cs/dereferenced-value-may-be-null]
 
-        var o2 = Maybe() ? null : new object();
+        var o2 = Maybe() ? null : new object(); // $ Source[cs/dereferenced-value-may-be-null]
         AssertNonNull(o1);
-        o2.ToString(); // BAD (maybe)
+        o2.ToString(); // $ Alert[cs/dereferenced-value-may-be-null]
 
         var o3 = Maybe() ? null : new object();
         Assert.IsNotNull(o3);
@@ -91,16 +91,16 @@ public class C
 
     public void Lock()
     {
-        var o = Maybe() ? null : new object();
-        lock (o) // BAD (maybe)
+        var o = Maybe() ? null : new object(); // $ Source[cs/dereferenced-value-may-be-null]
+        lock (o) // $ Alert[cs/dereferenced-value-may-be-null]
             o.ToString(); // GOOD
     }
 
     public void Foreach(IEnumerable<int> list)
     {
         if (Maybe())
-            list = null;
-        foreach (var x in list) // BAD (maybe)
+            list = null; // $ Source[cs/dereferenced-value-may-be-null]
+        foreach (var x in list) // $ Alert[cs/dereferenced-value-may-be-null]
         {
             x.ToString(); // GOOD
             list.ToString(); // GOOD
@@ -159,7 +159,7 @@ public class C
         s = null;
         do
         {
-            s.ToString(); // BAD (always)
+            s.ToString(); // $ Alert[cs/dereferenced-value-is-always-null]
             s = null;
         }
         while (s != null);
@@ -167,15 +167,15 @@ public class C
         s = null;
         do
         {
-            s.ToString(); // BAD (always)
+            s.ToString(); // $ Alert[cs/dereferenced-value-is-always-null]
         }
         while (s != null);
 
         s = "";
         do
         {
-            s.ToString(); // BAD (maybe)
-            s = null;
+            s.ToString(); // $ Alert[cs/dereferenced-value-may-be-null]
+            s = null; // $ Source[cs/dereferenced-value-may-be-null]
         }
         while (true);
     }
@@ -193,15 +193,15 @@ public class C
         s = null;
         while (b)
         {
-            s.ToString(); // BAD (always)
+            s.ToString(); // $ Alert[cs/dereferenced-value-is-always-null]
             s = null;
         }
 
         s = "";
         while (true)
         {
-            s.ToString(); // BAD (maybe)
-            s = null;
+            s.ToString(); // $ Alert[cs/dereferenced-value-may-be-null]
+            s = null; // $ Source[cs/dereferenced-value-may-be-null]
         }
     }
 
@@ -215,12 +215,12 @@ public class C
         }
 
         if (s == null)
-            s.ToString(); // BAD (always)
+            s.ToString(); // $ Alert[cs/dereferenced-value-is-always-null]
 
         s = "";
         if (s != null && s.Length % 2 == 0)
-            s = null;
-        s.ToString(); // BAD (maybe)
+            s = null; // $ Source[cs/dereferenced-value-may-be-null]
+        s.ToString(); // $ Alert[cs/dereferenced-value-may-be-null]
     }
 
     public void For()
@@ -230,23 +230,23 @@ public class C
         {
             s.ToString(); // GOOD
         }
-        s.ToString(); // BAD (always)
+        s.ToString(); // $ Alert[cs/dereferenced-value-is-always-null]
 
         for (s = null; s == null; s = null)
         {
-            s.ToString(); // BAD (always)
+            s.ToString(); // $ Alert[cs/dereferenced-value-is-always-null]
         }
 
-        for (s = ""; ; s = null)
+        for (s = ""; ; s = null) // $ Source[cs/dereferenced-value-may-be-null]
         {
-            s.ToString(); // BAD (maybe)
+            s.ToString(); // $ Alert[cs/dereferenced-value-may-be-null]
         }
     }
 
     public void ArrayAssignTest()
     {
         int[] a = null;
-        a[0] = 10; // BAD (always)
+        a[0] = 10; // $ Alert[cs/dereferenced-value-is-always-null]
 
         a = new int[10];
         a[0] = 42; // GOOD
@@ -257,8 +257,8 @@ public class C
         int[] ia = null;
         string[] sa = null;
 
-        ia[1] = 0; // BAD (always)
-        var temp = sa.Length; // BAD (always)
+        ia[1] = 0; // $ Alert[cs/dereferenced-value-is-always-null]
+        var temp = sa.Length; // $ Alert[cs/dereferenced-value-is-always-null]
 
         ia[1] = 0; // BAD (always), but not first
         temp = sa.Length; // BAD (always), but not first
diff --git a/csharp/ql/test/query-tests/Nullness/D.cs b/csharp/ql/test/query-tests/Nullness/D.cs
index 40419b7f577..ffc4fd193c7 100644
--- a/csharp/ql/test/query-tests/Nullness/D.cs
+++ b/csharp/ql/test/query-tests/Nullness/D.cs
@@ -14,22 +14,22 @@ public class D
     public void Caller()
     {
         Callee1(new object());
-        Callee1(null);
+        Callee1(null); // $ Source[cs/dereferenced-value-may-be-null]
         Callee2(new object());
     }
 
     public void Callee1(object param)
     {
-        param.ToString(); // BAD (maybe)
+        param.ToString(); // $ Alert[cs/dereferenced-value-may-be-null]
     }
 
-    public void Callee2(object param)
+    public void Callee2(object param) // $ Source[cs/dereferenced-value-may-be-null]
     {
         if (param != null)
         {
             param.ToString(); // GOOD
         }
-        param.ToString(); // BAD (maybe)
+        param.ToString(); // $ Alert[cs/dereferenced-value-may-be-null]
     }
 
     private static bool CustomIsNull(object x)
@@ -55,54 +55,54 @@ public class D
         if ((2 > 1 && o4 != null) != false)
             o4.ToString(); // GOOD
 
-        var o5 = (o4 != null) ? "" : null;
+        var o5 = (o4 != null) ? "" : null; // $ Source[cs/dereferenced-value-may-be-null]
         if (o5 != null)
             o4.ToString(); // GOOD
         if (o4 != null)
-            o5.ToString(); // GOOD (false positive)
+            o5.ToString(); // $ SPURIOUS (false positive): Alert[cs/dereferenced-value-may-be-null]
 
         var o6 = maybe ? null : "";
         if (!CustomIsNull(o6))
             o6.ToString(); // GOOD
 
-        var o7 = maybe ? null : "";
+        var o7 = maybe ? null : ""; // $ Source[cs/dereferenced-value-may-be-null]
         var ok = o7 != null && 2 > 1;
         if (ok)
             o7.ToString(); // GOOD
         else
-            o7.ToString(); // BAD (maybe)
+            o7.ToString(); // $ Alert[cs/dereferenced-value-may-be-null]
 
-        var o8 = maybe ? null : "";
+        var o8 = maybe ? null : ""; // $ Source[cs/dereferenced-value-may-be-null]
         int track = o8 == null ? 42 : 1 + 1;
         if (track == 2)
             o8.ToString(); // GOOD
         if (track != 42)
             o8.ToString(); // GOOD
         if (track < 42)
-            o8.ToString(); // GOOD (false positive)
+            o8.ToString(); // $ SPURIOUS (false positive): Alert[cs/dereferenced-value-may-be-null]
         if (track <= 41)
-            o8.ToString(); // GOOD (false positive)
+            o8.ToString(); // $ SPURIOUS (false positive): Alert[cs/dereferenced-value-may-be-null]
     }
 
     public void Deref(int i)
     {
-        int[] xs = maybe ? null : new int[2];
+        int[] xs = maybe ? null : new int[2]; // $ Source[cs/dereferenced-value-may-be-null]
         if (i > 1)
-            xs[0] = 5; // BAD (maybe)
+            xs[0] = 5; // $ Alert[cs/dereferenced-value-may-be-null]
 
         if (i > 2)
-            maybe = xs[1] > 5; // BAD (maybe)
+            maybe = xs[1] > 5; // $ Alert[cs/dereferenced-value-may-be-null]
 
         if (i > 3)
         {
-            var l = xs.Length; // BAD (maybe)
+            var l = xs.Length; // $ Alert[cs/dereferenced-value-may-be-null]
         }
 
         if (i > 4)
-            foreach (var _ in xs) ; // BAD (maybe)
+            foreach (var _ in xs) ; // $ Alert[cs/dereferenced-value-may-be-null]
 
         if (i > 5)
-            lock (xs) // BAD (maybe)
+            lock (xs) // $ Alert[cs/dereferenced-value-may-be-null]
                 xs.ToString(); // Not reported - same basic block
 
         if (i > 6)
@@ -117,12 +117,12 @@ public class D
         var x = b ? null : "abc";
         x = x == null ? "" : x;
         if (x == null)
-            x.ToString(); // BAD (always)
+            x.ToString(); // $ Alert[cs/dereferenced-value-is-always-null]
         else
             x.ToString(); // GOOD
     }
 
-    public void LengthGuard(int[] a, int[] b)
+    public void LengthGuard(int[] a, int[] b) // $ Source[cs/dereferenced-value-may-be-null]
     {
         int alen = a == null ? 0 : a.Length; // GOOD
         int blen = b == null ? 0 : b.Length; // GOOD
@@ -131,8 +131,8 @@ public class D
         {
             for (int i = 0; i < alen; i++)
             {
-                sum += a[i]; // GOOD (false positive)
-                sum += b[i]; // GOOD (false positive)
+                sum += a[i]; // $ SPURIOUS (false positive): Alert[cs/dereferenced-value-may-be-null]
+                sum += b[i]; // $ SPURIOUS (false positive): Alert[cs/dereferenced-value-may-be-null]
             }
         }
         int alen2;
@@ -142,13 +142,13 @@ public class D
             alen2 = 0;
         for (int i = 1; i <= alen2; ++i)
         {
-            sum += a[i - 1]; // GOOD (false positive)
+            sum += a[i - 1]; // $ SPURIOUS (false positive): Alert[cs/dereferenced-value-may-be-null]
         }
     }
 
-    public void MissedGuard(object obj)
+    public void MissedGuard(object obj) // $ Source[cs/dereferenced-value-may-be-null]
     {
-        obj.ToString(); // BAD (maybe)
+        obj.ToString(); // $ Alert[cs/dereferenced-value-may-be-null]
         var x = obj != null ? 1 : 0;
     }
 
@@ -160,7 +160,7 @@ public class D
 
     public void Exceptions()
     {
-        object obj = null;
+        object obj = null; // $ Source[cs/dereferenced-value-may-be-null]
         try
         {
             obj = MkMaybe();
@@ -168,7 +168,7 @@ public class D
         catch (Exception e)
         {
         }
-        obj.ToString(); // BAD (maybe)
+        obj.ToString(); // $ Alert[cs/dereferenced-value-may-be-null]
 
         object obj2 = null;
         try
@@ -194,7 +194,7 @@ public class D
     {
         var o = new Object();
         if (o == null)
-            o.ToString(); // BAD (always)
+            o.ToString(); // $ Alert[cs/dereferenced-value-is-always-null]
         o.ToString(); // GOOD
 
         try
@@ -204,7 +204,7 @@ public class D
         catch (Exception e)
         {
             if (e == null)
-                e.ToString(); // BAD (always)
+                e.ToString(); // $ Alert[cs/dereferenced-value-is-always-null]
             e.ToString(); // GOOD
         }
 
@@ -214,12 +214,12 @@ public class D
 
         var o3 = "abc";
         if (o3 == null)
-            o3.ToString(); // BAD (always)
+            o3.ToString(); // $ Alert[cs/dereferenced-value-is-always-null]
         o3.ToString(); // GOOD
 
         var o4 = "" + null;
         if (o4 == null)
-            o4.ToString(); // BAD (always)
+            o4.ToString(); // $ Alert[cs/dereferenced-value-is-always-null]
         o4.ToString(); // GOOD
     }
 
@@ -237,25 +237,25 @@ public class D
         if (flag)
             o.ToString(); // GOOD
 
-        o = null;
+        o = null; // $ Source[cs/dereferenced-value-may-be-null]
         var other = maybe ? null : "";
         if (other == null)
             o = "";
         if (other != null)
-            o.ToString(); // BAD (always) (reported as maybe)
+            o.ToString(); // $ Alert[cs/dereferenced-value-may-be-null] (always - but reported as maybe)
         else
-            o.ToString(); // GOOD (false positive)
+            o.ToString(); // $ SPURIOUS (false positive): Alert[cs/dereferenced-value-may-be-null]
 
-        var o2 = (num < 0) ? null : "";
+        var o2 = (num < 0) ? null : ""; // $ Source[cs/dereferenced-value-may-be-null]
         if (num < 0)
             o2 = "";
         else
-            o2.ToString(); // GOOD (false positive)
+            o2.ToString(); // $ SPURIOUS (false positive): Alert[cs/dereferenced-value-may-be-null]
     }
 
     public void TrackingVariable(int[] a)
     {
-        object o = null;
+        object o = null; // $ Source[cs/dereferenced-value-may-be-null]
         object other = null;
         if (maybe)
         {
@@ -264,9 +264,9 @@ public class D
         }
 
         if (other is string)
-            o.ToString(); // GOOD (false positive)
+            o.ToString(); // $ SPURIOUS (false positive): Alert[cs/dereferenced-value-may-be-null]
 
-        o = null;
+        o = null; // $ Source[cs/dereferenced-value-may-be-null]
         int count = 0;
         var found = false;
         for (var i = 0; i < a.Length; i++)
@@ -280,7 +280,7 @@ public class D
             }
             if (a[i] > 10000)
             {
-                o = null;
+                o = null; // $ Source[cs/dereferenced-value-may-be-null]
                 count = 0;
                 if (2 > i) { }
                 found = false;
@@ -288,20 +288,20 @@ public class D
         }
 
         if (count > 3)
-            o.ToString(); // GOOD (false positive)
+            o.ToString(); // $ SPURIOUS (false positive): Alert[cs/dereferenced-value-may-be-null]
 
         if (found)
-            o.ToString(); // GOOD (false positive)
+            o.ToString(); // $ SPURIOUS (false positive): Alert[cs/dereferenced-value-may-be-null]
 
-        object prev = null;
+        object prev = null; // $ Source[cs/dereferenced-value-may-be-null]
         for (var i = 0; i < a.Length; ++i)
         {
             if (i != 0)
-                prev.ToString(); // GOOD (false positive)
+                prev.ToString(); // $ SPURIOUS (false positive): Alert[cs/dereferenced-value-may-be-null]
             prev = a[i];
         }
 
-        string s = null;
+        string s = null; // $ Source[cs/dereferenced-value-may-be-null]
         {
             var s_null = true;
             foreach (var i in a)
@@ -310,10 +310,10 @@ public class D
                 s = "" + a;
             }
             if (!s_null)
-                s.ToString(); // GOOD (false positive)
+                s.ToString(); // $ SPURIOUS (false positive): Alert[cs/dereferenced-value-may-be-null]
         }
 
-        object r = null;
+        object r = null; // $ Source[cs/dereferenced-value-may-be-null]
         var stat = MyStatus.INIT;
         while (stat == MyStatus.INIT && stat != MyStatus.READY)
         {
@@ -321,7 +321,7 @@ public class D
             if (stat == MyStatus.INIT)
                 stat = MyStatus.READY;
         }
-        r.ToString(); // GOOD (false positive)
+        r.ToString(); // $ SPURIOUS (false positive): Alert[cs/dereferenced-value-may-be-null]
     }
 
     public enum MyStatus
@@ -348,28 +348,28 @@ public class D
 
     public void LoopCorr(int iters)
     {
-        int[] a = null;
+        int[] a = null; // $ Source[cs/dereferenced-value-may-be-null]
         if (iters > 0)
             a = new int[iters];
 
         for (var i = 0; i < iters; ++i)
-            a[i] = 0; // GOOD (false positive)
+            a[i] = 0; // $ SPURIOUS (false positive): Alert[cs/dereferenced-value-may-be-null]
 
         if (iters > 0)
         {
-            string last = null;
+            string last = null; // $ Source[cs/dereferenced-value-may-be-null]
             for (var i = 0; i < iters; i++)
                 last = "abc";
-            last.ToString(); // GOOD (false positive)
+            last.ToString(); // $ SPURIOUS (false positive): Alert[cs/dereferenced-value-may-be-null]
         }
 
-        int[] b = maybe ? null : new int[iters];
+        int[] b = maybe ? null : new int[iters]; // $ Source[cs/dereferenced-value-may-be-null]
         if (iters > 0 && (b == null || b.Length < iters))
             throw new Exception();
 
         for (var i = 0; i < iters; ++i)
         {
-            b[i] = 0; // GOOD (false positive)
+            b[i] = 0; // $ SPURIOUS (false positive): Alert[cs/dereferenced-value-may-be-null]
         }
     }
 
@@ -382,33 +382,33 @@ public class D
         if (ioe != null)
             ioe = e;
         else
-            ioe.ToString(); // BAD (always)
+            ioe.ToString(); // $ Alert[cs/dereferenced-value-is-always-null]
     }
 
-    public void LengthGuard2(int[] a, int[] b)
+    public void LengthGuard2(int[] a, int[] b) // $ Source[cs/dereferenced-value-may-be-null]
     {
         int alen = a == null ? 0 : a.Length; // GOOD
         int sum = 0;
         int i;
         for (i = 0; i < alen; i++)
         {
-            sum += a[i]; // GOOD (false positive)
+            sum += a[i]; // $ SPURIOUS (false positive): Alert[cs/dereferenced-value-may-be-null]
         }
         int blen = b == null ? 0 : b.Length; // GOOD
         for (i = 0; i < blen; i++)
         {
-            sum += b[i]; // GOOD (false positive)
+            sum += b[i]; // $ SPURIOUS (false positive): Alert[cs/dereferenced-value-may-be-null]
         }
         i = -3;
     }
 
-    public void CorrConds2(object x, object y)
+    public void CorrConds2(object x, object y) // $ Source[cs/dereferenced-value-may-be-null]
     {
         if ((x != null && y == null) || (x == null && y != null))
             return;
         if (x != null)
-            y.ToString(); // GOOD (false positive)
+            y.ToString(); // $ SPURIOUS (false positive): Alert[cs/dereferenced-value-may-be-null]
         if (y != null)
-            x.ToString(); // GOOD (false positive)
+            x.ToString(); // $ SPURIOUS (false positive): Alert[cs/dereferenced-value-may-be-null]
     }
 }
diff --git a/csharp/ql/test/query-tests/Nullness/E.cs b/csharp/ql/test/query-tests/Nullness/E.cs
index ec1fa161392..f8264523b68 100644
--- a/csharp/ql/test/query-tests/Nullness/E.cs
+++ b/csharp/ql/test/query-tests/Nullness/E.cs
@@ -6,12 +6,12 @@ public class E
 {
     public void Ex1(long[][][] a1, int ix, int len)
     {
-        long[][] a2 = null;
+        long[][] a2 = null; // $ Source[cs/dereferenced-value-may-be-null]
         var haveA2 = ix < len && (a2 = a1[ix]) != null;
-        long[] a3 = null;
-        var haveA3 = haveA2 && (a3 = a2[ix]) != null; // GOOD (FALSE POSITIVE)
+        long[] a3 = null; // $ Source[cs/dereferenced-value-may-be-null]
+        var haveA3 = haveA2 && (a3 = a2[ix]) != null; // $ SPURIOUS (false positive): Alert[cs/dereferenced-value-may-be-null]
         if (haveA3)
-            a3[0] = 0; // GOOD (FALSE POSITIVE)
+            a3[0] = 0; // $ SPURIOUS (false positive): Alert[cs/dereferenced-value-may-be-null]
     }
 
     public void Ex2(bool x, bool y)
@@ -20,11 +20,11 @@ public class E
         var s2 = (s1 == null) ? null : "";
         if (s2 == null)
         {
-            s1 = y ? null : "";
+            s1 = y ? null : ""; // $ Source[cs/dereferenced-value-may-be-null]
             s2 = (s1 == null) ? null : "";
         }
         if (s2 != null)
-            s1.ToString(); // GOOD (FALSE POSITIVE)
+            s1.ToString(); // $ SPURIOUS (false positive): Alert[cs/dereferenced-value-may-be-null]
     }
 
     public void Ex3(IEnumerable<string> ss)
@@ -48,7 +48,7 @@ public class E
     {
         int index = 0;
         var result = new List<List<string>>();
-        List<string> slice = null;
+        List<string> slice = null; // $ Source[cs/dereferenced-value-may-be-null]
         var iter = list.GetEnumerator();
         while (iter.MoveNext())
         {
@@ -58,19 +58,19 @@ public class E
                 slice = new List<string>();
                 result.Add(slice);
             }
-            slice.Add(str); // GOOD (FALSE POSITIVE)
+            slice.Add(str); // $ SPURIOUS (false positive): Alert[cs/dereferenced-value-may-be-null]
             ++index;
         }
     }
 
-    public void Ex5(bool hasArr, int[] arr)
+    public void Ex5(bool hasArr, int[] arr) // $ Source[cs/dereferenced-value-may-be-null]
     {
         int arrLen = 0;
         if (hasArr)
             arrLen = arr == null ? 0 : arr.Length;
 
         if (arrLen > 0)
-            arr[0] = 0; // GOOD (FALSE POSITIVE)
+            arr[0] = 0; // $ SPURIOUS (false positive): Alert[cs/dereferenced-value-may-be-null]
     }
 
     public const int MY_CONST_A = 1;
@@ -104,12 +104,12 @@ public class E
 
     public void Ex7(int[] arr1)
     {
-        int[] arr2 = null;
+        int[] arr2 = null; // $ Source[cs/dereferenced-value-may-be-null]
         if (arr1.Length > 0)
             arr2 = new int[arr1.Length];
 
         for (var i = 0; i < arr1.Length; i++)
-            arr2[i] = arr1[i]; // GOOD (FALSE POSITIVE)
+            arr2[i] = arr1[i]; // $ SPURIOUS (false positive): Alert[cs/dereferenced-value-may-be-null]
     }
 
     public void Ex8(int x, int lim)
@@ -122,7 +122,7 @@ public class E
             int j = 0;
             while (!stop && j < lim)
             {
-                int step = (j * obj.GetHashCode()) % 10; // GOOD (FALSE POSITIVE)
+                int step = (j * obj.GetHashCode()) % 10; // $ SPURIOUS (false positive): Alert[cs/dereferenced-value-may-be-null]
                 if (step == 0)
                 {
                     obj.ToString(); // GOOD
@@ -134,7 +134,7 @@ public class E
                     }
                     else
                     {
-                        obj = null;
+                        obj = null; // $ Source[cs/dereferenced-value-may-be-null]
                     }
                     continue;
                 }
@@ -149,33 +149,33 @@ public class E
         {
             return;
         }
-        object obj2 = obj1;
+        object obj2 = obj1; // $ Source[cs/dereferenced-value-may-be-null]
         if (obj2 != null && obj2.GetHashCode() % 5 > 2)
         {
             obj2.ToString(); // GOOD
             cond = true;
         }
         if (cond)
-            obj2.ToString(); // GOOD (FALSE POSITIVE)
+            obj2.ToString(); // $ SPURIOUS (false positive): Alert[cs/dereferenced-value-may-be-null]
     }
 
-    public void Ex10(int[] a)
+    public void Ex10(int[] a) // $ Source[cs/dereferenced-value-may-be-null]
     {
         int n = a == null ? 0 : a.Length;
         for (var i = 0; i < n; i++)
         {
-            int x = a[i]; // GOOD (FALSE POSITIVE)
+            int x = a[i]; // $ SPURIOUS (false positive): Alert[cs/dereferenced-value-may-be-null]
             if (x > 7)
                 a = new int[n];
         }
     }
 
-    public void Ex11(object obj, bool b1)
+    public void Ex11(object obj, bool b1) // $ Source[cs/dereferenced-value-may-be-null]
     {
         bool b2 = obj == null ? false : b1;
         if (b2 == null)
         {
-            obj.ToString(); // GOOD (FALSE POSITIVE)
+            obj.ToString(); // $ SPURIOUS (false positive): Alert[cs/dereferenced-value-may-be-null]
         }
         if (obj == null)
         {
@@ -183,61 +183,61 @@ public class E
         }
         if (b1 == null)
         {
-            obj.ToString(); // GOOD (FALSE POSITIVE)
+            obj.ToString(); // $ SPURIOUS (false positive): Alert[cs/dereferenced-value-may-be-null]
         }
     }
 
-    public void Ex12(object o)
+    public void Ex12(object o) // $ Source[cs/dereferenced-value-may-be-null]
     {
-        var i = o.GetHashCode(); // BAD (maybe)
+        var i = o.GetHashCode(); // $ Alert[cs/dereferenced-value-may-be-null]
         var s = o?.ToString();
     }
 
     public void Ex13(bool b)
     {
-        var o = b ? null : "";
+        var o = b ? null : ""; // $ Source[cs/dereferenced-value-may-be-null]
         o.M1(); // GOOD
         if (b)
-            o.M2(); // BAD (maybe)
+            o.M2(); // $ Alert[cs/dereferenced-value-may-be-null]
         else
-            o.Select(x => x); // BAD (maybe)
+            o.Select(x => x); // $ Alert[cs/dereferenced-value-may-be-null]
     }
 
     public int Ex14(string s)
     {
         if (s is string)
             return s.Length;
-        return s.GetHashCode(); // BAD (always)
+        return s.GetHashCode(); // $ Alert[cs/dereferenced-value-is-always-null]
     }
 
     public void Ex15(bool b)
     {
         var x = "";
         if (b)
-            x = null;
-        x.ToString(); // BAD (maybe)
+            x = null; // $ Source[cs/dereferenced-value-may-be-null]
+        x.ToString(); // $ Alert[cs/dereferenced-value-may-be-null]
         if (b)
-            x.ToString(); // BAD (always)
+            x.ToString(); // $ Alert[cs/dereferenced-value-is-always-null]
     }
 
     public void Ex16(bool b)
     {
         var x = "";
         if (b)
-            x = null;
+            x = null; // $ Source[cs/dereferenced-value-may-be-null]
         if (b)
-            x.ToString(); // BAD (always)
-        x.ToString(); // BAD (maybe)
+            x.ToString(); // $ Alert[cs/dereferenced-value-is-always-null]
+        x.ToString(); // $ Alert[cs/dereferenced-value-may-be-null]
     }
 
-    public int Ex17(int? i)
+    public int Ex17(int? i) // $ Source[cs/dereferenced-value-may-be-null]
     {
-        return i.Value; // BAD (maybe)
+        return i.Value; // $ Alert[cs/dereferenced-value-may-be-null]
     }
 
-    public int Ex18(int? i)
+    public int Ex18(int? i) // $ Source[cs/dereferenced-value-may-be-null]
     {
-        return (int)i; // BAD (maybe)
+        return (int)i; // $ Alert[cs/dereferenced-value-may-be-null]
     }
 
     public int Ex19(int? i)
@@ -280,9 +280,9 @@ public class E
     {
         if (b)
             b.ToString();
-        var o = Make();
+        var o = Make(); // $ Source[cs/dereferenced-value-may-be-null]
         o?.ToString();
-        o.ToString(); // BAD (maybe)
+        o.ToString(); // $ Alert[cs/dereferenced-value-may-be-null]
         if (b)
             b.ToString();
     }
@@ -298,8 +298,8 @@ public class E
 
     public void Ex25(object o)
     {
-        var s = o as string;
-        s.ToString(); // BAD (maybe)
+        var s = o as string; // $ Source[cs/dereferenced-value-may-be-null]
+        s.ToString(); // $ Alert[cs/dereferenced-value-may-be-null]
     }
 
     private long? l;
@@ -320,15 +320,15 @@ public class E
     {
         if ((s1 ?? s2) is null)
         {
-            s1.ToString(); // BAD (always)
-            s2.ToString(); // BAD (always)
+            s1.ToString(); // $ Alert[cs/dereferenced-value-is-always-null]
+            s2.ToString(); // $ Alert[cs/dereferenced-value-is-always-null]
         }
     }
 
     static void Ex28()
     {
         var x = (string)null ?? null;
-        x.ToString(); // BAD (always)
+        x.ToString(); // $ Alert[cs/dereferenced-value-is-always-null]
     }
 
     static void Ex29(string s)
@@ -339,14 +339,14 @@ public class E
 
     static void Ex30(string s, object o)
     {
-        var x = s ?? o as string;
-        x.ToString(); // BAD (maybe)
+        var x = s ?? o as string; // $ Source[cs/dereferenced-value-may-be-null]
+        x.ToString(); // $ Alert[cs/dereferenced-value-may-be-null]
     }
 
     static void Ex31(string s, object o)
     {
-        dynamic x = s ?? o as string;
-        x.ToString(); // BAD (maybe)
+        dynamic x = s ?? o as string; // $ Source[cs/dereferenced-value-may-be-null]
+        x.ToString(); // $ Alert[cs/dereferenced-value-may-be-null]
     }
 
     static void Ex32(string s, object o)
@@ -363,7 +363,7 @@ public class E
             x.ToString(); // GOOD
     }
 
-    static int Ex34(string s = null) => s.Length; // BAD (maybe)
+    static int Ex34(string s = null) => s.Length; // $ Alert[cs/dereferenced-value-may-be-null]
 
     static int Ex35(string s = "null") => s.Length; // GOOD
 
@@ -371,19 +371,19 @@ public class E
     {
         if (o is string)
         {
-            var s = o as string;
-            return s.Length; // GOOD (FALSE POSITIVE)
+            var s = o as string; // $ Source[cs/dereferenced-value-may-be-null]
+            return s.Length; // $ SPURIOUS (false positive): Alert[cs/dereferenced-value-may-be-null]
         }
         return -1;
     }
 
-    static bool Ex37(E e1, E e2)
+    static bool Ex37(E e1, E e2) // $ Source[cs/dereferenced-value-may-be-null]
     {
         if ((e1 == null && e2 != null) || (e1 != null && e2 == null))
             return false;
         if (e1 == null && e2 == null)
             return true;
-        return e1.Long == e2.Long; // GOOD (FALSE POSITIVE)
+        return e1.Long == e2.Long; // $ SPURIOUS (false positive): Alert[cs/dereferenced-value-may-be-null]
     }
 
     int Ex38(int? i)
@@ -402,7 +402,7 @@ public class E
     {
         int? i = null;
         i ??= null;
-        return i.Value; // BAD (always)
+        return i.Value; // $ Alert[cs/dereferenced-value-is-always-null]
     }
 
     int Ex41()
@@ -414,20 +414,20 @@ public class E
 
     static bool Ex42(int? i, IEnumerable<int> @is)
     {
-        return @is.Any(j => j == i.Value); // BAD (maybe)
+        return @is.Any(j => j == i.Value); // $ Alert[cs/dereferenced-value-may-be-null]
     }
 
     static bool Ex43(int? i, IEnumerable<int> @is)
     {
         if (i.HasValue)
-            return @is.Any(j => j == i.Value); // GOOD (FALSE POSITIVE)
+            return @is.Any(j => j == i.Value); // $ SPURIOUS (false positive): Alert[cs/dereferenced-value-may-be-null]
         return false;
     }
 
     static bool Ex44(int? i, IEnumerable<int> @is)
     {
         if (i.HasValue)
-            @is = @is.Where(j => j == i.Value); // BAD (always)
+            @is = @is.Where(j => j == i.Value); // $ Alert[cs/dereferenced-value-may-be-null]
         i = null;
         return @is.Any();
     }
@@ -436,12 +436,12 @@ public class E
     {
         if (s is null)
         {
-            s.ToString(); // BAD (always)
+            s.ToString(); // $ Alert[cs/dereferenced-value-is-always-null]
         }
 
         if (s is not not null)
         {
-            s.ToString(); // BAD (always) (FALSE NEGATIVE)
+            s.ToString(); // $ MISSING: Alert[cs/dereferenced-value-is-always-null]
         }
 
         if (s is not null)
diff --git a/csharp/ql/test/query-tests/Nullness/F.cs b/csharp/ql/test/query-tests/Nullness/F.cs
new file mode 100644
index 00000000000..b5d6b66b949
--- /dev/null
+++ b/csharp/ql/test/query-tests/Nullness/F.cs
@@ -0,0 +1,16 @@
+using Library;
+
+public class F
+{
+    public void M1()
+    {
+        object o = null;
+        o.Accept(); // $ Alert[cs/dereferenced-value-is-always-null]
+    }
+
+    public void M2()
+    {
+        object? o = null;
+        o.AcceptNullable();
+    }
+}
diff --git a/csharp/ql/test/query-tests/Nullness/Forwarding.cs b/csharp/ql/test/query-tests/Nullness/Forwarding.cs
index fc7b69da490..122c5036567 100644
--- a/csharp/ql/test/query-tests/Nullness/Forwarding.cs
+++ b/csharp/ql/test/query-tests/Nullness/Forwarding.cs
@@ -33,11 +33,11 @@ class ForwardingTests
 
         if (IsNotNullWrong(s))
         {
-            Console.WriteLine(s.Length); // BAD (always)
+            Console.WriteLine(s.Length); // $ Alert[cs/dereferenced-value-is-always-null]
         }
 
         AssertIsNotNull(s);
-        Console.WriteLine(s.Length); // GOOD (false positive)
+        Console.WriteLine(s.Length); // $ SPURIOUS (false positive): Alert[cs/dereferenced-value-is-always-null]
     }
 
     bool IsNotNull(object o)
diff --git a/csharp/ql/test/query-tests/Nullness/GuardedString.cs b/csharp/ql/test/query-tests/Nullness/GuardedString.cs
index b5b74cf19ca..797955d95eb 100644
--- a/csharp/ql/test/query-tests/Nullness/GuardedString.cs
+++ b/csharp/ql/test/query-tests/Nullness/GuardedString.cs
@@ -4,7 +4,7 @@ class GuardedStringTest
 {
     void Fn(bool b)
     {
-        string s = b ? null : "";
+        string s = b ? null : ""; // $ Source[cs/dereferenced-value-may-be-null]
 
         if (!string.IsNullOrEmpty(s))
         {
@@ -32,7 +32,7 @@ class GuardedStringTest
             Console.WriteLine(s.Length); // GOOD
 
         if (s?.Length != 0)
-            Console.WriteLine(s.Length); // BAD (maybe)
+            Console.WriteLine(s.Length); // $ Alert[cs/dereferenced-value-may-be-null]
         else
             Console.WriteLine(s.Length); // GOOD
     }
diff --git a/csharp/ql/test/query-tests/Nullness/Implications.expected b/csharp/ql/test/query-tests/Nullness/Implications.expected
index dbb6ab23a9a..ec660dd44a4 100644
--- a/csharp/ql/test/query-tests/Nullness/Implications.expected
+++ b/csharp/ql/test/query-tests/Nullness/Implications.expected
@@ -1305,6 +1305,10 @@
 | E.cs:442:13:442:29 | ... is ... | true | E.cs:442:13:442:13 | access to parameter s | non-null |
 | E.cs:447:13:447:25 | ... is ... | true | E.cs:447:13:447:13 | access to parameter s | non-null |
 | E.cs:452:13:452:23 | ... is ... | true | E.cs:452:13:452:13 | access to parameter s | non-null |
+| F.cs:8:9:8:9 | access to local variable o | non-null | F.cs:7:20:7:23 | null | non-null |
+| F.cs:8:9:8:9 | access to local variable o | null | F.cs:7:20:7:23 | null | null |
+| F.cs:14:9:14:9 | access to local variable o | non-null | F.cs:13:21:13:24 | null | non-null |
+| F.cs:14:9:14:9 | access to local variable o | null | F.cs:13:21:13:24 | null | null |
 | Forwarding.cs:9:13:9:30 | !... | false | Forwarding.cs:9:14:9:30 | call to method IsNullOrEmpty | true |
 | Forwarding.cs:9:13:9:30 | !... | true | Forwarding.cs:9:14:9:30 | call to method IsNullOrEmpty | false |
 | Forwarding.cs:9:14:9:14 | access to local variable s | empty | Forwarding.cs:7:20:7:23 | null | empty |
diff --git a/csharp/ql/test/query-tests/Nullness/NullAlways.expected b/csharp/ql/test/query-tests/Nullness/NullAlways.expected
index ec8a78e817b..e2e594b2e2c 100644
--- a/csharp/ql/test/query-tests/Nullness/NullAlways.expected
+++ b/csharp/ql/test/query-tests/Nullness/NullAlways.expected
@@ -38,6 +38,7 @@
 | E.cs:331:9:331:9 | access to local variable x | Variable $@ is always null at this dereference. | E.cs:330:13:330:13 | x | x |
 | E.cs:405:16:405:16 | access to local variable i | Variable $@ is always null at this dereference. | E.cs:403:14:403:14 | i | i |
 | E.cs:439:13:439:13 | access to parameter s | Variable $@ is always null at this dereference. | E.cs:435:29:435:29 | s | s |
+| F.cs:8:9:8:9 | access to local variable o | Variable $@ is always null at this dereference. | F.cs:7:16:7:16 | o | o |
 | Forwarding.cs:36:31:36:31 | access to local variable s | Variable $@ is always null at this dereference. | Forwarding.cs:7:16:7:16 | s | s |
 | Forwarding.cs:40:27:40:27 | access to local variable s | Variable $@ is always null at this dereference. | Forwarding.cs:7:16:7:16 | s | s |
 | NullAlwaysBad.cs:9:30:9:30 | access to parameter s | Variable $@ is always null at this dereference. | NullAlwaysBad.cs:7:29:7:29 | s | s |
diff --git a/csharp/ql/test/query-tests/Nullness/NullAlways.qlref b/csharp/ql/test/query-tests/Nullness/NullAlways.qlref
index 16785ed3e7a..9f937e60952 100644
--- a/csharp/ql/test/query-tests/Nullness/NullAlways.qlref
+++ b/csharp/ql/test/query-tests/Nullness/NullAlways.qlref
@@ -1 +1,2 @@
-CSI/NullAlways.ql
+query: CSI/NullAlways.ql
+postprocess: utils/test/InlineExpectationsTestQuery.ql
diff --git a/csharp/ql/test/query-tests/Nullness/NullAlwaysBad.cs b/csharp/ql/test/query-tests/Nullness/NullAlwaysBad.cs
index 6f0d486f1c7..107a4f3381e 100644
--- a/csharp/ql/test/query-tests/Nullness/NullAlwaysBad.cs
+++ b/csharp/ql/test/query-tests/Nullness/NullAlwaysBad.cs
@@ -6,7 +6,7 @@ namespace NullAlways
     {
         void DoPrint(string s)
         {
-            if (s != null || s.Length > 0)
+            if (s != null || s.Length > 0) // $ Alert[cs/dereferenced-value-is-always-null]
                 Console.WriteLine(s);
         }
     }
diff --git a/csharp/ql/test/query-tests/Nullness/NullMaybe.expected b/csharp/ql/test/query-tests/Nullness/NullMaybe.expected
index 631c2cd7766..876cde548b6 100644
--- a/csharp/ql/test/query-tests/Nullness/NullMaybe.expected
+++ b/csharp/ql/test/query-tests/Nullness/NullMaybe.expected
@@ -1,3 +1,483 @@
+#select
+| C.cs:64:9:64:10 | access to local variable o1 | C.cs:62:13:62:46 | SSA def(o1) | C.cs:64:9:64:10 | access to local variable o1 | Variable $@ may be null at this access because of $@ assignment. | C.cs:62:13:62:14 | o1 | o1 | C.cs:62:13:62:46 | Object o1 = ... | this |
+| C.cs:68:9:68:10 | access to local variable o2 | C.cs:66:13:66:46 | SSA def(o2) | C.cs:68:9:68:10 | access to local variable o2 | Variable $@ may be null at this access because of $@ assignment. | C.cs:66:13:66:14 | o2 | o2 | C.cs:66:13:66:46 | Object o2 = ... | this |
+| C.cs:95:15:95:15 | access to local variable o | C.cs:94:13:94:45 | SSA def(o) | C.cs:95:15:95:15 | access to local variable o | Variable $@ may be null at this access because of $@ assignment. | C.cs:94:13:94:13 | o | o | C.cs:94:13:94:45 | Object o = ... | this |
+| C.cs:103:27:103:30 | access to parameter list | C.cs:102:13:102:23 | SSA def(list) | C.cs:103:27:103:30 | access to parameter list | Variable $@ may be null at this access because of $@ assignment. | C.cs:99:42:99:45 | list | list | C.cs:102:13:102:23 | ... = ... | this |
+| C.cs:177:13:177:13 | access to local variable s | C.cs:178:13:178:20 | SSA def(s) | C.cs:177:13:177:13 | access to local variable s | Variable $@ may be null at this access because of $@ assignment. | C.cs:151:13:151:13 | s | s | C.cs:178:13:178:20 | ... = ... | this |
+| C.cs:203:13:203:13 | access to local variable s | C.cs:204:13:204:20 | SSA def(s) | C.cs:203:13:203:13 | access to local variable s | Variable $@ may be null at this access because of $@ assignment. | C.cs:185:13:185:13 | s | s | C.cs:204:13:204:20 | ... = ... | this |
+| C.cs:223:9:223:9 | access to local variable s | C.cs:222:13:222:20 | SSA def(s) | C.cs:223:9:223:9 | access to local variable s | Variable $@ may be null at this access because of $@ assignment. | C.cs:210:13:210:13 | s | s | C.cs:222:13:222:20 | ... = ... | this |
+| C.cs:242:13:242:13 | access to local variable s | C.cs:240:24:240:31 | SSA def(s) | C.cs:242:13:242:13 | access to local variable s | Variable $@ may be null at this access because of $@ assignment. | C.cs:228:16:228:16 | s | s | C.cs:240:24:240:31 | ... = ... | this |
+| D.cs:23:9:23:13 | access to parameter param | D.cs:17:17:17:20 | null | D.cs:23:9:23:13 | access to parameter param | Variable $@ may be null at this access because of $@ null argument. | D.cs:21:32:21:36 | param | param | D.cs:17:17:17:20 | null | this |
+| D.cs:32:9:32:13 | access to parameter param | D.cs:26:32:26:36 | SSA param(param) | D.cs:32:9:32:13 | access to parameter param | Variable $@ may be null at this access as suggested by $@ null check. | D.cs:26:32:26:36 | param | param | D.cs:28:13:28:25 | ... != ... | this |
+| D.cs:62:13:62:14 | access to local variable o5 | D.cs:58:13:58:41 | SSA def(o5) | D.cs:62:13:62:14 | access to local variable o5 | Variable $@ may be null at this access because of $@ assignment. | D.cs:58:13:58:14 | o5 | o5 | D.cs:58:13:58:41 | String o5 = ... | this |
+| D.cs:73:13:73:14 | access to local variable o7 | D.cs:68:13:68:34 | SSA def(o7) | D.cs:73:13:73:14 | access to local variable o7 | Variable $@ may be null at this access because of $@ assignment. | D.cs:68:13:68:14 | o7 | o7 | D.cs:68:13:68:34 | String o7 = ... | this |
+| D.cs:82:13:82:14 | access to local variable o8 | D.cs:75:13:75:34 | SSA def(o8) | D.cs:82:13:82:14 | access to local variable o8 | Variable $@ may be null at this access because of $@ assignment. | D.cs:75:13:75:14 | o8 | o8 | D.cs:75:13:75:34 | String o8 = ... | this |
+| D.cs:84:13:84:14 | access to local variable o8 | D.cs:75:13:75:34 | SSA def(o8) | D.cs:84:13:84:14 | access to local variable o8 | Variable $@ may be null at this access because of $@ assignment. | D.cs:75:13:75:14 | o8 | o8 | D.cs:75:13:75:34 | String o8 = ... | this |
+| D.cs:91:13:91:14 | access to local variable xs | D.cs:89:15:89:44 | SSA def(xs) | D.cs:91:13:91:14 | access to local variable xs | Variable $@ may be null at this access because of $@ assignment. | D.cs:89:15:89:16 | xs | xs | D.cs:89:15:89:44 | Int32[] xs = ... | this |
+| D.cs:94:21:94:22 | access to local variable xs | D.cs:89:15:89:44 | SSA def(xs) | D.cs:94:21:94:22 | access to local variable xs | Variable $@ may be null at this access because of $@ assignment. | D.cs:89:15:89:16 | xs | xs | D.cs:89:15:89:44 | Int32[] xs = ... | this |
+| D.cs:98:21:98:22 | access to local variable xs | D.cs:89:15:89:44 | SSA def(xs) | D.cs:98:21:98:22 | access to local variable xs | Variable $@ may be null at this access because of $@ assignment. | D.cs:89:15:89:16 | xs | xs | D.cs:89:15:89:44 | Int32[] xs = ... | this |
+| D.cs:102:31:102:32 | access to local variable xs | D.cs:89:15:89:44 | SSA def(xs) | D.cs:102:31:102:32 | access to local variable xs | Variable $@ may be null at this access because of $@ assignment. | D.cs:89:15:89:16 | xs | xs | D.cs:89:15:89:44 | Int32[] xs = ... | this |
+| D.cs:105:19:105:20 | access to local variable xs | D.cs:89:15:89:44 | SSA def(xs) | D.cs:105:19:105:20 | access to local variable xs | Variable $@ may be null at this access because of $@ assignment. | D.cs:89:15:89:16 | xs | xs | D.cs:89:15:89:44 | Int32[] xs = ... | this |
+| D.cs:134:24:134:24 | access to parameter a | D.cs:125:35:125:35 | SSA param(a) | D.cs:134:24:134:24 | access to parameter a | Variable $@ may be null at this access as suggested by $@ null check. | D.cs:125:35:125:35 | a | a | D.cs:127:20:127:28 | ... == ... | this |
+| D.cs:134:24:134:24 | access to parameter a | D.cs:125:35:125:35 | SSA param(a) | D.cs:134:24:134:24 | access to parameter a | Variable $@ may be null at this access as suggested by $@ null check. | D.cs:125:35:125:35 | a | a | D.cs:139:13:139:21 | ... != ... | this |
+| D.cs:135:24:135:24 | access to parameter b | D.cs:125:44:125:44 | SSA param(b) | D.cs:135:24:135:24 | access to parameter b | Variable $@ may be null at this access as suggested by $@ null check. | D.cs:125:44:125:44 | b | b | D.cs:128:20:128:28 | ... == ... | this |
+| D.cs:145:20:145:20 | access to parameter a | D.cs:125:35:125:35 | SSA param(a) | D.cs:145:20:145:20 | access to parameter a | Variable $@ may be null at this access as suggested by $@ null check. | D.cs:125:35:125:35 | a | a | D.cs:127:20:127:28 | ... == ... | this |
+| D.cs:145:20:145:20 | access to parameter a | D.cs:125:35:125:35 | SSA param(a) | D.cs:145:20:145:20 | access to parameter a | Variable $@ may be null at this access as suggested by $@ null check. | D.cs:125:35:125:35 | a | a | D.cs:139:13:139:21 | ... != ... | this |
+| D.cs:151:9:151:11 | access to parameter obj | D.cs:149:36:149:38 | SSA param(obj) | D.cs:151:9:151:11 | access to parameter obj | Variable $@ may be null at this access as suggested by $@ null check. | D.cs:149:36:149:38 | obj | obj | D.cs:152:17:152:27 | ... != ... | this |
+| D.cs:171:9:171:11 | access to local variable obj | D.cs:163:16:163:25 | SSA def(obj) | D.cs:171:9:171:11 | access to local variable obj | Variable $@ may be null at this access because of $@ assignment. | D.cs:163:16:163:18 | obj | obj | D.cs:163:16:163:25 | Object obj = ... | this |
+| D.cs:245:13:245:13 | access to local variable o | D.cs:240:9:240:16 | SSA def(o) | D.cs:245:13:245:13 | access to local variable o | Variable $@ may be null at this access because of $@ assignment. | D.cs:228:16:228:16 | o | o | D.cs:240:9:240:16 | ... = ... | this |
+| D.cs:247:13:247:13 | access to local variable o | D.cs:240:9:240:16 | SSA def(o) | D.cs:247:13:247:13 | access to local variable o | Variable $@ may be null at this access because of $@ assignment. | D.cs:228:16:228:16 | o | o | D.cs:240:9:240:16 | ... = ... | this |
+| D.cs:253:13:253:14 | access to local variable o2 | D.cs:249:13:249:38 | SSA def(o2) | D.cs:253:13:253:14 | access to local variable o2 | Variable $@ may be null at this access because of $@ assignment. | D.cs:249:13:249:14 | o2 | o2 | D.cs:249:13:249:38 | String o2 = ... | this |
+| D.cs:267:13:267:13 | access to local variable o | D.cs:258:16:258:23 | SSA def(o) | D.cs:267:13:267:13 | access to local variable o | Variable $@ may be null at this access because of $@ assignment. | D.cs:258:16:258:16 | o | o | D.cs:258:16:258:23 | Object o = ... | this |
+| D.cs:291:13:291:13 | access to local variable o | D.cs:269:9:269:16 | SSA def(o) | D.cs:291:13:291:13 | access to local variable o | Variable $@ may be null at this access because of $@ assignment. | D.cs:258:16:258:16 | o | o | D.cs:269:9:269:16 | ... = ... | this |
+| D.cs:291:13:291:13 | access to local variable o | D.cs:283:17:283:24 | SSA def(o) | D.cs:291:13:291:13 | access to local variable o | Variable $@ may be null at this access because of $@ assignment. | D.cs:258:16:258:16 | o | o | D.cs:283:17:283:24 | ... = ... | this |
+| D.cs:294:13:294:13 | access to local variable o | D.cs:269:9:269:16 | SSA def(o) | D.cs:294:13:294:13 | access to local variable o | Variable $@ may be null at this access because of $@ assignment. | D.cs:258:16:258:16 | o | o | D.cs:269:9:269:16 | ... = ... | this |
+| D.cs:294:13:294:13 | access to local variable o | D.cs:283:17:283:24 | SSA def(o) | D.cs:294:13:294:13 | access to local variable o | Variable $@ may be null at this access because of $@ assignment. | D.cs:258:16:258:16 | o | o | D.cs:283:17:283:24 | ... = ... | this |
+| D.cs:300:17:300:20 | access to local variable prev | D.cs:296:16:296:26 | SSA def(prev) | D.cs:300:17:300:20 | access to local variable prev | Variable $@ may be null at this access because of $@ assignment. | D.cs:296:16:296:19 | prev | prev | D.cs:296:16:296:26 | Object prev = ... | this |
+| D.cs:313:17:313:17 | access to local variable s | D.cs:304:16:304:23 | SSA def(s) | D.cs:313:17:313:17 | access to local variable s | Variable $@ may be null at this access because of $@ assignment. | D.cs:304:16:304:16 | s | s | D.cs:304:16:304:23 | String s = ... | this |
+| D.cs:324:9:324:9 | access to local variable r | D.cs:316:16:316:23 | SSA def(r) | D.cs:324:9:324:9 | access to local variable r | Variable $@ may be null at this access because of $@ assignment. | D.cs:316:16:316:16 | r | r | D.cs:316:16:316:23 | Object r = ... | this |
+| D.cs:356:13:356:13 | access to local variable a | D.cs:351:15:351:22 | SSA def(a) | D.cs:356:13:356:13 | access to local variable a | Variable $@ may be null at this access because of $@ assignment. | D.cs:351:15:351:15 | a | a | D.cs:351:15:351:22 | Int32[] a = ... | this |
+| D.cs:363:13:363:16 | access to local variable last | D.cs:360:20:360:30 | SSA def(last) | D.cs:363:13:363:16 | access to local variable last | Variable $@ may be null at this access because of $@ assignment. | D.cs:360:20:360:23 | last | last | D.cs:360:20:360:30 | String last = ... | this |
+| D.cs:372:13:372:13 | access to local variable b | D.cs:366:15:366:47 | SSA def(b) | D.cs:372:13:372:13 | access to local variable b | Variable $@ may be null at this access because of $@ assignment. | D.cs:366:15:366:15 | b | b | D.cs:366:15:366:47 | Int32[] b = ... | this |
+| D.cs:395:20:395:20 | access to parameter a | D.cs:388:36:388:36 | SSA param(a) | D.cs:395:20:395:20 | access to parameter a | Variable $@ may be null at this access as suggested by $@ null check. | D.cs:388:36:388:36 | a | a | D.cs:390:20:390:28 | ... == ... | this |
+| D.cs:400:20:400:20 | access to parameter b | D.cs:388:45:388:45 | SSA param(b) | D.cs:400:20:400:20 | access to parameter b | Variable $@ may be null at this access as suggested by $@ null check. | D.cs:388:45:388:45 | b | b | D.cs:397:20:397:28 | ... == ... | this |
+| D.cs:410:13:410:13 | access to parameter y | D.cs:405:45:405:45 | SSA param(y) | D.cs:410:13:410:13 | access to parameter y | Variable $@ may be null at this access as suggested by $@ null check. | D.cs:405:45:405:45 | y | y | D.cs:407:27:407:35 | ... == ... | this |
+| D.cs:410:13:410:13 | access to parameter y | D.cs:405:45:405:45 | SSA param(y) | D.cs:410:13:410:13 | access to parameter y | Variable $@ may be null at this access as suggested by $@ null check. | D.cs:405:45:405:45 | y | y | D.cs:407:55:407:63 | ... != ... | this |
+| D.cs:410:13:410:13 | access to parameter y | D.cs:405:45:405:45 | SSA param(y) | D.cs:410:13:410:13 | access to parameter y | Variable $@ may be null at this access as suggested by $@ null check. | D.cs:405:45:405:45 | y | y | D.cs:411:13:411:21 | ... != ... | this |
+| D.cs:412:13:412:13 | access to parameter x | D.cs:405:35:405:35 | SSA param(x) | D.cs:412:13:412:13 | access to parameter x | Variable $@ may be null at this access as suggested by $@ null check. | D.cs:405:35:405:35 | x | x | D.cs:407:14:407:22 | ... != ... | this |
+| D.cs:412:13:412:13 | access to parameter x | D.cs:405:35:405:35 | SSA param(x) | D.cs:412:13:412:13 | access to parameter x | Variable $@ may be null at this access as suggested by $@ null check. | D.cs:405:35:405:35 | x | x | D.cs:407:42:407:50 | ... == ... | this |
+| D.cs:412:13:412:13 | access to parameter x | D.cs:405:35:405:35 | SSA param(x) | D.cs:412:13:412:13 | access to parameter x | Variable $@ may be null at this access as suggested by $@ null check. | D.cs:405:35:405:35 | x | x | D.cs:409:13:409:21 | ... != ... | this |
+| E.cs:12:38:12:39 | access to local variable a2 | E.cs:9:18:9:26 | SSA def(a2) | E.cs:12:38:12:39 | access to local variable a2 | Variable $@ may be null at this access because of $@ assignment. | E.cs:9:18:9:19 | a2 | a2 | E.cs:9:18:9:26 | Int64[][] a2 = ... | this |
+| E.cs:14:13:14:14 | access to local variable a3 | E.cs:11:16:11:24 | SSA def(a3) | E.cs:14:13:14:14 | access to local variable a3 | Variable $@ may be null at this access because of $@ assignment. | E.cs:11:16:11:17 | a3 | a3 | E.cs:11:16:11:24 | Int64[] a3 = ... | this |
+| E.cs:27:13:27:14 | access to local variable s1 | E.cs:23:13:23:30 | SSA def(s1) | E.cs:27:13:27:14 | access to local variable s1 | Variable $@ may be null at this access because of $@ assignment. | E.cs:19:13:19:14 | s1 | s1 | E.cs:23:13:23:30 | ... = ... | this |
+| E.cs:61:13:61:17 | access to local variable slice | E.cs:51:22:51:33 | SSA def(slice) | E.cs:61:13:61:17 | access to local variable slice | Variable $@ may be null at this access because of $@ assignment. | E.cs:51:22:51:26 | slice | slice | E.cs:51:22:51:33 | List<String> slice = ... | this |
+| E.cs:73:13:73:15 | access to parameter arr | E.cs:66:40:66:42 | SSA param(arr) | E.cs:73:13:73:15 | access to parameter arr | Variable $@ may be null at this access as suggested by $@ null check. | E.cs:66:40:66:42 | arr | arr | E.cs:70:22:70:32 | ... == ... | this |
+| E.cs:112:13:112:16 | access to local variable arr2 | E.cs:107:15:107:25 | SSA def(arr2) | E.cs:112:13:112:16 | access to local variable arr2 | Variable $@ may be null at this access because of $@ assignment. | E.cs:107:15:107:18 | arr2 | arr2 | E.cs:107:15:107:25 | Int32[] arr2 = ... | this |
+| E.cs:125:33:125:35 | access to local variable obj | E.cs:137:25:137:34 | SSA def(obj) | E.cs:125:33:125:35 | access to local variable obj | Variable $@ may be null at this access because of $@ assignment. | E.cs:119:13:119:15 | obj | obj | E.cs:137:25:137:34 | ... = ... | this |
+| E.cs:159:13:159:16 | access to local variable obj2 | E.cs:152:16:152:26 | SSA def(obj2) | E.cs:159:13:159:16 | access to local variable obj2 | Variable $@ may be null at this access as suggested by $@ null check. | E.cs:152:16:152:19 | obj2 | obj2 | E.cs:153:13:153:24 | ... != ... | this |
+| E.cs:167:21:167:21 | access to parameter a | E.cs:162:28:162:28 | SSA param(a) | E.cs:167:21:167:21 | access to parameter a | Variable $@ may be null at this access as suggested by $@ null check. | E.cs:162:28:162:28 | a | a | E.cs:164:17:164:25 | ... == ... | this |
+| E.cs:178:13:178:15 | access to parameter obj | E.cs:173:29:173:31 | SSA param(obj) | E.cs:178:13:178:15 | access to parameter obj | Variable $@ may be null at this access as suggested by $@ null check. | E.cs:173:29:173:31 | obj | obj | E.cs:175:19:175:29 | ... == ... | this |
+| E.cs:178:13:178:15 | access to parameter obj | E.cs:173:29:173:31 | SSA param(obj) | E.cs:178:13:178:15 | access to parameter obj | Variable $@ may be null at this access as suggested by $@ null check. | E.cs:173:29:173:31 | obj | obj | E.cs:180:13:180:23 | ... == ... | this |
+| E.cs:186:13:186:15 | access to parameter obj | E.cs:173:29:173:31 | SSA param(obj) | E.cs:186:13:186:15 | access to parameter obj | Variable $@ may be null at this access as suggested by $@ null check. | E.cs:173:29:173:31 | obj | obj | E.cs:175:19:175:29 | ... == ... | this |
+| E.cs:186:13:186:15 | access to parameter obj | E.cs:173:29:173:31 | SSA param(obj) | E.cs:186:13:186:15 | access to parameter obj | Variable $@ may be null at this access as suggested by $@ null check. | E.cs:173:29:173:31 | obj | obj | E.cs:180:13:180:23 | ... == ... | this |
+| E.cs:192:17:192:17 | access to parameter o | E.cs:190:29:190:29 | SSA param(o) | E.cs:192:17:192:17 | access to parameter o | Variable $@ may be null at this access as suggested by $@ null check. | E.cs:190:29:190:29 | o | o | E.cs:193:17:193:17 | access to parameter o | this |
+| E.cs:201:13:201:13 | access to local variable o | E.cs:198:13:198:29 | [b (line 196): true] SSA def(o) | E.cs:201:13:201:13 | access to local variable o | Variable $@ may be null at this access because of $@ assignment. | E.cs:198:13:198:13 | o | o | E.cs:198:13:198:29 | String o = ... | this |
+| E.cs:203:13:203:13 | access to local variable o | E.cs:198:13:198:29 | [b (line 196): false] SSA def(o) | E.cs:203:13:203:13 | access to local variable o | Variable $@ may be null at this access because of $@ assignment. | E.cs:198:13:198:13 | o | o | E.cs:198:13:198:29 | String o = ... | this |
+| E.cs:218:9:218:9 | access to local variable x | E.cs:217:13:217:20 | [b (line 213): true] SSA def(x) | E.cs:218:9:218:9 | access to local variable x | Variable $@ may be null at this access because of $@ assignment. | E.cs:215:13:215:13 | x | x | E.cs:217:13:217:20 | ... = ... | this |
+| E.cs:230:9:230:9 | access to local variable x | E.cs:227:13:227:20 | [b (line 223): true] SSA def(x) | E.cs:230:9:230:9 | access to local variable x | Variable $@ may be null at this access because of $@ assignment. | E.cs:225:13:225:13 | x | x | E.cs:227:13:227:20 | ... = ... | this |
+| E.cs:235:16:235:16 | access to parameter i | E.cs:233:26:233:26 | SSA param(i) | E.cs:235:16:235:16 | access to parameter i | Variable $@ may be null at this access because it has a nullable type. | E.cs:233:26:233:26 | i | i | E.cs:233:26:233:26 | i | this |
+| E.cs:240:21:240:21 | access to parameter i | E.cs:238:26:238:26 | SSA param(i) | E.cs:240:21:240:21 | access to parameter i | Variable $@ may be null at this access because it has a nullable type. | E.cs:238:26:238:26 | i | i | E.cs:238:26:238:26 | i | this |
+| E.cs:285:9:285:9 | access to local variable o | E.cs:283:13:283:22 | [b (line 279): false] SSA def(o) | E.cs:285:9:285:9 | access to local variable o | Variable $@ may be null at this access as suggested by $@ null check. | E.cs:283:13:283:13 | o | o | E.cs:284:9:284:9 | access to local variable o | this |
+| E.cs:285:9:285:9 | access to local variable o | E.cs:283:13:283:22 | [b (line 279): true] SSA def(o) | E.cs:285:9:285:9 | access to local variable o | Variable $@ may be null at this access as suggested by $@ null check. | E.cs:283:13:283:13 | o | o | E.cs:284:9:284:9 | access to local variable o | this |
+| E.cs:302:9:302:9 | access to local variable s | E.cs:301:13:301:27 | SSA def(s) | E.cs:302:9:302:9 | access to local variable s | Variable $@ may be null at this access because of $@ assignment. | E.cs:301:13:301:13 | s | s | E.cs:301:13:301:27 | String s = ... | this |
+| E.cs:343:9:343:9 | access to local variable x | E.cs:342:13:342:32 | SSA def(x) | E.cs:343:9:343:9 | access to local variable x | Variable $@ may be null at this access because of $@ assignment. | E.cs:342:13:342:13 | x | x | E.cs:342:13:342:32 | String x = ... | this |
+| E.cs:349:9:349:9 | access to local variable x | E.cs:348:17:348:36 | SSA def(x) | E.cs:349:9:349:9 | access to local variable x | Variable $@ may be null at this access because of $@ assignment. | E.cs:348:17:348:17 | x | x | E.cs:348:17:348:36 | dynamic x = ... | this |
+| E.cs:366:41:366:41 | access to parameter s | E.cs:366:28:366:28 | SSA param(s) | E.cs:366:41:366:41 | access to parameter s | Variable $@ may be null at this access because the parameter has a null default value. | E.cs:366:28:366:28 | s | s | E.cs:366:32:366:35 | null | this |
+| E.cs:375:20:375:20 | access to local variable s | E.cs:374:17:374:31 | SSA def(s) | E.cs:375:20:375:20 | access to local variable s | Variable $@ may be null at this access because of $@ assignment. | E.cs:374:17:374:17 | s | s | E.cs:374:17:374:31 | String s = ... | this |
+| E.cs:386:16:386:17 | access to parameter e1 | E.cs:380:24:380:25 | SSA param(e1) | E.cs:386:16:386:17 | access to parameter e1 | Variable $@ may be null at this access as suggested by $@ null check. | E.cs:380:24:380:25 | e1 | e1 | E.cs:382:14:382:23 | ... == ... | this |
+| E.cs:386:16:386:17 | access to parameter e1 | E.cs:380:24:380:25 | SSA param(e1) | E.cs:386:16:386:17 | access to parameter e1 | Variable $@ may be null at this access as suggested by $@ null check. | E.cs:380:24:380:25 | e1 | e1 | E.cs:382:44:382:53 | ... != ... | this |
+| E.cs:386:16:386:17 | access to parameter e1 | E.cs:380:24:380:25 | SSA param(e1) | E.cs:386:16:386:17 | access to parameter e1 | Variable $@ may be null at this access as suggested by $@ null check. | E.cs:380:24:380:25 | e1 | e1 | E.cs:384:13:384:22 | ... == ... | this |
+| E.cs:386:27:386:28 | access to parameter e2 | E.cs:380:30:380:31 | SSA param(e2) | E.cs:386:27:386:28 | access to parameter e2 | Variable $@ may be null at this access as suggested by $@ null check. | E.cs:380:30:380:31 | e2 | e2 | E.cs:382:28:382:37 | ... != ... | this |
+| E.cs:386:27:386:28 | access to parameter e2 | E.cs:380:30:380:31 | SSA param(e2) | E.cs:386:27:386:28 | access to parameter e2 | Variable $@ may be null at this access as suggested by $@ null check. | E.cs:380:30:380:31 | e2 | e2 | E.cs:382:58:382:67 | ... == ... | this |
+| E.cs:386:27:386:28 | access to parameter e2 | E.cs:380:30:380:31 | SSA param(e2) | E.cs:386:27:386:28 | access to parameter e2 | Variable $@ may be null at this access as suggested by $@ null check. | E.cs:380:30:380:31 | e2 | e2 | E.cs:384:27:384:36 | ... == ... | this |
+| E.cs:417:34:417:34 | access to parameter i | E.cs:417:24:417:40 | SSA capture def(i) | E.cs:417:34:417:34 | access to parameter i | Variable $@ may be null at this access because it has a nullable type. | E.cs:415:27:415:27 | i | i | E.cs:415:27:415:27 | i | this |
+| E.cs:423:38:423:38 | access to parameter i | E.cs:423:28:423:44 | SSA capture def(i) | E.cs:423:38:423:38 | access to parameter i | Variable $@ may be null at this access because it has a nullable type. | E.cs:420:27:420:27 | i | i | E.cs:420:27:420:27 | i | this |
+| E.cs:430:39:430:39 | access to parameter i | E.cs:430:29:430:45 | SSA capture def(i) | E.cs:430:39:430:39 | access to parameter i | Variable $@ may be null at this access because it has a nullable type. | E.cs:427:27:427:27 | i | i | E.cs:427:27:427:27 | i | this |
+| GuardedString.cs:35:31:35:31 | access to local variable s | GuardedString.cs:7:16:7:32 | SSA def(s) | GuardedString.cs:35:31:35:31 | access to local variable s | Variable $@ may be null at this access because of $@ assignment. | GuardedString.cs:7:16:7:16 | s | s | GuardedString.cs:7:16:7:32 | String s = ... | this |
+| NullMaybeBad.cs:7:27:7:27 | access to parameter o | NullMaybeBad.cs:13:17:13:20 | null | NullMaybeBad.cs:7:27:7:27 | access to parameter o | Variable $@ may be null at this access because of $@ null argument. | NullMaybeBad.cs:5:25:5:25 | o | o | NullMaybeBad.cs:13:17:13:20 | null | this |
+| Params.cs:14:17:14:20 | access to parameter args | Params.cs:20:12:20:15 | null | Params.cs:14:17:14:20 | access to parameter args | Variable $@ may be null at this access because of $@ null argument. | Params.cs:12:36:12:39 | args | args | Params.cs:20:12:20:15 | null | this |
+| StringConcatenation.cs:16:17:16:17 | access to local variable s | StringConcatenation.cs:14:16:14:23 | SSA def(s) | StringConcatenation.cs:16:17:16:17 | access to local variable s | Variable $@ may be null at this access because of $@ assignment. | StringConcatenation.cs:14:16:14:16 | s | s | StringConcatenation.cs:14:16:14:23 | String s = ... | this |
+edges
+| A.cs:7:16:7:40 | SSA def(synchronizedAlways) | A.cs:8:15:8:32 | access to local variable synchronizedAlways |
+| A.cs:7:16:7:40 | SSA def(synchronizedAlways) | A.cs:10:13:10:30 | access to local variable synchronizedAlways |
+| A.cs:16:15:16:30 | SSA def(arrayNull) | A.cs:17:9:17:17 | access to local variable arrayNull |
+| A.cs:26:15:26:32 | SSA def(arrayAccess) | A.cs:31:27:31:37 | access to local variable arrayAccess |
+| A.cs:26:15:26:32 | SSA def(arrayAccess) | A.cs:36:27:36:37 | access to local variable arrayAccess |
+| A.cs:27:18:27:35 | SSA def(fieldAccess) | A.cs:32:27:32:37 | access to local variable fieldAccess |
+| A.cs:27:18:27:35 | SSA def(fieldAccess) | A.cs:37:27:37:37 | access to local variable fieldAccess |
+| A.cs:28:16:28:34 | SSA def(methodAccess) | A.cs:33:28:33:39 | access to local variable methodAccess |
+| A.cs:28:16:28:34 | SSA def(methodAccess) | A.cs:38:15:38:26 | access to local variable methodAccess |
+| A.cs:29:16:29:32 | SSA def(methodCall) | A.cs:34:27:34:36 | access to local variable methodCall |
+| A.cs:29:16:29:32 | SSA def(methodCall) | A.cs:39:27:39:36 | access to local variable methodCall |
+| A.cs:48:16:48:28 | SSA def(varRef) | A.cs:50:9:50:14 | access to local variable varRef |
+| Assert.cs:13:9:13:25 | [b (line 7): false] SSA def(s) | Assert.cs:15:27:15:27 | access to local variable s |
+| Assert.cs:13:9:13:25 | [b (line 7): true] SSA def(s) | Assert.cs:15:27:15:27 | access to local variable s |
+| Assert.cs:21:9:21:25 | [b (line 7): false] SSA def(s) | Assert.cs:23:27:23:27 | access to local variable s |
+| Assert.cs:21:9:21:25 | [b (line 7): true] SSA def(s) | Assert.cs:23:27:23:27 | access to local variable s |
+| Assert.cs:29:9:29:25 | [b (line 7): false] SSA def(s) | Assert.cs:31:27:31:27 | access to local variable s |
+| Assert.cs:29:9:29:25 | [b (line 7): true] SSA def(s) | Assert.cs:31:27:31:27 | access to local variable s |
+| Assert.cs:45:9:45:25 | [b (line 7): true] SSA def(s) | Assert.cs:46:36:46:36 | [b (line 7): true] access to parameter b |
+| Assert.cs:46:23:46:36 | [true, b (line 7): true] ... && ... | Assert.cs:47:27:47:27 | access to local variable s |
+| Assert.cs:46:36:46:36 | [b (line 7): true] access to parameter b | Assert.cs:46:23:46:36 | [true, b (line 7): true] ... && ... |
+| Assert.cs:49:9:49:25 | [b (line 7): true] SSA def(s) | Assert.cs:50:38:50:38 | [b (line 7): true] access to parameter b |
+| Assert.cs:50:24:50:38 | [false] ... \|\| ... | Assert.cs:51:27:51:27 | access to local variable s |
+| Assert.cs:50:37:50:38 | [false] !... | Assert.cs:50:24:50:38 | [false] ... \|\| ... |
+| Assert.cs:50:38:50:38 | [b (line 7): true] access to parameter b | Assert.cs:50:37:50:38 | [false] !... |
+| B.cs:7:11:7:29 | SSA def(eqCallAlways) | B.cs:13:13:13:24 | access to local variable eqCallAlways |
+| B.cs:10:11:10:30 | SSA def(neqCallAlways) | B.cs:13:13:13:36 | ...; |
+| B.cs:10:11:10:30 | SSA def(neqCallAlways) | B.cs:15:9:16:26 | if (...) ... |
+| B.cs:13:13:13:36 | ...; | B.cs:15:9:16:26 | if (...) ... |
+| B.cs:15:9:16:26 | if (...) ... | B.cs:16:13:16:26 | ...; |
+| B.cs:15:9:16:26 | if (...) ... | B.cs:18:9:20:26 | if (...) ... |
+| B.cs:16:13:16:26 | ...; | B.cs:18:9:20:26 | if (...) ... |
+| B.cs:18:9:20:26 | if (...) ... | B.cs:18:25:18:27 | {...} |
+| B.cs:18:9:20:26 | if (...) ... | B.cs:20:13:20:26 | ...; |
+| B.cs:18:25:18:27 | {...} | B.cs:22:9:24:37 | if (...) ... |
+| B.cs:20:13:20:26 | ...; | B.cs:22:9:24:37 | if (...) ... |
+| B.cs:22:9:24:37 | if (...) ... | B.cs:24:13:24:25 | access to local variable neqCallAlways |
+| C.cs:10:16:10:23 | SSA def(o) | C.cs:11:17:11:28 | [false] !... |
+| C.cs:11:13:11:30 | [false] !... | C.cs:16:9:19:9 | if (...) ... |
+| C.cs:11:15:11:29 | [true] !... | C.cs:11:13:11:30 | [false] !... |
+| C.cs:11:17:11:28 | [false] !... | C.cs:11:15:11:29 | [true] !... |
+| C.cs:16:9:19:9 | if (...) ... | C.cs:16:13:16:24 | [true] !... |
+| C.cs:16:13:16:24 | [true] !... | C.cs:18:13:18:13 | access to local variable o |
+| C.cs:40:13:40:35 | SSA def(s) | C.cs:42:9:42:9 | access to local variable s |
+| C.cs:55:13:55:36 | SSA def(o2) | C.cs:57:9:57:10 | access to local variable o2 |
+| C.cs:62:13:62:46 | SSA def(o1) | C.cs:64:9:64:10 | access to local variable o1 |
+| C.cs:66:13:66:46 | SSA def(o2) | C.cs:68:9:68:10 | access to local variable o2 |
+| C.cs:94:13:94:45 | SSA def(o) | C.cs:95:15:95:15 | access to local variable o |
+| C.cs:94:13:94:45 | SSA def(o) | C.cs:96:13:96:13 | access to local variable o |
+| C.cs:102:13:102:23 | SSA def(list) | C.cs:103:27:103:30 | access to parameter list |
+| C.cs:102:13:102:23 | SSA def(list) | C.cs:103:27:103:30 | access to parameter list |
+| C.cs:103:9:107:9 | foreach (... ... in ...) ... | C.cs:103:22:103:22 | Int32 x |
+| C.cs:103:9:107:9 | foreach (... ... in ...) ... | C.cs:106:13:106:16 | access to parameter list |
+| C.cs:103:22:103:22 | Int32 x | C.cs:103:9:107:9 | foreach (... ... in ...) ... |
+| C.cs:103:27:103:30 | access to parameter list | C.cs:103:9:107:9 | foreach (... ... in ...) ... |
+| C.cs:159:9:159:16 | SSA def(s) | C.cs:162:13:162:13 | access to local variable s |
+| C.cs:167:9:167:16 | SSA def(s) | C.cs:170:13:170:13 | access to local variable s |
+| C.cs:178:13:178:20 | SSA def(s) | C.cs:177:13:177:13 | access to local variable s |
+| C.cs:193:9:193:16 | SSA def(s) | C.cs:196:13:196:13 | access to local variable s |
+| C.cs:197:13:197:20 | [b (line 192): true] SSA def(s) | C.cs:196:13:196:13 | access to local variable s |
+| C.cs:201:16:201:19 | true | C.cs:203:13:203:13 | access to local variable s |
+| C.cs:204:13:204:20 | SSA def(s) | C.cs:201:16:201:19 | true |
+| C.cs:210:13:210:35 | SSA def(s) | C.cs:217:9:218:25 | if (...) ... |
+| C.cs:214:13:214:20 | SSA def(s) | C.cs:217:9:218:25 | if (...) ... |
+| C.cs:217:9:218:25 | if (...) ... | C.cs:218:13:218:13 | access to local variable s |
+| C.cs:222:13:222:20 | SSA def(s) | C.cs:223:9:223:9 | access to local variable s |
+| C.cs:229:22:229:22 | access to local variable s | C.cs:233:9:233:9 | access to local variable s |
+| C.cs:229:33:229:40 | SSA def(s) | C.cs:229:22:229:22 | access to local variable s |
+| C.cs:235:14:235:21 | SSA def(s) | C.cs:235:24:235:24 | access to local variable s |
+| C.cs:235:24:235:24 | access to local variable s | C.cs:237:13:237:13 | access to local variable s |
+| C.cs:235:35:235:42 | SSA def(s) | C.cs:235:24:235:24 | access to local variable s |
+| C.cs:240:24:240:31 | SSA def(s) | C.cs:242:13:242:13 | access to local variable s |
+| C.cs:248:15:248:22 | SSA def(a) | C.cs:249:9:249:9 | access to local variable a |
+| C.cs:257:15:257:23 | SSA def(ia) | C.cs:260:9:260:10 | access to local variable ia |
+| C.cs:257:15:257:23 | SSA def(ia) | C.cs:263:9:263:10 | access to local variable ia |
+| C.cs:258:18:258:26 | SSA def(sa) | C.cs:261:20:261:21 | access to local variable sa |
+| C.cs:258:18:258:26 | SSA def(sa) | C.cs:264:16:264:17 | access to local variable sa |
+| D.cs:17:17:17:20 | null | D.cs:23:9:23:13 | access to parameter param |
+| D.cs:26:32:26:36 | SSA param(param) | D.cs:32:9:32:13 | access to parameter param |
+| D.cs:58:13:58:41 | SSA def(o5) | D.cs:61:9:62:26 | if (...) ... |
+| D.cs:61:9:62:26 | if (...) ... | D.cs:62:13:62:14 | access to local variable o5 |
+| D.cs:68:13:68:34 | SSA def(o7) | D.cs:69:18:69:36 | ... && ... |
+| D.cs:69:18:69:36 | ... && ... | D.cs:73:13:73:14 | access to local variable o7 |
+| D.cs:75:13:75:34 | SSA def(o8) | D.cs:76:34:76:35 | 42 |
+| D.cs:76:21:76:43 | ... ? ... : ... | D.cs:79:9:80:26 | if (...) ... |
+| D.cs:76:34:76:35 | 42 | D.cs:76:21:76:43 | ... ? ... : ... |
+| D.cs:79:9:80:26 | if (...) ... | D.cs:81:9:82:26 | if (...) ... |
+| D.cs:81:9:82:26 | if (...) ... | D.cs:82:13:82:14 | access to local variable o8 |
+| D.cs:81:9:82:26 | if (...) ... | D.cs:82:13:82:26 | ...; |
+| D.cs:81:9:82:26 | if (...) ... | D.cs:83:9:84:26 | if (...) ... |
+| D.cs:82:13:82:26 | ...; | D.cs:83:9:84:26 | if (...) ... |
+| D.cs:83:9:84:26 | if (...) ... | D.cs:84:13:84:14 | access to local variable o8 |
+| D.cs:89:15:89:44 | SSA def(xs) | D.cs:91:13:91:14 | access to local variable xs |
+| D.cs:89:15:89:44 | SSA def(xs) | D.cs:91:13:91:22 | ...; |
+| D.cs:89:15:89:44 | SSA def(xs) | D.cs:93:9:94:30 | if (...) ... |
+| D.cs:91:13:91:22 | ...; | D.cs:93:9:94:30 | if (...) ... |
+| D.cs:93:9:94:30 | if (...) ... | D.cs:94:13:94:30 | ...; |
+| D.cs:93:9:94:30 | if (...) ... | D.cs:94:21:94:22 | access to local variable xs |
+| D.cs:93:9:94:30 | if (...) ... | D.cs:96:9:99:9 | if (...) ... |
+| D.cs:94:13:94:30 | ...; | D.cs:96:9:99:9 | if (...) ... |
+| D.cs:96:9:99:9 | if (...) ... | D.cs:97:9:99:9 | {...} |
+| D.cs:96:9:99:9 | if (...) ... | D.cs:98:21:98:22 | access to local variable xs |
+| D.cs:96:9:99:9 | if (...) ... | D.cs:101:9:102:35 | if (...) ... |
+| D.cs:97:9:99:9 | {...} | D.cs:101:9:102:35 | if (...) ... |
+| D.cs:101:9:102:35 | if (...) ... | D.cs:102:31:102:32 | access to local variable xs |
+| D.cs:101:9:102:35 | if (...) ... | D.cs:102:31:102:32 | access to local variable xs |
+| D.cs:101:9:102:35 | if (...) ... | D.cs:104:9:106:30 | if (...) ... |
+| D.cs:102:13:102:35 | foreach (... ... in ...) ... | D.cs:102:26:102:26 | Int32 _ |
+| D.cs:102:13:102:35 | foreach (... ... in ...) ... | D.cs:104:9:106:30 | if (...) ... |
+| D.cs:102:26:102:26 | Int32 _ | D.cs:102:13:102:35 | foreach (... ... in ...) ... |
+| D.cs:102:31:102:32 | access to local variable xs | D.cs:102:13:102:35 | foreach (... ... in ...) ... |
+| D.cs:104:9:106:30 | if (...) ... | D.cs:105:19:105:20 | access to local variable xs |
+| D.cs:104:9:106:30 | if (...) ... | D.cs:106:17:106:18 | access to local variable xs |
+| D.cs:118:9:118:30 | SSA def(x) | D.cs:120:13:120:13 | access to local variable x |
+| D.cs:125:35:125:35 | SSA param(a) | D.cs:127:32:127:32 | 0 |
+| D.cs:125:35:125:35 | SSA param(a) | D.cs:127:32:127:32 | 0 |
+| D.cs:125:44:125:44 | SSA param(b) | D.cs:127:32:127:32 | 0 |
+| D.cs:125:44:125:44 | SSA param(b) | D.cs:127:36:127:36 | access to parameter a |
+| D.cs:127:20:127:43 | ... ? ... : ... | D.cs:128:32:128:32 | 0 |
+| D.cs:127:20:127:43 | ... ? ... : ... | D.cs:128:32:128:32 | 0 |
+| D.cs:127:20:127:43 | ... ? ... : ... | D.cs:128:36:128:36 | access to parameter b |
+| D.cs:127:32:127:32 | 0 | D.cs:127:20:127:43 | ... ? ... : ... |
+| D.cs:127:32:127:32 | 0 | D.cs:127:20:127:43 | ... ? ... : ... |
+| D.cs:127:36:127:36 | access to parameter a | D.cs:127:20:127:43 | ... ? ... : ... |
+| D.cs:128:20:128:43 | ... ? ... : ... | D.cs:131:9:137:9 | {...} |
+| D.cs:128:20:128:43 | ... ? ... : ... | D.cs:131:9:137:9 | {...} |
+| D.cs:128:20:128:43 | ... ? ... : ... | D.cs:138:9:138:18 | ... ...; |
+| D.cs:128:32:128:32 | 0 | D.cs:128:20:128:43 | ... ? ... : ... |
+| D.cs:128:32:128:32 | 0 | D.cs:128:20:128:43 | ... ? ... : ... |
+| D.cs:128:36:128:36 | access to parameter b | D.cs:128:20:128:43 | ... ? ... : ... |
+| D.cs:131:9:137:9 | {...} | D.cs:132:29:132:29 | access to local variable i |
+| D.cs:131:9:137:9 | {...} | D.cs:132:29:132:29 | access to local variable i |
+| D.cs:132:29:132:29 | access to local variable i | D.cs:133:13:136:13 | {...} |
+| D.cs:132:29:132:29 | access to local variable i | D.cs:133:13:136:13 | {...} |
+| D.cs:132:29:132:29 | access to local variable i | D.cs:134:24:134:24 | access to parameter a |
+| D.cs:132:29:132:29 | access to local variable i | D.cs:135:24:135:24 | access to parameter b |
+| D.cs:132:29:132:29 | access to local variable i | D.cs:138:9:138:18 | ... ...; |
+| D.cs:133:13:136:13 | {...} | D.cs:132:29:132:29 | access to local variable i |
+| D.cs:133:13:136:13 | {...} | D.cs:132:29:132:29 | access to local variable i |
+| D.cs:138:9:138:18 | ... ...; | D.cs:142:13:142:22 | ...; |
+| D.cs:142:13:142:22 | ...; | D.cs:143:9:146:9 | for (...;...;...) ... |
+| D.cs:143:9:146:9 | for (...;...;...) ... | D.cs:143:25:143:25 | access to local variable i |
+| D.cs:143:25:143:25 | access to local variable i | D.cs:144:9:146:9 | {...} |
+| D.cs:143:25:143:25 | access to local variable i | D.cs:145:20:145:20 | access to parameter a |
+| D.cs:144:9:146:9 | {...} | D.cs:143:25:143:25 | access to local variable i |
+| D.cs:149:36:149:38 | SSA param(obj) | D.cs:151:9:151:11 | access to parameter obj |
+| D.cs:163:16:163:25 | SSA def(obj) | D.cs:168:9:170:9 | [exception: Exception] catch (...) {...} |
+| D.cs:168:9:170:9 | [exception: Exception] catch (...) {...} | D.cs:168:26:168:26 | [exception: Exception] Exception e |
+| D.cs:168:26:168:26 | [exception: Exception] Exception e | D.cs:171:9:171:11 | access to local variable obj |
+| D.cs:240:9:240:16 | SSA def(o) | D.cs:241:29:241:32 | null |
+| D.cs:240:9:240:16 | SSA def(o) | D.cs:241:36:241:37 | "" |
+| D.cs:241:21:241:37 | ... ? ... : ... | D.cs:244:9:247:25 | if (...) ... |
+| D.cs:241:29:241:32 | null | D.cs:241:21:241:37 | ... ? ... : ... |
+| D.cs:241:36:241:37 | "" | D.cs:241:21:241:37 | ... ? ... : ... |
+| D.cs:244:9:247:25 | if (...) ... | D.cs:245:13:245:13 | access to local variable o |
+| D.cs:244:9:247:25 | if (...) ... | D.cs:247:13:247:13 | access to local variable o |
+| D.cs:249:13:249:38 | SSA def(o2) | D.cs:253:13:253:14 | access to local variable o2 |
+| D.cs:258:16:258:23 | SSA def(o) | D.cs:266:9:267:25 | if (...) ... |
+| D.cs:266:9:267:25 | if (...) ... | D.cs:266:13:266:27 | [true] ... is ... |
+| D.cs:266:13:266:27 | [true] ... is ... | D.cs:267:13:267:13 | access to local variable o |
+| D.cs:269:9:269:16 | SSA def(o) | D.cs:272:25:272:25 | access to local variable i |
+| D.cs:272:25:272:25 | access to local variable i | D.cs:273:9:288:9 | {...} |
+| D.cs:272:25:272:25 | access to local variable i | D.cs:290:9:291:25 | if (...) ... |
+| D.cs:272:39:272:39 | access to local variable i | D.cs:272:25:272:25 | access to local variable i |
+| D.cs:273:9:288:9 | {...} | D.cs:281:13:287:13 | if (...) ... |
+| D.cs:281:13:287:13 | if (...) ... | D.cs:272:39:272:39 | access to local variable i |
+| D.cs:283:17:283:24 | SSA def(o) | D.cs:285:28:285:30 | {...} |
+| D.cs:283:17:283:24 | SSA def(o) | D.cs:286:17:286:30 | ...; |
+| D.cs:285:28:285:30 | {...} | D.cs:286:17:286:30 | ...; |
+| D.cs:286:17:286:30 | ...; | D.cs:272:39:272:39 | access to local variable i |
+| D.cs:290:9:291:25 | if (...) ... | D.cs:291:13:291:13 | access to local variable o |
+| D.cs:290:9:291:25 | if (...) ... | D.cs:291:13:291:25 | ...; |
+| D.cs:290:9:291:25 | if (...) ... | D.cs:293:9:294:25 | if (...) ... |
+| D.cs:291:13:291:25 | ...; | D.cs:293:9:294:25 | if (...) ... |
+| D.cs:293:9:294:25 | if (...) ... | D.cs:294:13:294:13 | access to local variable o |
+| D.cs:296:16:296:26 | SSA def(prev) | D.cs:297:25:297:25 | access to local variable i |
+| D.cs:297:25:297:25 | access to local variable i | D.cs:298:9:302:9 | {...} |
+| D.cs:298:9:302:9 | {...} | D.cs:300:17:300:20 | access to local variable prev |
+| D.cs:304:16:304:23 | SSA def(s) | D.cs:307:13:311:13 | foreach (... ... in ...) ... |
+| D.cs:307:13:311:13 | foreach (... ... in ...) ... | D.cs:312:13:313:29 | if (...) ... |
+| D.cs:312:13:313:29 | if (...) ... | D.cs:312:17:312:23 | [true] !... |
+| D.cs:312:17:312:23 | [true] !... | D.cs:313:17:313:17 | access to local variable s |
+| D.cs:316:16:316:23 | SSA def(r) | D.cs:318:16:318:19 | access to local variable stat |
+| D.cs:318:16:318:19 | access to local variable stat | D.cs:318:16:318:62 | [false] ... && ... |
+| D.cs:318:16:318:19 | access to local variable stat | D.cs:318:41:318:44 | access to local variable stat |
+| D.cs:318:16:318:62 | [false] ... && ... | D.cs:324:9:324:9 | access to local variable r |
+| D.cs:318:41:318:44 | access to local variable stat | D.cs:318:16:318:62 | [false] ... && ... |
+| D.cs:351:15:351:22 | SSA def(a) | D.cs:355:9:356:21 | for (...;...;...) ... |
+| D.cs:355:9:356:21 | for (...;...;...) ... | D.cs:355:25:355:25 | access to local variable i |
+| D.cs:355:25:355:25 | access to local variable i | D.cs:356:13:356:13 | access to local variable a |
+| D.cs:355:25:355:25 | access to local variable i | D.cs:356:13:356:21 | ...; |
+| D.cs:356:13:356:21 | ...; | D.cs:355:25:355:25 | access to local variable i |
+| D.cs:360:20:360:30 | SSA def(last) | D.cs:361:29:361:29 | access to local variable i |
+| D.cs:361:29:361:29 | access to local variable i | D.cs:363:13:363:16 | access to local variable last |
+| D.cs:366:15:366:47 | SSA def(b) | D.cs:367:13:367:56 | [false] ... && ... |
+| D.cs:367:13:367:56 | [false] ... && ... | D.cs:370:9:373:9 | for (...;...;...) ... |
+| D.cs:370:9:373:9 | for (...;...;...) ... | D.cs:370:25:370:25 | access to local variable i |
+| D.cs:370:25:370:25 | access to local variable i | D.cs:371:9:373:9 | {...} |
+| D.cs:370:25:370:25 | access to local variable i | D.cs:372:13:372:13 | access to local variable b |
+| D.cs:371:9:373:9 | {...} | D.cs:370:25:370:25 | access to local variable i |
+| D.cs:378:19:378:28 | SSA def(ioe) | D.cs:382:9:385:27 | if (...) ... |
+| D.cs:382:9:385:27 | if (...) ... | D.cs:385:13:385:15 | access to local variable ioe |
+| D.cs:388:36:388:36 | SSA param(a) | D.cs:390:32:390:32 | 0 |
+| D.cs:388:45:388:45 | SSA param(b) | D.cs:390:32:390:32 | 0 |
+| D.cs:388:45:388:45 | SSA param(b) | D.cs:390:36:390:36 | access to parameter a |
+| D.cs:390:20:390:43 | ... ? ... : ... | D.cs:393:21:393:21 | access to local variable i |
+| D.cs:390:20:390:43 | ... ? ... : ... | D.cs:393:21:393:21 | access to local variable i |
+| D.cs:390:32:390:32 | 0 | D.cs:390:20:390:43 | ... ? ... : ... |
+| D.cs:390:32:390:32 | 0 | D.cs:390:20:390:43 | ... ? ... : ... |
+| D.cs:390:36:390:36 | access to parameter a | D.cs:390:20:390:43 | ... ? ... : ... |
+| D.cs:393:21:393:21 | access to local variable i | D.cs:394:9:396:9 | {...} |
+| D.cs:393:21:393:21 | access to local variable i | D.cs:394:9:396:9 | {...} |
+| D.cs:393:21:393:21 | access to local variable i | D.cs:395:20:395:20 | access to parameter a |
+| D.cs:393:21:393:21 | access to local variable i | D.cs:397:9:397:44 | ... ...; |
+| D.cs:394:9:396:9 | {...} | D.cs:393:21:393:21 | access to local variable i |
+| D.cs:394:9:396:9 | {...} | D.cs:393:21:393:21 | access to local variable i |
+| D.cs:397:9:397:44 | ... ...; | D.cs:397:32:397:32 | 0 |
+| D.cs:397:20:397:43 | ... ? ... : ... | D.cs:398:21:398:21 | access to local variable i |
+| D.cs:397:32:397:32 | 0 | D.cs:397:20:397:43 | ... ? ... : ... |
+| D.cs:398:21:398:21 | access to local variable i | D.cs:399:9:401:9 | {...} |
+| D.cs:398:21:398:21 | access to local variable i | D.cs:400:20:400:20 | access to parameter b |
+| D.cs:399:9:401:9 | {...} | D.cs:398:21:398:21 | access to local variable i |
+| D.cs:405:35:405:35 | SSA param(x) | D.cs:407:14:407:35 | [false] ... && ... |
+| D.cs:405:35:405:35 | SSA param(x) | D.cs:407:14:407:35 | [false] ... && ... |
+| D.cs:405:35:405:35 | SSA param(x) | D.cs:407:14:407:35 | [false] ... && ... |
+| D.cs:405:45:405:45 | SSA param(y) | D.cs:407:14:407:35 | [false] ... && ... |
+| D.cs:405:45:405:45 | SSA param(y) | D.cs:407:14:407:35 | [false] ... && ... |
+| D.cs:405:45:405:45 | SSA param(y) | D.cs:407:14:407:35 | [false] ... && ... |
+| D.cs:407:13:407:64 | [false] ... \|\| ... | D.cs:409:9:410:25 | if (...) ... |
+| D.cs:407:13:407:64 | [false] ... \|\| ... | D.cs:409:9:410:25 | if (...) ... |
+| D.cs:407:14:407:35 | [false] ... && ... | D.cs:407:42:407:42 | access to parameter x |
+| D.cs:407:14:407:35 | [false] ... && ... | D.cs:407:42:407:42 | access to parameter x |
+| D.cs:407:42:407:42 | access to parameter x | D.cs:407:42:407:63 | [false] ... && ... |
+| D.cs:407:42:407:42 | access to parameter x | D.cs:407:55:407:55 | access to parameter y |
+| D.cs:407:42:407:42 | access to parameter x | D.cs:407:55:407:55 | access to parameter y |
+| D.cs:407:42:407:63 | [false] ... && ... | D.cs:407:13:407:64 | [false] ... \|\| ... |
+| D.cs:407:42:407:63 | [false] ... && ... | D.cs:407:13:407:64 | [false] ... \|\| ... |
+| D.cs:407:55:407:55 | access to parameter y | D.cs:407:42:407:63 | [false] ... && ... |
+| D.cs:407:55:407:55 | access to parameter y | D.cs:407:42:407:63 | [false] ... && ... |
+| D.cs:409:9:410:25 | if (...) ... | D.cs:410:13:410:13 | access to parameter y |
+| D.cs:409:9:410:25 | if (...) ... | D.cs:411:9:412:25 | if (...) ... |
+| D.cs:411:9:412:25 | if (...) ... | D.cs:412:13:412:13 | access to parameter x |
+| E.cs:9:18:9:26 | SSA def(a2) | E.cs:10:22:10:54 | ... && ... |
+| E.cs:10:22:10:54 | ... && ... | E.cs:12:38:12:39 | access to local variable a2 |
+| E.cs:11:16:11:24 | SSA def(a3) | E.cs:12:22:12:52 | ... && ... |
+| E.cs:12:22:12:52 | ... && ... | E.cs:14:13:14:14 | access to local variable a3 |
+| E.cs:23:13:23:30 | SSA def(s1) | E.cs:24:33:24:36 | null |
+| E.cs:24:18:24:41 | ... ? ... : ... | E.cs:26:9:27:26 | if (...) ... |
+| E.cs:24:33:24:36 | null | E.cs:24:18:24:41 | ... ? ... : ... |
+| E.cs:26:9:27:26 | if (...) ... | E.cs:27:13:27:14 | access to local variable s1 |
+| E.cs:51:22:51:33 | SSA def(slice) | E.cs:53:16:53:19 | access to local variable iter |
+| E.cs:53:16:53:19 | access to local variable iter | E.cs:54:9:63:9 | {...} |
+| E.cs:54:9:63:9 | {...} | E.cs:61:13:61:17 | access to local variable slice |
+| E.cs:54:9:63:9 | {...} | E.cs:61:13:61:27 | ...; |
+| E.cs:61:13:61:27 | ...; | E.cs:53:16:53:19 | access to local variable iter |
+| E.cs:66:40:66:42 | SSA param(arr) | E.cs:70:13:70:50 | ...; |
+| E.cs:66:40:66:42 | SSA param(arr) | E.cs:72:9:73:23 | if (...) ... |
+| E.cs:70:13:70:50 | ...; | E.cs:70:36:70:36 | 0 |
+| E.cs:70:22:70:49 | ... ? ... : ... | E.cs:72:9:73:23 | if (...) ... |
+| E.cs:70:36:70:36 | 0 | E.cs:70:22:70:49 | ... ? ... : ... |
+| E.cs:72:9:73:23 | if (...) ... | E.cs:73:13:73:15 | access to parameter arr |
+| E.cs:107:15:107:25 | SSA def(arr2) | E.cs:111:9:112:30 | for (...;...;...) ... |
+| E.cs:111:9:112:30 | for (...;...;...) ... | E.cs:111:25:111:25 | access to local variable i |
+| E.cs:111:25:111:25 | access to local variable i | E.cs:112:13:112:16 | access to local variable arr2 |
+| E.cs:111:25:111:25 | access to local variable i | E.cs:112:13:112:30 | ...; |
+| E.cs:112:13:112:30 | ...; | E.cs:111:25:111:25 | access to local variable i |
+| E.cs:120:16:120:20 | [true] !... | E.cs:121:9:143:9 | {...} |
+| E.cs:120:17:120:20 | access to local variable stop | E.cs:120:16:120:20 | [true] !... |
+| E.cs:121:9:143:9 | {...} | E.cs:123:21:123:24 | access to local variable stop |
+| E.cs:123:20:123:24 | [false] !... | E.cs:123:20:123:35 | [false] ... && ... |
+| E.cs:123:20:123:24 | [true] !... | E.cs:123:29:123:29 | access to local variable j |
+| E.cs:123:20:123:35 | [false] ... && ... | E.cs:120:17:120:20 | access to local variable stop |
+| E.cs:123:20:123:35 | [true] ... && ... | E.cs:124:13:142:13 | {...} |
+| E.cs:123:20:123:35 | [true] ... && ... | E.cs:125:33:125:35 | access to local variable obj |
+| E.cs:123:21:123:24 | access to local variable stop | E.cs:123:20:123:24 | [false] !... |
+| E.cs:123:21:123:24 | access to local variable stop | E.cs:123:20:123:24 | [true] !... |
+| E.cs:123:29:123:29 | access to local variable j | E.cs:123:20:123:35 | [false] ... && ... |
+| E.cs:123:29:123:29 | access to local variable j | E.cs:123:20:123:35 | [true] ... && ... |
+| E.cs:124:13:142:13 | {...} | E.cs:128:21:128:23 | access to local variable obj |
+| E.cs:124:13:142:13 | {...} | E.cs:141:17:141:26 | ...; |
+| E.cs:137:25:137:34 | SSA def(obj) | E.cs:139:21:139:29 | continue; |
+| E.cs:139:21:139:29 | continue; | E.cs:123:21:123:24 | access to local variable stop |
+| E.cs:141:17:141:26 | ...; | E.cs:123:21:123:24 | access to local variable stop |
+| E.cs:152:16:152:26 | SSA def(obj2) | E.cs:153:13:153:54 | [false] ... && ... |
+| E.cs:153:13:153:54 | [false] ... && ... | E.cs:158:9:159:28 | if (...) ... |
+| E.cs:158:9:159:28 | if (...) ... | E.cs:159:13:159:16 | access to local variable obj2 |
+| E.cs:162:28:162:28 | SSA param(a) | E.cs:164:29:164:29 | 0 |
+| E.cs:164:17:164:40 | ... ? ... : ... | E.cs:165:25:165:25 | access to local variable i |
+| E.cs:164:29:164:29 | 0 | E.cs:164:17:164:40 | ... ? ... : ... |
+| E.cs:165:25:165:25 | access to local variable i | E.cs:166:9:170:9 | {...} |
+| E.cs:165:25:165:25 | access to local variable i | E.cs:167:21:167:21 | access to parameter a |
+| E.cs:165:32:165:32 | access to local variable i | E.cs:165:25:165:25 | access to local variable i |
+| E.cs:166:9:170:9 | {...} | E.cs:165:32:165:32 | access to local variable i |
+| E.cs:173:29:173:31 | SSA param(obj) | E.cs:175:33:175:37 | false |
+| E.cs:173:29:173:31 | SSA param(obj) | E.cs:175:33:175:37 | false |
+| E.cs:175:19:175:42 | ... ? ... : ... | E.cs:177:9:179:9 | {...} |
+| E.cs:175:19:175:42 | ... ? ... : ... | E.cs:178:13:178:15 | access to parameter obj |
+| E.cs:175:19:175:42 | ... ? ... : ... | E.cs:180:9:183:9 | if (...) ... |
+| E.cs:175:33:175:37 | false | E.cs:175:19:175:42 | ... ? ... : ... |
+| E.cs:177:9:179:9 | {...} | E.cs:180:9:183:9 | if (...) ... |
+| E.cs:180:9:183:9 | if (...) ... | E.cs:181:9:183:9 | {...} |
+| E.cs:181:9:183:9 | {...} | E.cs:184:9:187:9 | if (...) ... |
+| E.cs:184:9:187:9 | if (...) ... | E.cs:186:13:186:15 | access to parameter obj |
+| E.cs:190:29:190:29 | SSA param(o) | E.cs:192:17:192:17 | access to parameter o |
+| E.cs:198:13:198:29 | [b (line 196): false] SSA def(o) | E.cs:203:13:203:13 | access to local variable o |
+| E.cs:198:13:198:29 | [b (line 196): true] SSA def(o) | E.cs:201:13:201:13 | access to local variable o |
+| E.cs:206:28:206:28 | SSA param(s) | E.cs:208:13:208:23 | [false] ... is ... |
+| E.cs:208:13:208:23 | [false] ... is ... | E.cs:210:16:210:16 | access to parameter s |
+| E.cs:217:13:217:20 | [b (line 213): true] SSA def(x) | E.cs:218:9:218:9 | access to local variable x |
+| E.cs:217:13:217:20 | [b (line 213): true] SSA def(x) | E.cs:220:13:220:13 | access to local variable x |
+| E.cs:227:13:227:20 | [b (line 223): true] SSA def(x) | E.cs:229:13:229:13 | access to local variable x |
+| E.cs:227:13:227:20 | [b (line 223): true] SSA def(x) | E.cs:229:13:229:25 | ...; |
+| E.cs:229:13:229:25 | ...; | E.cs:230:9:230:9 | access to local variable x |
+| E.cs:233:26:233:26 | SSA param(i) | E.cs:235:16:235:16 | access to parameter i |
+| E.cs:238:26:238:26 | SSA param(i) | E.cs:240:21:240:21 | access to parameter i |
+| E.cs:283:13:283:22 | [b (line 279): false] SSA def(o) | E.cs:285:9:285:9 | access to local variable o |
+| E.cs:283:13:283:22 | [b (line 279): true] SSA def(o) | E.cs:285:9:285:9 | access to local variable o |
+| E.cs:301:13:301:27 | SSA def(s) | E.cs:302:9:302:9 | access to local variable s |
+| E.cs:319:29:319:30 | SSA param(s1) | E.cs:321:20:321:21 | access to parameter s2 |
+| E.cs:321:13:321:30 | [true] ... is ... | E.cs:323:13:323:14 | access to parameter s1 |
+| E.cs:321:14:321:21 | ... ?? ... | E.cs:321:13:321:30 | [true] ... is ... |
+| E.cs:321:20:321:21 | access to parameter s2 | E.cs:321:14:321:21 | ... ?? ... |
+| E.cs:330:13:330:36 | SSA def(x) | E.cs:331:9:331:9 | access to local variable x |
+| E.cs:342:13:342:32 | SSA def(x) | E.cs:343:9:343:9 | access to local variable x |
+| E.cs:348:17:348:36 | SSA def(x) | E.cs:349:9:349:9 | access to local variable x |
+| E.cs:366:28:366:28 | SSA param(s) | E.cs:366:41:366:41 | access to parameter s |
+| E.cs:374:17:374:31 | SSA def(s) | E.cs:375:20:375:20 | access to local variable s |
+| E.cs:380:24:380:25 | SSA param(e1) | E.cs:382:28:382:29 | access to parameter e2 |
+| E.cs:380:24:380:25 | SSA param(e1) | E.cs:382:28:382:29 | access to parameter e2 |
+| E.cs:380:24:380:25 | SSA param(e1) | E.cs:382:28:382:29 | access to parameter e2 |
+| E.cs:380:30:380:31 | SSA param(e2) | E.cs:382:14:382:37 | [false] ... && ... |
+| E.cs:380:30:380:31 | SSA param(e2) | E.cs:382:14:382:37 | [false] ... && ... |
+| E.cs:380:30:380:31 | SSA param(e2) | E.cs:382:14:382:37 | [false] ... && ... |
+| E.cs:380:30:380:31 | SSA param(e2) | E.cs:382:28:382:29 | access to parameter e2 |
+| E.cs:380:30:380:31 | SSA param(e2) | E.cs:382:28:382:29 | access to parameter e2 |
+| E.cs:380:30:380:31 | SSA param(e2) | E.cs:382:28:382:29 | access to parameter e2 |
+| E.cs:382:13:382:68 | [false] ... \|\| ... | E.cs:384:9:385:24 | if (...) ... |
+| E.cs:382:13:382:68 | [false] ... \|\| ... | E.cs:384:9:385:24 | if (...) ... |
+| E.cs:382:14:382:37 | [false] ... && ... | E.cs:382:44:382:45 | access to parameter e1 |
+| E.cs:382:14:382:37 | [false] ... && ... | E.cs:382:44:382:45 | access to parameter e1 |
+| E.cs:382:28:382:29 | access to parameter e2 | E.cs:382:14:382:37 | [false] ... && ... |
+| E.cs:382:28:382:29 | access to parameter e2 | E.cs:382:14:382:37 | [false] ... && ... |
+| E.cs:382:44:382:45 | access to parameter e1 | E.cs:382:44:382:67 | [false] ... && ... |
+| E.cs:382:44:382:45 | access to parameter e1 | E.cs:382:44:382:67 | [false] ... && ... |
+| E.cs:382:44:382:67 | [false] ... && ... | E.cs:382:13:382:68 | [false] ... \|\| ... |
+| E.cs:382:44:382:67 | [false] ... && ... | E.cs:382:13:382:68 | [false] ... \|\| ... |
+| E.cs:384:9:385:24 | if (...) ... | E.cs:384:13:384:36 | [false] ... && ... |
+| E.cs:384:9:385:24 | if (...) ... | E.cs:384:27:384:28 | access to parameter e2 |
+| E.cs:384:13:384:36 | [false] ... && ... | E.cs:386:16:386:17 | access to parameter e1 |
+| E.cs:384:13:384:36 | [false] ... && ... | E.cs:386:27:386:28 | access to parameter e2 |
+| E.cs:384:27:384:28 | access to parameter e2 | E.cs:384:13:384:36 | [false] ... && ... |
+| E.cs:404:9:404:18 | SSA def(i) | E.cs:405:16:405:16 | access to local variable i |
+| E.cs:404:9:404:18 | SSA def(i) | E.cs:405:16:405:16 | access to local variable i |
+| E.cs:417:24:417:40 | SSA capture def(i) | E.cs:417:34:417:34 | access to parameter i |
+| E.cs:423:28:423:44 | SSA capture def(i) | E.cs:423:38:423:38 | access to parameter i |
+| E.cs:430:29:430:45 | SSA capture def(i) | E.cs:430:39:430:39 | access to parameter i |
+| E.cs:435:29:435:29 | SSA param(s) | E.cs:437:13:437:21 | [true] ... is ... |
+| E.cs:437:13:437:21 | [true] ... is ... | E.cs:439:13:439:13 | access to parameter s |
+| F.cs:7:16:7:23 | SSA def(o) | F.cs:8:9:8:9 | access to local variable o |
+| Forwarding.cs:7:16:7:23 | SSA def(s) | Forwarding.cs:9:13:9:30 | [false] !... |
+| Forwarding.cs:9:13:9:30 | [false] !... | Forwarding.cs:14:9:17:9 | if (...) ... |
+| Forwarding.cs:14:9:17:9 | if (...) ... | Forwarding.cs:19:9:22:9 | if (...) ... |
+| Forwarding.cs:19:9:22:9 | if (...) ... | Forwarding.cs:19:13:19:23 | [false] !... |
+| Forwarding.cs:19:13:19:23 | [false] !... | Forwarding.cs:24:9:27:9 | if (...) ... |
+| Forwarding.cs:24:9:27:9 | if (...) ... | Forwarding.cs:29:9:32:9 | if (...) ... |
+| Forwarding.cs:29:9:32:9 | if (...) ... | Forwarding.cs:34:9:37:9 | if (...) ... |
+| Forwarding.cs:34:9:37:9 | if (...) ... | Forwarding.cs:35:9:37:9 | {...} |
+| Forwarding.cs:34:9:37:9 | if (...) ... | Forwarding.cs:36:31:36:31 | access to local variable s |
+| Forwarding.cs:35:9:37:9 | {...} | Forwarding.cs:40:27:40:27 | access to local variable s |
+| GuardedString.cs:7:16:7:32 | SSA def(s) | GuardedString.cs:9:13:9:36 | [false] !... |
+| GuardedString.cs:9:13:9:36 | [false] !... | GuardedString.cs:14:9:17:9 | if (...) ... |
+| GuardedString.cs:14:9:17:9 | if (...) ... | GuardedString.cs:14:13:14:41 | [false] !... |
+| GuardedString.cs:14:13:14:41 | [false] !... | GuardedString.cs:19:9:20:40 | if (...) ... |
+| GuardedString.cs:19:9:20:40 | if (...) ... | GuardedString.cs:19:26:19:26 | 0 |
+| GuardedString.cs:19:26:19:26 | 0 | GuardedString.cs:22:9:23:40 | if (...) ... |
+| GuardedString.cs:22:9:23:40 | if (...) ... | GuardedString.cs:22:25:22:25 | 0 |
+| GuardedString.cs:22:25:22:25 | 0 | GuardedString.cs:25:9:26:40 | if (...) ... |
+| GuardedString.cs:25:9:26:40 | if (...) ... | GuardedString.cs:25:26:25:26 | 0 |
+| GuardedString.cs:25:26:25:26 | 0 | GuardedString.cs:28:9:29:40 | if (...) ... |
+| GuardedString.cs:28:9:29:40 | if (...) ... | GuardedString.cs:28:25:28:26 | 10 |
+| GuardedString.cs:28:25:28:26 | 10 | GuardedString.cs:31:9:32:40 | if (...) ... |
+| GuardedString.cs:31:9:32:40 | if (...) ... | GuardedString.cs:31:26:31:27 | 10 |
+| GuardedString.cs:31:26:31:27 | 10 | GuardedString.cs:34:9:37:40 | if (...) ... |
+| GuardedString.cs:34:9:37:40 | if (...) ... | GuardedString.cs:34:26:34:26 | 0 |
+| GuardedString.cs:34:26:34:26 | 0 | GuardedString.cs:35:31:35:31 | access to local variable s |
+| NullAlwaysBad.cs:7:29:7:29 | SSA param(s) | NullAlwaysBad.cs:9:30:9:30 | access to parameter s |
+| NullMaybeBad.cs:13:17:13:20 | null | NullMaybeBad.cs:7:27:7:27 | access to parameter o |
+| Params.cs:20:12:20:15 | null | Params.cs:14:17:14:20 | access to parameter args |
+| StringConcatenation.cs:14:16:14:23 | SSA def(s) | StringConcatenation.cs:15:16:15:16 | access to local variable s |
+| StringConcatenation.cs:15:16:15:16 | access to local variable s | StringConcatenation.cs:16:17:16:17 | access to local variable s |
 nodes
 | A.cs:7:16:7:40 | SSA def(synchronizedAlways) |
 | A.cs:8:15:8:32 | access to local variable synchronizedAlways |
@@ -415,6 +895,8 @@ nodes
 | E.cs:435:29:435:29 | SSA param(s) |
 | E.cs:437:13:437:21 | [true] ... is ... |
 | E.cs:439:13:439:13 | access to parameter s |
+| F.cs:7:16:7:23 | SSA def(o) |
+| F.cs:8:9:8:9 | access to local variable o |
 | Forwarding.cs:7:16:7:23 | SSA def(s) |
 | Forwarding.cs:9:13:9:30 | [false] !... |
 | Forwarding.cs:14:9:17:9 | if (...) ... |
@@ -452,482 +934,3 @@ nodes
 | StringConcatenation.cs:14:16:14:23 | SSA def(s) |
 | StringConcatenation.cs:15:16:15:16 | access to local variable s |
 | StringConcatenation.cs:16:17:16:17 | access to local variable s |
-edges
-| A.cs:7:16:7:40 | SSA def(synchronizedAlways) | A.cs:8:15:8:32 | access to local variable synchronizedAlways |
-| A.cs:7:16:7:40 | SSA def(synchronizedAlways) | A.cs:10:13:10:30 | access to local variable synchronizedAlways |
-| A.cs:16:15:16:30 | SSA def(arrayNull) | A.cs:17:9:17:17 | access to local variable arrayNull |
-| A.cs:26:15:26:32 | SSA def(arrayAccess) | A.cs:31:27:31:37 | access to local variable arrayAccess |
-| A.cs:26:15:26:32 | SSA def(arrayAccess) | A.cs:36:27:36:37 | access to local variable arrayAccess |
-| A.cs:27:18:27:35 | SSA def(fieldAccess) | A.cs:32:27:32:37 | access to local variable fieldAccess |
-| A.cs:27:18:27:35 | SSA def(fieldAccess) | A.cs:37:27:37:37 | access to local variable fieldAccess |
-| A.cs:28:16:28:34 | SSA def(methodAccess) | A.cs:33:28:33:39 | access to local variable methodAccess |
-| A.cs:28:16:28:34 | SSA def(methodAccess) | A.cs:38:15:38:26 | access to local variable methodAccess |
-| A.cs:29:16:29:32 | SSA def(methodCall) | A.cs:34:27:34:36 | access to local variable methodCall |
-| A.cs:29:16:29:32 | SSA def(methodCall) | A.cs:39:27:39:36 | access to local variable methodCall |
-| A.cs:48:16:48:28 | SSA def(varRef) | A.cs:50:9:50:14 | access to local variable varRef |
-| Assert.cs:13:9:13:25 | [b (line 7): false] SSA def(s) | Assert.cs:15:27:15:27 | access to local variable s |
-| Assert.cs:13:9:13:25 | [b (line 7): true] SSA def(s) | Assert.cs:15:27:15:27 | access to local variable s |
-| Assert.cs:21:9:21:25 | [b (line 7): false] SSA def(s) | Assert.cs:23:27:23:27 | access to local variable s |
-| Assert.cs:21:9:21:25 | [b (line 7): true] SSA def(s) | Assert.cs:23:27:23:27 | access to local variable s |
-| Assert.cs:29:9:29:25 | [b (line 7): false] SSA def(s) | Assert.cs:31:27:31:27 | access to local variable s |
-| Assert.cs:29:9:29:25 | [b (line 7): true] SSA def(s) | Assert.cs:31:27:31:27 | access to local variable s |
-| Assert.cs:45:9:45:25 | [b (line 7): true] SSA def(s) | Assert.cs:46:36:46:36 | [b (line 7): true] access to parameter b |
-| Assert.cs:46:23:46:36 | [true, b (line 7): true] ... && ... | Assert.cs:47:27:47:27 | access to local variable s |
-| Assert.cs:46:36:46:36 | [b (line 7): true] access to parameter b | Assert.cs:46:23:46:36 | [true, b (line 7): true] ... && ... |
-| Assert.cs:49:9:49:25 | [b (line 7): true] SSA def(s) | Assert.cs:50:38:50:38 | [b (line 7): true] access to parameter b |
-| Assert.cs:50:24:50:38 | [false] ... \|\| ... | Assert.cs:51:27:51:27 | access to local variable s |
-| Assert.cs:50:37:50:38 | [false] !... | Assert.cs:50:24:50:38 | [false] ... \|\| ... |
-| Assert.cs:50:38:50:38 | [b (line 7): true] access to parameter b | Assert.cs:50:37:50:38 | [false] !... |
-| B.cs:7:11:7:29 | SSA def(eqCallAlways) | B.cs:13:13:13:24 | access to local variable eqCallAlways |
-| B.cs:10:11:10:30 | SSA def(neqCallAlways) | B.cs:13:13:13:36 | ...; |
-| B.cs:10:11:10:30 | SSA def(neqCallAlways) | B.cs:15:9:16:26 | if (...) ... |
-| B.cs:13:13:13:36 | ...; | B.cs:15:9:16:26 | if (...) ... |
-| B.cs:15:9:16:26 | if (...) ... | B.cs:16:13:16:26 | ...; |
-| B.cs:15:9:16:26 | if (...) ... | B.cs:18:9:20:26 | if (...) ... |
-| B.cs:16:13:16:26 | ...; | B.cs:18:9:20:26 | if (...) ... |
-| B.cs:18:9:20:26 | if (...) ... | B.cs:18:25:18:27 | {...} |
-| B.cs:18:9:20:26 | if (...) ... | B.cs:20:13:20:26 | ...; |
-| B.cs:18:25:18:27 | {...} | B.cs:22:9:24:37 | if (...) ... |
-| B.cs:20:13:20:26 | ...; | B.cs:22:9:24:37 | if (...) ... |
-| B.cs:22:9:24:37 | if (...) ... | B.cs:24:13:24:25 | access to local variable neqCallAlways |
-| C.cs:10:16:10:23 | SSA def(o) | C.cs:11:17:11:28 | [false] !... |
-| C.cs:11:13:11:30 | [false] !... | C.cs:16:9:19:9 | if (...) ... |
-| C.cs:11:15:11:29 | [true] !... | C.cs:11:13:11:30 | [false] !... |
-| C.cs:11:17:11:28 | [false] !... | C.cs:11:15:11:29 | [true] !... |
-| C.cs:16:9:19:9 | if (...) ... | C.cs:16:13:16:24 | [true] !... |
-| C.cs:16:13:16:24 | [true] !... | C.cs:18:13:18:13 | access to local variable o |
-| C.cs:40:13:40:35 | SSA def(s) | C.cs:42:9:42:9 | access to local variable s |
-| C.cs:55:13:55:36 | SSA def(o2) | C.cs:57:9:57:10 | access to local variable o2 |
-| C.cs:62:13:62:46 | SSA def(o1) | C.cs:64:9:64:10 | access to local variable o1 |
-| C.cs:66:13:66:46 | SSA def(o2) | C.cs:68:9:68:10 | access to local variable o2 |
-| C.cs:94:13:94:45 | SSA def(o) | C.cs:95:15:95:15 | access to local variable o |
-| C.cs:94:13:94:45 | SSA def(o) | C.cs:96:13:96:13 | access to local variable o |
-| C.cs:102:13:102:23 | SSA def(list) | C.cs:103:27:103:30 | access to parameter list |
-| C.cs:102:13:102:23 | SSA def(list) | C.cs:103:27:103:30 | access to parameter list |
-| C.cs:103:9:107:9 | foreach (... ... in ...) ... | C.cs:103:22:103:22 | Int32 x |
-| C.cs:103:9:107:9 | foreach (... ... in ...) ... | C.cs:106:13:106:16 | access to parameter list |
-| C.cs:103:22:103:22 | Int32 x | C.cs:103:9:107:9 | foreach (... ... in ...) ... |
-| C.cs:103:27:103:30 | access to parameter list | C.cs:103:9:107:9 | foreach (... ... in ...) ... |
-| C.cs:159:9:159:16 | SSA def(s) | C.cs:162:13:162:13 | access to local variable s |
-| C.cs:167:9:167:16 | SSA def(s) | C.cs:170:13:170:13 | access to local variable s |
-| C.cs:178:13:178:20 | SSA def(s) | C.cs:177:13:177:13 | access to local variable s |
-| C.cs:193:9:193:16 | SSA def(s) | C.cs:196:13:196:13 | access to local variable s |
-| C.cs:197:13:197:20 | [b (line 192): true] SSA def(s) | C.cs:196:13:196:13 | access to local variable s |
-| C.cs:201:16:201:19 | true | C.cs:203:13:203:13 | access to local variable s |
-| C.cs:204:13:204:20 | SSA def(s) | C.cs:201:16:201:19 | true |
-| C.cs:210:13:210:35 | SSA def(s) | C.cs:217:9:218:25 | if (...) ... |
-| C.cs:214:13:214:20 | SSA def(s) | C.cs:217:9:218:25 | if (...) ... |
-| C.cs:217:9:218:25 | if (...) ... | C.cs:218:13:218:13 | access to local variable s |
-| C.cs:222:13:222:20 | SSA def(s) | C.cs:223:9:223:9 | access to local variable s |
-| C.cs:229:22:229:22 | access to local variable s | C.cs:233:9:233:9 | access to local variable s |
-| C.cs:229:33:229:40 | SSA def(s) | C.cs:229:22:229:22 | access to local variable s |
-| C.cs:235:14:235:21 | SSA def(s) | C.cs:235:24:235:24 | access to local variable s |
-| C.cs:235:24:235:24 | access to local variable s | C.cs:237:13:237:13 | access to local variable s |
-| C.cs:235:35:235:42 | SSA def(s) | C.cs:235:24:235:24 | access to local variable s |
-| C.cs:240:24:240:31 | SSA def(s) | C.cs:242:13:242:13 | access to local variable s |
-| C.cs:248:15:248:22 | SSA def(a) | C.cs:249:9:249:9 | access to local variable a |
-| C.cs:257:15:257:23 | SSA def(ia) | C.cs:260:9:260:10 | access to local variable ia |
-| C.cs:257:15:257:23 | SSA def(ia) | C.cs:263:9:263:10 | access to local variable ia |
-| C.cs:258:18:258:26 | SSA def(sa) | C.cs:261:20:261:21 | access to local variable sa |
-| C.cs:258:18:258:26 | SSA def(sa) | C.cs:264:16:264:17 | access to local variable sa |
-| D.cs:17:17:17:20 | null | D.cs:23:9:23:13 | access to parameter param |
-| D.cs:26:32:26:36 | SSA param(param) | D.cs:32:9:32:13 | access to parameter param |
-| D.cs:58:13:58:41 | SSA def(o5) | D.cs:61:9:62:26 | if (...) ... |
-| D.cs:61:9:62:26 | if (...) ... | D.cs:62:13:62:14 | access to local variable o5 |
-| D.cs:68:13:68:34 | SSA def(o7) | D.cs:69:18:69:36 | ... && ... |
-| D.cs:69:18:69:36 | ... && ... | D.cs:73:13:73:14 | access to local variable o7 |
-| D.cs:75:13:75:34 | SSA def(o8) | D.cs:76:34:76:35 | 42 |
-| D.cs:76:21:76:43 | ... ? ... : ... | D.cs:79:9:80:26 | if (...) ... |
-| D.cs:76:34:76:35 | 42 | D.cs:76:21:76:43 | ... ? ... : ... |
-| D.cs:79:9:80:26 | if (...) ... | D.cs:81:9:82:26 | if (...) ... |
-| D.cs:81:9:82:26 | if (...) ... | D.cs:82:13:82:14 | access to local variable o8 |
-| D.cs:81:9:82:26 | if (...) ... | D.cs:82:13:82:26 | ...; |
-| D.cs:81:9:82:26 | if (...) ... | D.cs:83:9:84:26 | if (...) ... |
-| D.cs:82:13:82:26 | ...; | D.cs:83:9:84:26 | if (...) ... |
-| D.cs:83:9:84:26 | if (...) ... | D.cs:84:13:84:14 | access to local variable o8 |
-| D.cs:89:15:89:44 | SSA def(xs) | D.cs:91:13:91:14 | access to local variable xs |
-| D.cs:89:15:89:44 | SSA def(xs) | D.cs:91:13:91:22 | ...; |
-| D.cs:89:15:89:44 | SSA def(xs) | D.cs:93:9:94:30 | if (...) ... |
-| D.cs:91:13:91:22 | ...; | D.cs:93:9:94:30 | if (...) ... |
-| D.cs:93:9:94:30 | if (...) ... | D.cs:94:13:94:30 | ...; |
-| D.cs:93:9:94:30 | if (...) ... | D.cs:94:21:94:22 | access to local variable xs |
-| D.cs:93:9:94:30 | if (...) ... | D.cs:96:9:99:9 | if (...) ... |
-| D.cs:94:13:94:30 | ...; | D.cs:96:9:99:9 | if (...) ... |
-| D.cs:96:9:99:9 | if (...) ... | D.cs:97:9:99:9 | {...} |
-| D.cs:96:9:99:9 | if (...) ... | D.cs:98:21:98:22 | access to local variable xs |
-| D.cs:96:9:99:9 | if (...) ... | D.cs:101:9:102:35 | if (...) ... |
-| D.cs:97:9:99:9 | {...} | D.cs:101:9:102:35 | if (...) ... |
-| D.cs:101:9:102:35 | if (...) ... | D.cs:102:31:102:32 | access to local variable xs |
-| D.cs:101:9:102:35 | if (...) ... | D.cs:102:31:102:32 | access to local variable xs |
-| D.cs:101:9:102:35 | if (...) ... | D.cs:104:9:106:30 | if (...) ... |
-| D.cs:102:13:102:35 | foreach (... ... in ...) ... | D.cs:102:26:102:26 | Int32 _ |
-| D.cs:102:13:102:35 | foreach (... ... in ...) ... | D.cs:104:9:106:30 | if (...) ... |
-| D.cs:102:26:102:26 | Int32 _ | D.cs:102:13:102:35 | foreach (... ... in ...) ... |
-| D.cs:102:31:102:32 | access to local variable xs | D.cs:102:13:102:35 | foreach (... ... in ...) ... |
-| D.cs:104:9:106:30 | if (...) ... | D.cs:105:19:105:20 | access to local variable xs |
-| D.cs:104:9:106:30 | if (...) ... | D.cs:106:17:106:18 | access to local variable xs |
-| D.cs:118:9:118:30 | SSA def(x) | D.cs:120:13:120:13 | access to local variable x |
-| D.cs:125:35:125:35 | SSA param(a) | D.cs:127:32:127:32 | 0 |
-| D.cs:125:35:125:35 | SSA param(a) | D.cs:127:32:127:32 | 0 |
-| D.cs:125:44:125:44 | SSA param(b) | D.cs:127:32:127:32 | 0 |
-| D.cs:125:44:125:44 | SSA param(b) | D.cs:127:36:127:36 | access to parameter a |
-| D.cs:127:20:127:43 | ... ? ... : ... | D.cs:128:32:128:32 | 0 |
-| D.cs:127:20:127:43 | ... ? ... : ... | D.cs:128:32:128:32 | 0 |
-| D.cs:127:20:127:43 | ... ? ... : ... | D.cs:128:36:128:36 | access to parameter b |
-| D.cs:127:32:127:32 | 0 | D.cs:127:20:127:43 | ... ? ... : ... |
-| D.cs:127:32:127:32 | 0 | D.cs:127:20:127:43 | ... ? ... : ... |
-| D.cs:127:36:127:36 | access to parameter a | D.cs:127:20:127:43 | ... ? ... : ... |
-| D.cs:128:20:128:43 | ... ? ... : ... | D.cs:131:9:137:9 | {...} |
-| D.cs:128:20:128:43 | ... ? ... : ... | D.cs:131:9:137:9 | {...} |
-| D.cs:128:20:128:43 | ... ? ... : ... | D.cs:138:9:138:18 | ... ...; |
-| D.cs:128:32:128:32 | 0 | D.cs:128:20:128:43 | ... ? ... : ... |
-| D.cs:128:32:128:32 | 0 | D.cs:128:20:128:43 | ... ? ... : ... |
-| D.cs:128:36:128:36 | access to parameter b | D.cs:128:20:128:43 | ... ? ... : ... |
-| D.cs:131:9:137:9 | {...} | D.cs:132:29:132:29 | access to local variable i |
-| D.cs:131:9:137:9 | {...} | D.cs:132:29:132:29 | access to local variable i |
-| D.cs:132:29:132:29 | access to local variable i | D.cs:133:13:136:13 | {...} |
-| D.cs:132:29:132:29 | access to local variable i | D.cs:133:13:136:13 | {...} |
-| D.cs:132:29:132:29 | access to local variable i | D.cs:134:24:134:24 | access to parameter a |
-| D.cs:132:29:132:29 | access to local variable i | D.cs:135:24:135:24 | access to parameter b |
-| D.cs:132:29:132:29 | access to local variable i | D.cs:138:9:138:18 | ... ...; |
-| D.cs:133:13:136:13 | {...} | D.cs:132:29:132:29 | access to local variable i |
-| D.cs:133:13:136:13 | {...} | D.cs:132:29:132:29 | access to local variable i |
-| D.cs:138:9:138:18 | ... ...; | D.cs:142:13:142:22 | ...; |
-| D.cs:142:13:142:22 | ...; | D.cs:143:9:146:9 | for (...;...;...) ... |
-| D.cs:143:9:146:9 | for (...;...;...) ... | D.cs:143:25:143:25 | access to local variable i |
-| D.cs:143:25:143:25 | access to local variable i | D.cs:144:9:146:9 | {...} |
-| D.cs:143:25:143:25 | access to local variable i | D.cs:145:20:145:20 | access to parameter a |
-| D.cs:144:9:146:9 | {...} | D.cs:143:25:143:25 | access to local variable i |
-| D.cs:149:36:149:38 | SSA param(obj) | D.cs:151:9:151:11 | access to parameter obj |
-| D.cs:163:16:163:25 | SSA def(obj) | D.cs:168:9:170:9 | [exception: Exception] catch (...) {...} |
-| D.cs:168:9:170:9 | [exception: Exception] catch (...) {...} | D.cs:168:26:168:26 | [exception: Exception] Exception e |
-| D.cs:168:26:168:26 | [exception: Exception] Exception e | D.cs:171:9:171:11 | access to local variable obj |
-| D.cs:240:9:240:16 | SSA def(o) | D.cs:241:29:241:32 | null |
-| D.cs:240:9:240:16 | SSA def(o) | D.cs:241:36:241:37 | "" |
-| D.cs:241:21:241:37 | ... ? ... : ... | D.cs:244:9:247:25 | if (...) ... |
-| D.cs:241:29:241:32 | null | D.cs:241:21:241:37 | ... ? ... : ... |
-| D.cs:241:36:241:37 | "" | D.cs:241:21:241:37 | ... ? ... : ... |
-| D.cs:244:9:247:25 | if (...) ... | D.cs:245:13:245:13 | access to local variable o |
-| D.cs:244:9:247:25 | if (...) ... | D.cs:247:13:247:13 | access to local variable o |
-| D.cs:249:13:249:38 | SSA def(o2) | D.cs:253:13:253:14 | access to local variable o2 |
-| D.cs:258:16:258:23 | SSA def(o) | D.cs:266:9:267:25 | if (...) ... |
-| D.cs:266:9:267:25 | if (...) ... | D.cs:266:13:266:27 | [true] ... is ... |
-| D.cs:266:13:266:27 | [true] ... is ... | D.cs:267:13:267:13 | access to local variable o |
-| D.cs:269:9:269:16 | SSA def(o) | D.cs:272:25:272:25 | access to local variable i |
-| D.cs:272:25:272:25 | access to local variable i | D.cs:273:9:288:9 | {...} |
-| D.cs:272:25:272:25 | access to local variable i | D.cs:290:9:291:25 | if (...) ... |
-| D.cs:272:39:272:39 | access to local variable i | D.cs:272:25:272:25 | access to local variable i |
-| D.cs:273:9:288:9 | {...} | D.cs:281:13:287:13 | if (...) ... |
-| D.cs:281:13:287:13 | if (...) ... | D.cs:272:39:272:39 | access to local variable i |
-| D.cs:283:17:283:24 | SSA def(o) | D.cs:285:28:285:30 | {...} |
-| D.cs:283:17:283:24 | SSA def(o) | D.cs:286:17:286:30 | ...; |
-| D.cs:285:28:285:30 | {...} | D.cs:286:17:286:30 | ...; |
-| D.cs:286:17:286:30 | ...; | D.cs:272:39:272:39 | access to local variable i |
-| D.cs:290:9:291:25 | if (...) ... | D.cs:291:13:291:13 | access to local variable o |
-| D.cs:290:9:291:25 | if (...) ... | D.cs:291:13:291:25 | ...; |
-| D.cs:290:9:291:25 | if (...) ... | D.cs:293:9:294:25 | if (...) ... |
-| D.cs:291:13:291:25 | ...; | D.cs:293:9:294:25 | if (...) ... |
-| D.cs:293:9:294:25 | if (...) ... | D.cs:294:13:294:13 | access to local variable o |
-| D.cs:296:16:296:26 | SSA def(prev) | D.cs:297:25:297:25 | access to local variable i |
-| D.cs:297:25:297:25 | access to local variable i | D.cs:298:9:302:9 | {...} |
-| D.cs:298:9:302:9 | {...} | D.cs:300:17:300:20 | access to local variable prev |
-| D.cs:304:16:304:23 | SSA def(s) | D.cs:307:13:311:13 | foreach (... ... in ...) ... |
-| D.cs:307:13:311:13 | foreach (... ... in ...) ... | D.cs:312:13:313:29 | if (...) ... |
-| D.cs:312:13:313:29 | if (...) ... | D.cs:312:17:312:23 | [true] !... |
-| D.cs:312:17:312:23 | [true] !... | D.cs:313:17:313:17 | access to local variable s |
-| D.cs:316:16:316:23 | SSA def(r) | D.cs:318:16:318:19 | access to local variable stat |
-| D.cs:318:16:318:19 | access to local variable stat | D.cs:318:16:318:62 | [false] ... && ... |
-| D.cs:318:16:318:19 | access to local variable stat | D.cs:318:41:318:44 | access to local variable stat |
-| D.cs:318:16:318:62 | [false] ... && ... | D.cs:324:9:324:9 | access to local variable r |
-| D.cs:318:41:318:44 | access to local variable stat | D.cs:318:16:318:62 | [false] ... && ... |
-| D.cs:351:15:351:22 | SSA def(a) | D.cs:355:9:356:21 | for (...;...;...) ... |
-| D.cs:355:9:356:21 | for (...;...;...) ... | D.cs:355:25:355:25 | access to local variable i |
-| D.cs:355:25:355:25 | access to local variable i | D.cs:356:13:356:13 | access to local variable a |
-| D.cs:355:25:355:25 | access to local variable i | D.cs:356:13:356:21 | ...; |
-| D.cs:356:13:356:21 | ...; | D.cs:355:25:355:25 | access to local variable i |
-| D.cs:360:20:360:30 | SSA def(last) | D.cs:361:29:361:29 | access to local variable i |
-| D.cs:361:29:361:29 | access to local variable i | D.cs:363:13:363:16 | access to local variable last |
-| D.cs:366:15:366:47 | SSA def(b) | D.cs:367:13:367:56 | [false] ... && ... |
-| D.cs:367:13:367:56 | [false] ... && ... | D.cs:370:9:373:9 | for (...;...;...) ... |
-| D.cs:370:9:373:9 | for (...;...;...) ... | D.cs:370:25:370:25 | access to local variable i |
-| D.cs:370:25:370:25 | access to local variable i | D.cs:371:9:373:9 | {...} |
-| D.cs:370:25:370:25 | access to local variable i | D.cs:372:13:372:13 | access to local variable b |
-| D.cs:371:9:373:9 | {...} | D.cs:370:25:370:25 | access to local variable i |
-| D.cs:378:19:378:28 | SSA def(ioe) | D.cs:382:9:385:27 | if (...) ... |
-| D.cs:382:9:385:27 | if (...) ... | D.cs:385:13:385:15 | access to local variable ioe |
-| D.cs:388:36:388:36 | SSA param(a) | D.cs:390:32:390:32 | 0 |
-| D.cs:388:45:388:45 | SSA param(b) | D.cs:390:32:390:32 | 0 |
-| D.cs:388:45:388:45 | SSA param(b) | D.cs:390:36:390:36 | access to parameter a |
-| D.cs:390:20:390:43 | ... ? ... : ... | D.cs:393:21:393:21 | access to local variable i |
-| D.cs:390:20:390:43 | ... ? ... : ... | D.cs:393:21:393:21 | access to local variable i |
-| D.cs:390:32:390:32 | 0 | D.cs:390:20:390:43 | ... ? ... : ... |
-| D.cs:390:32:390:32 | 0 | D.cs:390:20:390:43 | ... ? ... : ... |
-| D.cs:390:36:390:36 | access to parameter a | D.cs:390:20:390:43 | ... ? ... : ... |
-| D.cs:393:21:393:21 | access to local variable i | D.cs:394:9:396:9 | {...} |
-| D.cs:393:21:393:21 | access to local variable i | D.cs:394:9:396:9 | {...} |
-| D.cs:393:21:393:21 | access to local variable i | D.cs:395:20:395:20 | access to parameter a |
-| D.cs:393:21:393:21 | access to local variable i | D.cs:397:9:397:44 | ... ...; |
-| D.cs:394:9:396:9 | {...} | D.cs:393:21:393:21 | access to local variable i |
-| D.cs:394:9:396:9 | {...} | D.cs:393:21:393:21 | access to local variable i |
-| D.cs:397:9:397:44 | ... ...; | D.cs:397:32:397:32 | 0 |
-| D.cs:397:20:397:43 | ... ? ... : ... | D.cs:398:21:398:21 | access to local variable i |
-| D.cs:397:32:397:32 | 0 | D.cs:397:20:397:43 | ... ? ... : ... |
-| D.cs:398:21:398:21 | access to local variable i | D.cs:399:9:401:9 | {...} |
-| D.cs:398:21:398:21 | access to local variable i | D.cs:400:20:400:20 | access to parameter b |
-| D.cs:399:9:401:9 | {...} | D.cs:398:21:398:21 | access to local variable i |
-| D.cs:405:35:405:35 | SSA param(x) | D.cs:407:14:407:35 | [false] ... && ... |
-| D.cs:405:35:405:35 | SSA param(x) | D.cs:407:14:407:35 | [false] ... && ... |
-| D.cs:405:35:405:35 | SSA param(x) | D.cs:407:14:407:35 | [false] ... && ... |
-| D.cs:405:45:405:45 | SSA param(y) | D.cs:407:14:407:35 | [false] ... && ... |
-| D.cs:405:45:405:45 | SSA param(y) | D.cs:407:14:407:35 | [false] ... && ... |
-| D.cs:405:45:405:45 | SSA param(y) | D.cs:407:14:407:35 | [false] ... && ... |
-| D.cs:407:13:407:64 | [false] ... \|\| ... | D.cs:409:9:410:25 | if (...) ... |
-| D.cs:407:13:407:64 | [false] ... \|\| ... | D.cs:409:9:410:25 | if (...) ... |
-| D.cs:407:14:407:35 | [false] ... && ... | D.cs:407:42:407:42 | access to parameter x |
-| D.cs:407:14:407:35 | [false] ... && ... | D.cs:407:42:407:42 | access to parameter x |
-| D.cs:407:42:407:42 | access to parameter x | D.cs:407:42:407:63 | [false] ... && ... |
-| D.cs:407:42:407:42 | access to parameter x | D.cs:407:55:407:55 | access to parameter y |
-| D.cs:407:42:407:42 | access to parameter x | D.cs:407:55:407:55 | access to parameter y |
-| D.cs:407:42:407:63 | [false] ... && ... | D.cs:407:13:407:64 | [false] ... \|\| ... |
-| D.cs:407:42:407:63 | [false] ... && ... | D.cs:407:13:407:64 | [false] ... \|\| ... |
-| D.cs:407:55:407:55 | access to parameter y | D.cs:407:42:407:63 | [false] ... && ... |
-| D.cs:407:55:407:55 | access to parameter y | D.cs:407:42:407:63 | [false] ... && ... |
-| D.cs:409:9:410:25 | if (...) ... | D.cs:410:13:410:13 | access to parameter y |
-| D.cs:409:9:410:25 | if (...) ... | D.cs:411:9:412:25 | if (...) ... |
-| D.cs:411:9:412:25 | if (...) ... | D.cs:412:13:412:13 | access to parameter x |
-| E.cs:9:18:9:26 | SSA def(a2) | E.cs:10:22:10:54 | ... && ... |
-| E.cs:10:22:10:54 | ... && ... | E.cs:12:38:12:39 | access to local variable a2 |
-| E.cs:11:16:11:24 | SSA def(a3) | E.cs:12:22:12:52 | ... && ... |
-| E.cs:12:22:12:52 | ... && ... | E.cs:14:13:14:14 | access to local variable a3 |
-| E.cs:23:13:23:30 | SSA def(s1) | E.cs:24:33:24:36 | null |
-| E.cs:24:18:24:41 | ... ? ... : ... | E.cs:26:9:27:26 | if (...) ... |
-| E.cs:24:33:24:36 | null | E.cs:24:18:24:41 | ... ? ... : ... |
-| E.cs:26:9:27:26 | if (...) ... | E.cs:27:13:27:14 | access to local variable s1 |
-| E.cs:51:22:51:33 | SSA def(slice) | E.cs:53:16:53:19 | access to local variable iter |
-| E.cs:53:16:53:19 | access to local variable iter | E.cs:54:9:63:9 | {...} |
-| E.cs:54:9:63:9 | {...} | E.cs:61:13:61:17 | access to local variable slice |
-| E.cs:54:9:63:9 | {...} | E.cs:61:13:61:27 | ...; |
-| E.cs:61:13:61:27 | ...; | E.cs:53:16:53:19 | access to local variable iter |
-| E.cs:66:40:66:42 | SSA param(arr) | E.cs:70:13:70:50 | ...; |
-| E.cs:66:40:66:42 | SSA param(arr) | E.cs:72:9:73:23 | if (...) ... |
-| E.cs:70:13:70:50 | ...; | E.cs:70:36:70:36 | 0 |
-| E.cs:70:22:70:49 | ... ? ... : ... | E.cs:72:9:73:23 | if (...) ... |
-| E.cs:70:36:70:36 | 0 | E.cs:70:22:70:49 | ... ? ... : ... |
-| E.cs:72:9:73:23 | if (...) ... | E.cs:73:13:73:15 | access to parameter arr |
-| E.cs:107:15:107:25 | SSA def(arr2) | E.cs:111:9:112:30 | for (...;...;...) ... |
-| E.cs:111:9:112:30 | for (...;...;...) ... | E.cs:111:25:111:25 | access to local variable i |
-| E.cs:111:25:111:25 | access to local variable i | E.cs:112:13:112:16 | access to local variable arr2 |
-| E.cs:111:25:111:25 | access to local variable i | E.cs:112:13:112:30 | ...; |
-| E.cs:112:13:112:30 | ...; | E.cs:111:25:111:25 | access to local variable i |
-| E.cs:120:16:120:20 | [true] !... | E.cs:121:9:143:9 | {...} |
-| E.cs:120:17:120:20 | access to local variable stop | E.cs:120:16:120:20 | [true] !... |
-| E.cs:121:9:143:9 | {...} | E.cs:123:21:123:24 | access to local variable stop |
-| E.cs:123:20:123:24 | [false] !... | E.cs:123:20:123:35 | [false] ... && ... |
-| E.cs:123:20:123:24 | [true] !... | E.cs:123:29:123:29 | access to local variable j |
-| E.cs:123:20:123:35 | [false] ... && ... | E.cs:120:17:120:20 | access to local variable stop |
-| E.cs:123:20:123:35 | [true] ... && ... | E.cs:124:13:142:13 | {...} |
-| E.cs:123:20:123:35 | [true] ... && ... | E.cs:125:33:125:35 | access to local variable obj |
-| E.cs:123:21:123:24 | access to local variable stop | E.cs:123:20:123:24 | [false] !... |
-| E.cs:123:21:123:24 | access to local variable stop | E.cs:123:20:123:24 | [true] !... |
-| E.cs:123:29:123:29 | access to local variable j | E.cs:123:20:123:35 | [false] ... && ... |
-| E.cs:123:29:123:29 | access to local variable j | E.cs:123:20:123:35 | [true] ... && ... |
-| E.cs:124:13:142:13 | {...} | E.cs:128:21:128:23 | access to local variable obj |
-| E.cs:124:13:142:13 | {...} | E.cs:141:17:141:26 | ...; |
-| E.cs:137:25:137:34 | SSA def(obj) | E.cs:139:21:139:29 | continue; |
-| E.cs:139:21:139:29 | continue; | E.cs:123:21:123:24 | access to local variable stop |
-| E.cs:141:17:141:26 | ...; | E.cs:123:21:123:24 | access to local variable stop |
-| E.cs:152:16:152:26 | SSA def(obj2) | E.cs:153:13:153:54 | [false] ... && ... |
-| E.cs:153:13:153:54 | [false] ... && ... | E.cs:158:9:159:28 | if (...) ... |
-| E.cs:158:9:159:28 | if (...) ... | E.cs:159:13:159:16 | access to local variable obj2 |
-| E.cs:162:28:162:28 | SSA param(a) | E.cs:164:29:164:29 | 0 |
-| E.cs:164:17:164:40 | ... ? ... : ... | E.cs:165:25:165:25 | access to local variable i |
-| E.cs:164:29:164:29 | 0 | E.cs:164:17:164:40 | ... ? ... : ... |
-| E.cs:165:25:165:25 | access to local variable i | E.cs:166:9:170:9 | {...} |
-| E.cs:165:25:165:25 | access to local variable i | E.cs:167:21:167:21 | access to parameter a |
-| E.cs:165:32:165:32 | access to local variable i | E.cs:165:25:165:25 | access to local variable i |
-| E.cs:166:9:170:9 | {...} | E.cs:165:32:165:32 | access to local variable i |
-| E.cs:173:29:173:31 | SSA param(obj) | E.cs:175:33:175:37 | false |
-| E.cs:173:29:173:31 | SSA param(obj) | E.cs:175:33:175:37 | false |
-| E.cs:175:19:175:42 | ... ? ... : ... | E.cs:177:9:179:9 | {...} |
-| E.cs:175:19:175:42 | ... ? ... : ... | E.cs:178:13:178:15 | access to parameter obj |
-| E.cs:175:19:175:42 | ... ? ... : ... | E.cs:180:9:183:9 | if (...) ... |
-| E.cs:175:33:175:37 | false | E.cs:175:19:175:42 | ... ? ... : ... |
-| E.cs:177:9:179:9 | {...} | E.cs:180:9:183:9 | if (...) ... |
-| E.cs:180:9:183:9 | if (...) ... | E.cs:181:9:183:9 | {...} |
-| E.cs:181:9:183:9 | {...} | E.cs:184:9:187:9 | if (...) ... |
-| E.cs:184:9:187:9 | if (...) ... | E.cs:186:13:186:15 | access to parameter obj |
-| E.cs:190:29:190:29 | SSA param(o) | E.cs:192:17:192:17 | access to parameter o |
-| E.cs:198:13:198:29 | [b (line 196): false] SSA def(o) | E.cs:203:13:203:13 | access to local variable o |
-| E.cs:198:13:198:29 | [b (line 196): true] SSA def(o) | E.cs:201:13:201:13 | access to local variable o |
-| E.cs:206:28:206:28 | SSA param(s) | E.cs:208:13:208:23 | [false] ... is ... |
-| E.cs:208:13:208:23 | [false] ... is ... | E.cs:210:16:210:16 | access to parameter s |
-| E.cs:217:13:217:20 | [b (line 213): true] SSA def(x) | E.cs:218:9:218:9 | access to local variable x |
-| E.cs:217:13:217:20 | [b (line 213): true] SSA def(x) | E.cs:220:13:220:13 | access to local variable x |
-| E.cs:227:13:227:20 | [b (line 223): true] SSA def(x) | E.cs:229:13:229:13 | access to local variable x |
-| E.cs:227:13:227:20 | [b (line 223): true] SSA def(x) | E.cs:229:13:229:25 | ...; |
-| E.cs:229:13:229:25 | ...; | E.cs:230:9:230:9 | access to local variable x |
-| E.cs:233:26:233:26 | SSA param(i) | E.cs:235:16:235:16 | access to parameter i |
-| E.cs:238:26:238:26 | SSA param(i) | E.cs:240:21:240:21 | access to parameter i |
-| E.cs:283:13:283:22 | [b (line 279): false] SSA def(o) | E.cs:285:9:285:9 | access to local variable o |
-| E.cs:283:13:283:22 | [b (line 279): true] SSA def(o) | E.cs:285:9:285:9 | access to local variable o |
-| E.cs:301:13:301:27 | SSA def(s) | E.cs:302:9:302:9 | access to local variable s |
-| E.cs:319:29:319:30 | SSA param(s1) | E.cs:321:20:321:21 | access to parameter s2 |
-| E.cs:321:13:321:30 | [true] ... is ... | E.cs:323:13:323:14 | access to parameter s1 |
-| E.cs:321:14:321:21 | ... ?? ... | E.cs:321:13:321:30 | [true] ... is ... |
-| E.cs:321:20:321:21 | access to parameter s2 | E.cs:321:14:321:21 | ... ?? ... |
-| E.cs:330:13:330:36 | SSA def(x) | E.cs:331:9:331:9 | access to local variable x |
-| E.cs:342:13:342:32 | SSA def(x) | E.cs:343:9:343:9 | access to local variable x |
-| E.cs:348:17:348:36 | SSA def(x) | E.cs:349:9:349:9 | access to local variable x |
-| E.cs:366:28:366:28 | SSA param(s) | E.cs:366:41:366:41 | access to parameter s |
-| E.cs:374:17:374:31 | SSA def(s) | E.cs:375:20:375:20 | access to local variable s |
-| E.cs:380:24:380:25 | SSA param(e1) | E.cs:382:28:382:29 | access to parameter e2 |
-| E.cs:380:24:380:25 | SSA param(e1) | E.cs:382:28:382:29 | access to parameter e2 |
-| E.cs:380:24:380:25 | SSA param(e1) | E.cs:382:28:382:29 | access to parameter e2 |
-| E.cs:380:30:380:31 | SSA param(e2) | E.cs:382:14:382:37 | [false] ... && ... |
-| E.cs:380:30:380:31 | SSA param(e2) | E.cs:382:14:382:37 | [false] ... && ... |
-| E.cs:380:30:380:31 | SSA param(e2) | E.cs:382:14:382:37 | [false] ... && ... |
-| E.cs:380:30:380:31 | SSA param(e2) | E.cs:382:28:382:29 | access to parameter e2 |
-| E.cs:380:30:380:31 | SSA param(e2) | E.cs:382:28:382:29 | access to parameter e2 |
-| E.cs:380:30:380:31 | SSA param(e2) | E.cs:382:28:382:29 | access to parameter e2 |
-| E.cs:382:13:382:68 | [false] ... \|\| ... | E.cs:384:9:385:24 | if (...) ... |
-| E.cs:382:13:382:68 | [false] ... \|\| ... | E.cs:384:9:385:24 | if (...) ... |
-| E.cs:382:14:382:37 | [false] ... && ... | E.cs:382:44:382:45 | access to parameter e1 |
-| E.cs:382:14:382:37 | [false] ... && ... | E.cs:382:44:382:45 | access to parameter e1 |
-| E.cs:382:28:382:29 | access to parameter e2 | E.cs:382:14:382:37 | [false] ... && ... |
-| E.cs:382:28:382:29 | access to parameter e2 | E.cs:382:14:382:37 | [false] ... && ... |
-| E.cs:382:44:382:45 | access to parameter e1 | E.cs:382:44:382:67 | [false] ... && ... |
-| E.cs:382:44:382:45 | access to parameter e1 | E.cs:382:44:382:67 | [false] ... && ... |
-| E.cs:382:44:382:67 | [false] ... && ... | E.cs:382:13:382:68 | [false] ... \|\| ... |
-| E.cs:382:44:382:67 | [false] ... && ... | E.cs:382:13:382:68 | [false] ... \|\| ... |
-| E.cs:384:9:385:24 | if (...) ... | E.cs:384:13:384:36 | [false] ... && ... |
-| E.cs:384:9:385:24 | if (...) ... | E.cs:384:27:384:28 | access to parameter e2 |
-| E.cs:384:13:384:36 | [false] ... && ... | E.cs:386:16:386:17 | access to parameter e1 |
-| E.cs:384:13:384:36 | [false] ... && ... | E.cs:386:27:386:28 | access to parameter e2 |
-| E.cs:384:27:384:28 | access to parameter e2 | E.cs:384:13:384:36 | [false] ... && ... |
-| E.cs:404:9:404:18 | SSA def(i) | E.cs:405:16:405:16 | access to local variable i |
-| E.cs:404:9:404:18 | SSA def(i) | E.cs:405:16:405:16 | access to local variable i |
-| E.cs:417:24:417:40 | SSA capture def(i) | E.cs:417:34:417:34 | access to parameter i |
-| E.cs:423:28:423:44 | SSA capture def(i) | E.cs:423:38:423:38 | access to parameter i |
-| E.cs:430:29:430:45 | SSA capture def(i) | E.cs:430:39:430:39 | access to parameter i |
-| E.cs:435:29:435:29 | SSA param(s) | E.cs:437:13:437:21 | [true] ... is ... |
-| E.cs:437:13:437:21 | [true] ... is ... | E.cs:439:13:439:13 | access to parameter s |
-| Forwarding.cs:7:16:7:23 | SSA def(s) | Forwarding.cs:9:13:9:30 | [false] !... |
-| Forwarding.cs:9:13:9:30 | [false] !... | Forwarding.cs:14:9:17:9 | if (...) ... |
-| Forwarding.cs:14:9:17:9 | if (...) ... | Forwarding.cs:19:9:22:9 | if (...) ... |
-| Forwarding.cs:19:9:22:9 | if (...) ... | Forwarding.cs:19:13:19:23 | [false] !... |
-| Forwarding.cs:19:13:19:23 | [false] !... | Forwarding.cs:24:9:27:9 | if (...) ... |
-| Forwarding.cs:24:9:27:9 | if (...) ... | Forwarding.cs:29:9:32:9 | if (...) ... |
-| Forwarding.cs:29:9:32:9 | if (...) ... | Forwarding.cs:34:9:37:9 | if (...) ... |
-| Forwarding.cs:34:9:37:9 | if (...) ... | Forwarding.cs:35:9:37:9 | {...} |
-| Forwarding.cs:34:9:37:9 | if (...) ... | Forwarding.cs:36:31:36:31 | access to local variable s |
-| Forwarding.cs:35:9:37:9 | {...} | Forwarding.cs:40:27:40:27 | access to local variable s |
-| GuardedString.cs:7:16:7:32 | SSA def(s) | GuardedString.cs:9:13:9:36 | [false] !... |
-| GuardedString.cs:9:13:9:36 | [false] !... | GuardedString.cs:14:9:17:9 | if (...) ... |
-| GuardedString.cs:14:9:17:9 | if (...) ... | GuardedString.cs:14:13:14:41 | [false] !... |
-| GuardedString.cs:14:13:14:41 | [false] !... | GuardedString.cs:19:9:20:40 | if (...) ... |
-| GuardedString.cs:19:9:20:40 | if (...) ... | GuardedString.cs:19:26:19:26 | 0 |
-| GuardedString.cs:19:26:19:26 | 0 | GuardedString.cs:22:9:23:40 | if (...) ... |
-| GuardedString.cs:22:9:23:40 | if (...) ... | GuardedString.cs:22:25:22:25 | 0 |
-| GuardedString.cs:22:25:22:25 | 0 | GuardedString.cs:25:9:26:40 | if (...) ... |
-| GuardedString.cs:25:9:26:40 | if (...) ... | GuardedString.cs:25:26:25:26 | 0 |
-| GuardedString.cs:25:26:25:26 | 0 | GuardedString.cs:28:9:29:40 | if (...) ... |
-| GuardedString.cs:28:9:29:40 | if (...) ... | GuardedString.cs:28:25:28:26 | 10 |
-| GuardedString.cs:28:25:28:26 | 10 | GuardedString.cs:31:9:32:40 | if (...) ... |
-| GuardedString.cs:31:9:32:40 | if (...) ... | GuardedString.cs:31:26:31:27 | 10 |
-| GuardedString.cs:31:26:31:27 | 10 | GuardedString.cs:34:9:37:40 | if (...) ... |
-| GuardedString.cs:34:9:37:40 | if (...) ... | GuardedString.cs:34:26:34:26 | 0 |
-| GuardedString.cs:34:26:34:26 | 0 | GuardedString.cs:35:31:35:31 | access to local variable s |
-| NullAlwaysBad.cs:7:29:7:29 | SSA param(s) | NullAlwaysBad.cs:9:30:9:30 | access to parameter s |
-| NullMaybeBad.cs:13:17:13:20 | null | NullMaybeBad.cs:7:27:7:27 | access to parameter o |
-| Params.cs:20:12:20:15 | null | Params.cs:14:17:14:20 | access to parameter args |
-| StringConcatenation.cs:14:16:14:23 | SSA def(s) | StringConcatenation.cs:15:16:15:16 | access to local variable s |
-| StringConcatenation.cs:15:16:15:16 | access to local variable s | StringConcatenation.cs:16:17:16:17 | access to local variable s |
-#select
-| C.cs:64:9:64:10 | access to local variable o1 | C.cs:62:13:62:46 | SSA def(o1) | C.cs:64:9:64:10 | access to local variable o1 | Variable $@ may be null at this access because of $@ assignment. | C.cs:62:13:62:14 | o1 | o1 | C.cs:62:13:62:46 | Object o1 = ... | this |
-| C.cs:68:9:68:10 | access to local variable o2 | C.cs:66:13:66:46 | SSA def(o2) | C.cs:68:9:68:10 | access to local variable o2 | Variable $@ may be null at this access because of $@ assignment. | C.cs:66:13:66:14 | o2 | o2 | C.cs:66:13:66:46 | Object o2 = ... | this |
-| C.cs:95:15:95:15 | access to local variable o | C.cs:94:13:94:45 | SSA def(o) | C.cs:95:15:95:15 | access to local variable o | Variable $@ may be null at this access because of $@ assignment. | C.cs:94:13:94:13 | o | o | C.cs:94:13:94:45 | Object o = ... | this |
-| C.cs:103:27:103:30 | access to parameter list | C.cs:102:13:102:23 | SSA def(list) | C.cs:103:27:103:30 | access to parameter list | Variable $@ may be null at this access because of $@ assignment. | C.cs:99:42:99:45 | list | list | C.cs:102:13:102:23 | ... = ... | this |
-| C.cs:177:13:177:13 | access to local variable s | C.cs:178:13:178:20 | SSA def(s) | C.cs:177:13:177:13 | access to local variable s | Variable $@ may be null at this access because of $@ assignment. | C.cs:151:13:151:13 | s | s | C.cs:178:13:178:20 | ... = ... | this |
-| C.cs:203:13:203:13 | access to local variable s | C.cs:204:13:204:20 | SSA def(s) | C.cs:203:13:203:13 | access to local variable s | Variable $@ may be null at this access because of $@ assignment. | C.cs:185:13:185:13 | s | s | C.cs:204:13:204:20 | ... = ... | this |
-| C.cs:223:9:223:9 | access to local variable s | C.cs:222:13:222:20 | SSA def(s) | C.cs:223:9:223:9 | access to local variable s | Variable $@ may be null at this access because of $@ assignment. | C.cs:210:13:210:13 | s | s | C.cs:222:13:222:20 | ... = ... | this |
-| C.cs:242:13:242:13 | access to local variable s | C.cs:240:24:240:31 | SSA def(s) | C.cs:242:13:242:13 | access to local variable s | Variable $@ may be null at this access because of $@ assignment. | C.cs:228:16:228:16 | s | s | C.cs:240:24:240:31 | ... = ... | this |
-| D.cs:23:9:23:13 | access to parameter param | D.cs:17:17:17:20 | null | D.cs:23:9:23:13 | access to parameter param | Variable $@ may be null at this access because of $@ null argument. | D.cs:21:32:21:36 | param | param | D.cs:17:17:17:20 | null | this |
-| D.cs:32:9:32:13 | access to parameter param | D.cs:26:32:26:36 | SSA param(param) | D.cs:32:9:32:13 | access to parameter param | Variable $@ may be null at this access as suggested by $@ null check. | D.cs:26:32:26:36 | param | param | D.cs:28:13:28:25 | ... != ... | this |
-| D.cs:62:13:62:14 | access to local variable o5 | D.cs:58:13:58:41 | SSA def(o5) | D.cs:62:13:62:14 | access to local variable o5 | Variable $@ may be null at this access because of $@ assignment. | D.cs:58:13:58:14 | o5 | o5 | D.cs:58:13:58:41 | String o5 = ... | this |
-| D.cs:73:13:73:14 | access to local variable o7 | D.cs:68:13:68:34 | SSA def(o7) | D.cs:73:13:73:14 | access to local variable o7 | Variable $@ may be null at this access because of $@ assignment. | D.cs:68:13:68:14 | o7 | o7 | D.cs:68:13:68:34 | String o7 = ... | this |
-| D.cs:82:13:82:14 | access to local variable o8 | D.cs:75:13:75:34 | SSA def(o8) | D.cs:82:13:82:14 | access to local variable o8 | Variable $@ may be null at this access because of $@ assignment. | D.cs:75:13:75:14 | o8 | o8 | D.cs:75:13:75:34 | String o8 = ... | this |
-| D.cs:84:13:84:14 | access to local variable o8 | D.cs:75:13:75:34 | SSA def(o8) | D.cs:84:13:84:14 | access to local variable o8 | Variable $@ may be null at this access because of $@ assignment. | D.cs:75:13:75:14 | o8 | o8 | D.cs:75:13:75:34 | String o8 = ... | this |
-| D.cs:91:13:91:14 | access to local variable xs | D.cs:89:15:89:44 | SSA def(xs) | D.cs:91:13:91:14 | access to local variable xs | Variable $@ may be null at this access because of $@ assignment. | D.cs:89:15:89:16 | xs | xs | D.cs:89:15:89:44 | Int32[] xs = ... | this |
-| D.cs:94:21:94:22 | access to local variable xs | D.cs:89:15:89:44 | SSA def(xs) | D.cs:94:21:94:22 | access to local variable xs | Variable $@ may be null at this access because of $@ assignment. | D.cs:89:15:89:16 | xs | xs | D.cs:89:15:89:44 | Int32[] xs = ... | this |
-| D.cs:98:21:98:22 | access to local variable xs | D.cs:89:15:89:44 | SSA def(xs) | D.cs:98:21:98:22 | access to local variable xs | Variable $@ may be null at this access because of $@ assignment. | D.cs:89:15:89:16 | xs | xs | D.cs:89:15:89:44 | Int32[] xs = ... | this |
-| D.cs:102:31:102:32 | access to local variable xs | D.cs:89:15:89:44 | SSA def(xs) | D.cs:102:31:102:32 | access to local variable xs | Variable $@ may be null at this access because of $@ assignment. | D.cs:89:15:89:16 | xs | xs | D.cs:89:15:89:44 | Int32[] xs = ... | this |
-| D.cs:105:19:105:20 | access to local variable xs | D.cs:89:15:89:44 | SSA def(xs) | D.cs:105:19:105:20 | access to local variable xs | Variable $@ may be null at this access because of $@ assignment. | D.cs:89:15:89:16 | xs | xs | D.cs:89:15:89:44 | Int32[] xs = ... | this |
-| D.cs:134:24:134:24 | access to parameter a | D.cs:125:35:125:35 | SSA param(a) | D.cs:134:24:134:24 | access to parameter a | Variable $@ may be null at this access as suggested by $@ null check. | D.cs:125:35:125:35 | a | a | D.cs:127:20:127:28 | ... == ... | this |
-| D.cs:134:24:134:24 | access to parameter a | D.cs:125:35:125:35 | SSA param(a) | D.cs:134:24:134:24 | access to parameter a | Variable $@ may be null at this access as suggested by $@ null check. | D.cs:125:35:125:35 | a | a | D.cs:139:13:139:21 | ... != ... | this |
-| D.cs:135:24:135:24 | access to parameter b | D.cs:125:44:125:44 | SSA param(b) | D.cs:135:24:135:24 | access to parameter b | Variable $@ may be null at this access as suggested by $@ null check. | D.cs:125:44:125:44 | b | b | D.cs:128:20:128:28 | ... == ... | this |
-| D.cs:145:20:145:20 | access to parameter a | D.cs:125:35:125:35 | SSA param(a) | D.cs:145:20:145:20 | access to parameter a | Variable $@ may be null at this access as suggested by $@ null check. | D.cs:125:35:125:35 | a | a | D.cs:127:20:127:28 | ... == ... | this |
-| D.cs:145:20:145:20 | access to parameter a | D.cs:125:35:125:35 | SSA param(a) | D.cs:145:20:145:20 | access to parameter a | Variable $@ may be null at this access as suggested by $@ null check. | D.cs:125:35:125:35 | a | a | D.cs:139:13:139:21 | ... != ... | this |
-| D.cs:151:9:151:11 | access to parameter obj | D.cs:149:36:149:38 | SSA param(obj) | D.cs:151:9:151:11 | access to parameter obj | Variable $@ may be null at this access as suggested by $@ null check. | D.cs:149:36:149:38 | obj | obj | D.cs:152:17:152:27 | ... != ... | this |
-| D.cs:171:9:171:11 | access to local variable obj | D.cs:163:16:163:25 | SSA def(obj) | D.cs:171:9:171:11 | access to local variable obj | Variable $@ may be null at this access because of $@ assignment. | D.cs:163:16:163:18 | obj | obj | D.cs:163:16:163:25 | Object obj = ... | this |
-| D.cs:245:13:245:13 | access to local variable o | D.cs:240:9:240:16 | SSA def(o) | D.cs:245:13:245:13 | access to local variable o | Variable $@ may be null at this access because of $@ assignment. | D.cs:228:16:228:16 | o | o | D.cs:240:9:240:16 | ... = ... | this |
-| D.cs:247:13:247:13 | access to local variable o | D.cs:240:9:240:16 | SSA def(o) | D.cs:247:13:247:13 | access to local variable o | Variable $@ may be null at this access because of $@ assignment. | D.cs:228:16:228:16 | o | o | D.cs:240:9:240:16 | ... = ... | this |
-| D.cs:253:13:253:14 | access to local variable o2 | D.cs:249:13:249:38 | SSA def(o2) | D.cs:253:13:253:14 | access to local variable o2 | Variable $@ may be null at this access because of $@ assignment. | D.cs:249:13:249:14 | o2 | o2 | D.cs:249:13:249:38 | String o2 = ... | this |
-| D.cs:267:13:267:13 | access to local variable o | D.cs:258:16:258:23 | SSA def(o) | D.cs:267:13:267:13 | access to local variable o | Variable $@ may be null at this access because of $@ assignment. | D.cs:258:16:258:16 | o | o | D.cs:258:16:258:23 | Object o = ... | this |
-| D.cs:291:13:291:13 | access to local variable o | D.cs:269:9:269:16 | SSA def(o) | D.cs:291:13:291:13 | access to local variable o | Variable $@ may be null at this access because of $@ assignment. | D.cs:258:16:258:16 | o | o | D.cs:269:9:269:16 | ... = ... | this |
-| D.cs:291:13:291:13 | access to local variable o | D.cs:283:17:283:24 | SSA def(o) | D.cs:291:13:291:13 | access to local variable o | Variable $@ may be null at this access because of $@ assignment. | D.cs:258:16:258:16 | o | o | D.cs:283:17:283:24 | ... = ... | this |
-| D.cs:294:13:294:13 | access to local variable o | D.cs:269:9:269:16 | SSA def(o) | D.cs:294:13:294:13 | access to local variable o | Variable $@ may be null at this access because of $@ assignment. | D.cs:258:16:258:16 | o | o | D.cs:269:9:269:16 | ... = ... | this |
-| D.cs:294:13:294:13 | access to local variable o | D.cs:283:17:283:24 | SSA def(o) | D.cs:294:13:294:13 | access to local variable o | Variable $@ may be null at this access because of $@ assignment. | D.cs:258:16:258:16 | o | o | D.cs:283:17:283:24 | ... = ... | this |
-| D.cs:300:17:300:20 | access to local variable prev | D.cs:296:16:296:26 | SSA def(prev) | D.cs:300:17:300:20 | access to local variable prev | Variable $@ may be null at this access because of $@ assignment. | D.cs:296:16:296:19 | prev | prev | D.cs:296:16:296:26 | Object prev = ... | this |
-| D.cs:313:17:313:17 | access to local variable s | D.cs:304:16:304:23 | SSA def(s) | D.cs:313:17:313:17 | access to local variable s | Variable $@ may be null at this access because of $@ assignment. | D.cs:304:16:304:16 | s | s | D.cs:304:16:304:23 | String s = ... | this |
-| D.cs:324:9:324:9 | access to local variable r | D.cs:316:16:316:23 | SSA def(r) | D.cs:324:9:324:9 | access to local variable r | Variable $@ may be null at this access because of $@ assignment. | D.cs:316:16:316:16 | r | r | D.cs:316:16:316:23 | Object r = ... | this |
-| D.cs:356:13:356:13 | access to local variable a | D.cs:351:15:351:22 | SSA def(a) | D.cs:356:13:356:13 | access to local variable a | Variable $@ may be null at this access because of $@ assignment. | D.cs:351:15:351:15 | a | a | D.cs:351:15:351:22 | Int32[] a = ... | this |
-| D.cs:363:13:363:16 | access to local variable last | D.cs:360:20:360:30 | SSA def(last) | D.cs:363:13:363:16 | access to local variable last | Variable $@ may be null at this access because of $@ assignment. | D.cs:360:20:360:23 | last | last | D.cs:360:20:360:30 | String last = ... | this |
-| D.cs:372:13:372:13 | access to local variable b | D.cs:366:15:366:47 | SSA def(b) | D.cs:372:13:372:13 | access to local variable b | Variable $@ may be null at this access because of $@ assignment. | D.cs:366:15:366:15 | b | b | D.cs:366:15:366:47 | Int32[] b = ... | this |
-| D.cs:395:20:395:20 | access to parameter a | D.cs:388:36:388:36 | SSA param(a) | D.cs:395:20:395:20 | access to parameter a | Variable $@ may be null at this access as suggested by $@ null check. | D.cs:388:36:388:36 | a | a | D.cs:390:20:390:28 | ... == ... | this |
-| D.cs:400:20:400:20 | access to parameter b | D.cs:388:45:388:45 | SSA param(b) | D.cs:400:20:400:20 | access to parameter b | Variable $@ may be null at this access as suggested by $@ null check. | D.cs:388:45:388:45 | b | b | D.cs:397:20:397:28 | ... == ... | this |
-| D.cs:410:13:410:13 | access to parameter y | D.cs:405:45:405:45 | SSA param(y) | D.cs:410:13:410:13 | access to parameter y | Variable $@ may be null at this access as suggested by $@ null check. | D.cs:405:45:405:45 | y | y | D.cs:407:27:407:35 | ... == ... | this |
-| D.cs:410:13:410:13 | access to parameter y | D.cs:405:45:405:45 | SSA param(y) | D.cs:410:13:410:13 | access to parameter y | Variable $@ may be null at this access as suggested by $@ null check. | D.cs:405:45:405:45 | y | y | D.cs:407:55:407:63 | ... != ... | this |
-| D.cs:410:13:410:13 | access to parameter y | D.cs:405:45:405:45 | SSA param(y) | D.cs:410:13:410:13 | access to parameter y | Variable $@ may be null at this access as suggested by $@ null check. | D.cs:405:45:405:45 | y | y | D.cs:411:13:411:21 | ... != ... | this |
-| D.cs:412:13:412:13 | access to parameter x | D.cs:405:35:405:35 | SSA param(x) | D.cs:412:13:412:13 | access to parameter x | Variable $@ may be null at this access as suggested by $@ null check. | D.cs:405:35:405:35 | x | x | D.cs:407:14:407:22 | ... != ... | this |
-| D.cs:412:13:412:13 | access to parameter x | D.cs:405:35:405:35 | SSA param(x) | D.cs:412:13:412:13 | access to parameter x | Variable $@ may be null at this access as suggested by $@ null check. | D.cs:405:35:405:35 | x | x | D.cs:407:42:407:50 | ... == ... | this |
-| D.cs:412:13:412:13 | access to parameter x | D.cs:405:35:405:35 | SSA param(x) | D.cs:412:13:412:13 | access to parameter x | Variable $@ may be null at this access as suggested by $@ null check. | D.cs:405:35:405:35 | x | x | D.cs:409:13:409:21 | ... != ... | this |
-| E.cs:12:38:12:39 | access to local variable a2 | E.cs:9:18:9:26 | SSA def(a2) | E.cs:12:38:12:39 | access to local variable a2 | Variable $@ may be null at this access because of $@ assignment. | E.cs:9:18:9:19 | a2 | a2 | E.cs:9:18:9:26 | Int64[][] a2 = ... | this |
-| E.cs:14:13:14:14 | access to local variable a3 | E.cs:11:16:11:24 | SSA def(a3) | E.cs:14:13:14:14 | access to local variable a3 | Variable $@ may be null at this access because of $@ assignment. | E.cs:11:16:11:17 | a3 | a3 | E.cs:11:16:11:24 | Int64[] a3 = ... | this |
-| E.cs:27:13:27:14 | access to local variable s1 | E.cs:23:13:23:30 | SSA def(s1) | E.cs:27:13:27:14 | access to local variable s1 | Variable $@ may be null at this access because of $@ assignment. | E.cs:19:13:19:14 | s1 | s1 | E.cs:23:13:23:30 | ... = ... | this |
-| E.cs:61:13:61:17 | access to local variable slice | E.cs:51:22:51:33 | SSA def(slice) | E.cs:61:13:61:17 | access to local variable slice | Variable $@ may be null at this access because of $@ assignment. | E.cs:51:22:51:26 | slice | slice | E.cs:51:22:51:33 | List<String> slice = ... | this |
-| E.cs:73:13:73:15 | access to parameter arr | E.cs:66:40:66:42 | SSA param(arr) | E.cs:73:13:73:15 | access to parameter arr | Variable $@ may be null at this access as suggested by $@ null check. | E.cs:66:40:66:42 | arr | arr | E.cs:70:22:70:32 | ... == ... | this |
-| E.cs:112:13:112:16 | access to local variable arr2 | E.cs:107:15:107:25 | SSA def(arr2) | E.cs:112:13:112:16 | access to local variable arr2 | Variable $@ may be null at this access because of $@ assignment. | E.cs:107:15:107:18 | arr2 | arr2 | E.cs:107:15:107:25 | Int32[] arr2 = ... | this |
-| E.cs:125:33:125:35 | access to local variable obj | E.cs:137:25:137:34 | SSA def(obj) | E.cs:125:33:125:35 | access to local variable obj | Variable $@ may be null at this access because of $@ assignment. | E.cs:119:13:119:15 | obj | obj | E.cs:137:25:137:34 | ... = ... | this |
-| E.cs:159:13:159:16 | access to local variable obj2 | E.cs:152:16:152:26 | SSA def(obj2) | E.cs:159:13:159:16 | access to local variable obj2 | Variable $@ may be null at this access as suggested by $@ null check. | E.cs:152:16:152:19 | obj2 | obj2 | E.cs:153:13:153:24 | ... != ... | this |
-| E.cs:167:21:167:21 | access to parameter a | E.cs:162:28:162:28 | SSA param(a) | E.cs:167:21:167:21 | access to parameter a | Variable $@ may be null at this access as suggested by $@ null check. | E.cs:162:28:162:28 | a | a | E.cs:164:17:164:25 | ... == ... | this |
-| E.cs:178:13:178:15 | access to parameter obj | E.cs:173:29:173:31 | SSA param(obj) | E.cs:178:13:178:15 | access to parameter obj | Variable $@ may be null at this access as suggested by $@ null check. | E.cs:173:29:173:31 | obj | obj | E.cs:175:19:175:29 | ... == ... | this |
-| E.cs:178:13:178:15 | access to parameter obj | E.cs:173:29:173:31 | SSA param(obj) | E.cs:178:13:178:15 | access to parameter obj | Variable $@ may be null at this access as suggested by $@ null check. | E.cs:173:29:173:31 | obj | obj | E.cs:180:13:180:23 | ... == ... | this |
-| E.cs:186:13:186:15 | access to parameter obj | E.cs:173:29:173:31 | SSA param(obj) | E.cs:186:13:186:15 | access to parameter obj | Variable $@ may be null at this access as suggested by $@ null check. | E.cs:173:29:173:31 | obj | obj | E.cs:175:19:175:29 | ... == ... | this |
-| E.cs:186:13:186:15 | access to parameter obj | E.cs:173:29:173:31 | SSA param(obj) | E.cs:186:13:186:15 | access to parameter obj | Variable $@ may be null at this access as suggested by $@ null check. | E.cs:173:29:173:31 | obj | obj | E.cs:180:13:180:23 | ... == ... | this |
-| E.cs:192:17:192:17 | access to parameter o | E.cs:190:29:190:29 | SSA param(o) | E.cs:192:17:192:17 | access to parameter o | Variable $@ may be null at this access as suggested by $@ null check. | E.cs:190:29:190:29 | o | o | E.cs:193:17:193:17 | access to parameter o | this |
-| E.cs:201:13:201:13 | access to local variable o | E.cs:198:13:198:29 | [b (line 196): true] SSA def(o) | E.cs:201:13:201:13 | access to local variable o | Variable $@ may be null at this access because of $@ assignment. | E.cs:198:13:198:13 | o | o | E.cs:198:13:198:29 | String o = ... | this |
-| E.cs:203:13:203:13 | access to local variable o | E.cs:198:13:198:29 | [b (line 196): false] SSA def(o) | E.cs:203:13:203:13 | access to local variable o | Variable $@ may be null at this access because of $@ assignment. | E.cs:198:13:198:13 | o | o | E.cs:198:13:198:29 | String o = ... | this |
-| E.cs:218:9:218:9 | access to local variable x | E.cs:217:13:217:20 | [b (line 213): true] SSA def(x) | E.cs:218:9:218:9 | access to local variable x | Variable $@ may be null at this access because of $@ assignment. | E.cs:215:13:215:13 | x | x | E.cs:217:13:217:20 | ... = ... | this |
-| E.cs:230:9:230:9 | access to local variable x | E.cs:227:13:227:20 | [b (line 223): true] SSA def(x) | E.cs:230:9:230:9 | access to local variable x | Variable $@ may be null at this access because of $@ assignment. | E.cs:225:13:225:13 | x | x | E.cs:227:13:227:20 | ... = ... | this |
-| E.cs:235:16:235:16 | access to parameter i | E.cs:233:26:233:26 | SSA param(i) | E.cs:235:16:235:16 | access to parameter i | Variable $@ may be null at this access because it has a nullable type. | E.cs:233:26:233:26 | i | i | E.cs:233:26:233:26 | i | this |
-| E.cs:240:21:240:21 | access to parameter i | E.cs:238:26:238:26 | SSA param(i) | E.cs:240:21:240:21 | access to parameter i | Variable $@ may be null at this access because it has a nullable type. | E.cs:238:26:238:26 | i | i | E.cs:238:26:238:26 | i | this |
-| E.cs:285:9:285:9 | access to local variable o | E.cs:283:13:283:22 | [b (line 279): false] SSA def(o) | E.cs:285:9:285:9 | access to local variable o | Variable $@ may be null at this access as suggested by $@ null check. | E.cs:283:13:283:13 | o | o | E.cs:284:9:284:9 | access to local variable o | this |
-| E.cs:285:9:285:9 | access to local variable o | E.cs:283:13:283:22 | [b (line 279): true] SSA def(o) | E.cs:285:9:285:9 | access to local variable o | Variable $@ may be null at this access as suggested by $@ null check. | E.cs:283:13:283:13 | o | o | E.cs:284:9:284:9 | access to local variable o | this |
-| E.cs:302:9:302:9 | access to local variable s | E.cs:301:13:301:27 | SSA def(s) | E.cs:302:9:302:9 | access to local variable s | Variable $@ may be null at this access because of $@ assignment. | E.cs:301:13:301:13 | s | s | E.cs:301:13:301:27 | String s = ... | this |
-| E.cs:343:9:343:9 | access to local variable x | E.cs:342:13:342:32 | SSA def(x) | E.cs:343:9:343:9 | access to local variable x | Variable $@ may be null at this access because of $@ assignment. | E.cs:342:13:342:13 | x | x | E.cs:342:13:342:32 | String x = ... | this |
-| E.cs:349:9:349:9 | access to local variable x | E.cs:348:17:348:36 | SSA def(x) | E.cs:349:9:349:9 | access to local variable x | Variable $@ may be null at this access because of $@ assignment. | E.cs:348:17:348:17 | x | x | E.cs:348:17:348:36 | dynamic x = ... | this |
-| E.cs:366:41:366:41 | access to parameter s | E.cs:366:28:366:28 | SSA param(s) | E.cs:366:41:366:41 | access to parameter s | Variable $@ may be null at this access because the parameter has a null default value. | E.cs:366:28:366:28 | s | s | E.cs:366:32:366:35 | null | this |
-| E.cs:375:20:375:20 | access to local variable s | E.cs:374:17:374:31 | SSA def(s) | E.cs:375:20:375:20 | access to local variable s | Variable $@ may be null at this access because of $@ assignment. | E.cs:374:17:374:17 | s | s | E.cs:374:17:374:31 | String s = ... | this |
-| E.cs:386:16:386:17 | access to parameter e1 | E.cs:380:24:380:25 | SSA param(e1) | E.cs:386:16:386:17 | access to parameter e1 | Variable $@ may be null at this access as suggested by $@ null check. | E.cs:380:24:380:25 | e1 | e1 | E.cs:382:14:382:23 | ... == ... | this |
-| E.cs:386:16:386:17 | access to parameter e1 | E.cs:380:24:380:25 | SSA param(e1) | E.cs:386:16:386:17 | access to parameter e1 | Variable $@ may be null at this access as suggested by $@ null check. | E.cs:380:24:380:25 | e1 | e1 | E.cs:382:44:382:53 | ... != ... | this |
-| E.cs:386:16:386:17 | access to parameter e1 | E.cs:380:24:380:25 | SSA param(e1) | E.cs:386:16:386:17 | access to parameter e1 | Variable $@ may be null at this access as suggested by $@ null check. | E.cs:380:24:380:25 | e1 | e1 | E.cs:384:13:384:22 | ... == ... | this |
-| E.cs:386:27:386:28 | access to parameter e2 | E.cs:380:30:380:31 | SSA param(e2) | E.cs:386:27:386:28 | access to parameter e2 | Variable $@ may be null at this access as suggested by $@ null check. | E.cs:380:30:380:31 | e2 | e2 | E.cs:382:28:382:37 | ... != ... | this |
-| E.cs:386:27:386:28 | access to parameter e2 | E.cs:380:30:380:31 | SSA param(e2) | E.cs:386:27:386:28 | access to parameter e2 | Variable $@ may be null at this access as suggested by $@ null check. | E.cs:380:30:380:31 | e2 | e2 | E.cs:382:58:382:67 | ... == ... | this |
-| E.cs:386:27:386:28 | access to parameter e2 | E.cs:380:30:380:31 | SSA param(e2) | E.cs:386:27:386:28 | access to parameter e2 | Variable $@ may be null at this access as suggested by $@ null check. | E.cs:380:30:380:31 | e2 | e2 | E.cs:384:27:384:36 | ... == ... | this |
-| E.cs:417:34:417:34 | access to parameter i | E.cs:417:24:417:40 | SSA capture def(i) | E.cs:417:34:417:34 | access to parameter i | Variable $@ may be null at this access because it has a nullable type. | E.cs:415:27:415:27 | i | i | E.cs:415:27:415:27 | i | this |
-| E.cs:423:38:423:38 | access to parameter i | E.cs:423:28:423:44 | SSA capture def(i) | E.cs:423:38:423:38 | access to parameter i | Variable $@ may be null at this access because it has a nullable type. | E.cs:420:27:420:27 | i | i | E.cs:420:27:420:27 | i | this |
-| E.cs:430:39:430:39 | access to parameter i | E.cs:430:29:430:45 | SSA capture def(i) | E.cs:430:39:430:39 | access to parameter i | Variable $@ may be null at this access because it has a nullable type. | E.cs:427:27:427:27 | i | i | E.cs:427:27:427:27 | i | this |
-| GuardedString.cs:35:31:35:31 | access to local variable s | GuardedString.cs:7:16:7:32 | SSA def(s) | GuardedString.cs:35:31:35:31 | access to local variable s | Variable $@ may be null at this access because of $@ assignment. | GuardedString.cs:7:16:7:16 | s | s | GuardedString.cs:7:16:7:32 | String s = ... | this |
-| NullMaybeBad.cs:7:27:7:27 | access to parameter o | NullMaybeBad.cs:13:17:13:20 | null | NullMaybeBad.cs:7:27:7:27 | access to parameter o | Variable $@ may be null at this access because of $@ null argument. | NullMaybeBad.cs:5:25:5:25 | o | o | NullMaybeBad.cs:13:17:13:20 | null | this |
-| Params.cs:14:17:14:20 | access to parameter args | Params.cs:20:12:20:15 | null | Params.cs:14:17:14:20 | access to parameter args | Variable $@ may be null at this access because of $@ null argument. | Params.cs:12:36:12:39 | args | args | Params.cs:20:12:20:15 | null | this |
-| StringConcatenation.cs:16:17:16:17 | access to local variable s | StringConcatenation.cs:14:16:14:23 | SSA def(s) | StringConcatenation.cs:16:17:16:17 | access to local variable s | Variable $@ may be null at this access because of $@ assignment. | StringConcatenation.cs:14:16:14:16 | s | s | StringConcatenation.cs:14:16:14:23 | String s = ... | this |
diff --git a/csharp/ql/test/query-tests/Nullness/NullMaybe.qlref b/csharp/ql/test/query-tests/Nullness/NullMaybe.qlref
index caf2eefb3d8..6615576178c 100644
--- a/csharp/ql/test/query-tests/Nullness/NullMaybe.qlref
+++ b/csharp/ql/test/query-tests/Nullness/NullMaybe.qlref
@@ -1 +1,2 @@
-CSI/NullMaybe.ql
+query: CSI/NullMaybe.ql
+postprocess: utils/test/InlineExpectationsTestQuery.ql
diff --git a/csharp/ql/test/query-tests/Nullness/NullMaybeBad.cs b/csharp/ql/test/query-tests/Nullness/NullMaybeBad.cs
index 9950bc3c1ee..433a4edc112 100644
--- a/csharp/ql/test/query-tests/Nullness/NullMaybeBad.cs
+++ b/csharp/ql/test/query-tests/Nullness/NullMaybeBad.cs
@@ -4,12 +4,12 @@ class Bad
 {
     void DoPrint(object o)
     {
-        Console.WriteLine(o.ToString());
+        Console.WriteLine(o.ToString()); // $ Alert[cs/dereferenced-value-may-be-null]
     }
 
     void M()
     {
         DoPrint("Hello");
-        DoPrint(null);
+        DoPrint(null); // $ Source[cs/dereferenced-value-may-be-null]
     }
 }
diff --git a/csharp/ql/test/query-tests/Nullness/Params.cs b/csharp/ql/test/query-tests/Nullness/Params.cs
index 17c9cf861d7..b7f2c9e46e8 100644
--- a/csharp/ql/test/query-tests/Nullness/Params.cs
+++ b/csharp/ql/test/query-tests/Nullness/Params.cs
@@ -11,12 +11,12 @@ public class Params
 
     public void M2(params string[] args)
     {
-        var l = args.Length; // Good
+        var l = args.Length; // $ SPURIOUS (false positive): Alert[cs/dereferenced-value-may-be-null]
     }
 
     public void M()
     {
         M1("a", "b", "c", null);
-        M2(null);
+        M2(null); // $ Source[cs/dereferenced-value-may-be-null]
     }
-}
\ No newline at end of file
+}
diff --git a/csharp/ql/test/query-tests/Nullness/StringConcatenation.cs b/csharp/ql/test/query-tests/Nullness/StringConcatenation.cs
index 394ea907769..1cc8f146aec 100644
--- a/csharp/ql/test/query-tests/Nullness/StringConcatenation.cs
+++ b/csharp/ql/test/query-tests/Nullness/StringConcatenation.cs
@@ -11,9 +11,9 @@ class StringsTest
 
     void StringMaybeNull()
     {
-        string s = null;
+        string s = null; // $ Source[cs/dereferenced-value-may-be-null]
         while (s != "")
-            s = s.Trim(); // BAD (maybe)
+            s = s.Trim(); // $ Alert[cs/dereferenced-value-may-be-null]
     }
 
     void StringNotNull()
diff --git a/csharp/ql/test/query-tests/Nullness/options b/csharp/ql/test/query-tests/Nullness/options
index ca78c431249..1039aa6de18 100644
--- a/csharp/ql/test/query-tests/Nullness/options
+++ b/csharp/ql/test/query-tests/Nullness/options
@@ -1,3 +1,4 @@
 semmle-extractor-options: /nostdlib /noconfig
 semmle-extractor-options: --load-sources-from-project:${testdir}/../../resources/stubs/_frameworks/Microsoft.NETCore.App/Microsoft.NETCore.App.csproj
-semmle-extractor-options: ${testdir}/../../resources/stubs/Microsoft.VisualStudio.TestTools.UnitTesting.cs
\ No newline at end of file
+semmle-extractor-options: ${testdir}/../../resources/stubs/Microsoft.VisualStudio.TestTools.UnitTesting.cs
+semmle-extractor-options: ${testdir}/../../resources/stubs/Library.cs
diff --git a/csharp/ql/test/resources/stubs/Library.cs b/csharp/ql/test/resources/stubs/Library.cs
new file mode 100644
index 00000000000..0efffd3f21b
--- /dev/null
+++ b/csharp/ql/test/resources/stubs/Library.cs
@@ -0,0 +1,13 @@
+namespace Library;
+
+/*
+ * This file is for making stubs for library methods used for testing purposes.
+ * The file is located in the stubs folder, because then the code is not
+ * recognized as being from source.
+ */
+public static class MyExtensions
+{
+    public static void Accept(this object o) { }
+
+    public static void AcceptNullable(this object? o) { }
+}
diff --git a/docs/codeql/codeql-overview/codeql-changelog/codeql-cli-2.19.4.rst b/docs/codeql/codeql-overview/codeql-changelog/codeql-cli-2.19.4.rst
index 754b6d2c4da..51ff05b0c3b 100644
--- a/docs/codeql/codeql-overview/codeql-changelog/codeql-cli-2.19.4.rst
+++ b/docs/codeql/codeql-overview/codeql-changelog/codeql-cli-2.19.4.rst
@@ -79,4 +79,4 @@ JavaScript/TypeScript
 *   Added taint-steps for :code:`Array.prototype.toReversed`.
 *   Added taint-steps for :code:`Array.prototype.toSorted`.
 *   Added support for :code:`String.prototype.matchAll`.
-*   Added taint-steps for :code:`Array.prototype.reverse`.
+*   Added taint-steps for :code:`Array.prototype.reverse`. 
diff --git a/docs/codeql/codeql-overview/codeql-changelog/codeql-cli-2.22.0.rst b/docs/codeql/codeql-overview/codeql-changelog/codeql-cli-2.22.0.rst
new file mode 100644
index 00000000000..04920497e4e
--- /dev/null
+++ b/docs/codeql/codeql-overview/codeql-changelog/codeql-cli-2.22.0.rst
@@ -0,0 +1,82 @@
+.. _codeql-cli-2.22.0:
+
+==========================
+CodeQL 2.22.0 (2025-06-11)
+==========================
+
+.. contents:: Contents
+   :depth: 2
+   :local:
+   :backlinks: none
+
+This is an overview of changes in the CodeQL CLI and relevant CodeQL query and library packs. For additional updates on changes to the CodeQL code scanning experience, check out the `code scanning section on the GitHub blog <https://github.blog/tag/code-scanning/>`__, `relevant GitHub Changelog updates <https://github.blog/changelog/label/code-scanning/>`__, `changes in the CodeQL extension for Visual Studio Code <https://marketplace.visualstudio.com/items/GitHub.vscode-codeql/changelog>`__, and the `CodeQL Action changelog <https://github.com/github/codeql-action/blob/main/CHANGELOG.md>`__.
+
+Security Coverage
+-----------------
+
+CodeQL 2.22.0 runs a total of 450 security queries when configured with the Default suite (covering 165 CWE). The Extended suite enables an additional 128 queries (covering 33 more CWE). 1 security query has been added with this release.
+
+CodeQL CLI
+----------
+
+Breaking Changes
+~~~~~~~~~~~~~~~~
+
+*   A number of breaking changes have been made to the C and C++ CodeQL test environment as used by :code:`codeql test run`\ :
+
+    *   Options starting with a :code:`/` are no longer supported by
+        :code:`semmle-extractor-options`. Any option starting with a :code:`/` should be replaced by the equivalent option starting with a :code:`-`, e.g., :code:`/D` should be replaced by :code:`-D`.
+    *   Preprocessor command line options of the form :code:`-D<macro>#<def>` are no longer supported by :code:`semmle-extractor-options`. :code:`-D<macro>=<def>` should be used instead.
+    *   The :code:`/Fp` and :code:`-o` options are no longer supported by
+        :code:`semmle-extractor-options`. The options should be omitted.
+    *   The :code:`-emit-pch`, :code:`-include-pch`, :code:`/Yc`, and :code:`/Yu` options, and the
+        :code:`--preinclude` option taking a pre-compiled header as its argument, are no longer supported by :code:`semmle-extractor-options`. Any test that makes use of this should be replaced by a test that invokes the CodeQL CLI with the
+        :code:`create database` option and that runs the relevant queries on the created database.
+
+Query Packs
+-----------
+
+Minor Analysis Improvements
+~~~~~~~~~~~~~~~~~~~~~~~~~~~
+
+Python
+""""""
+
+*   Added SQL injection models from the :code:`pandas` PyPI package.
+
+New Queries
+~~~~~~~~~~~
+
+Golang
+""""""
+
+*   Query (:code:`go/html-template-escaping-bypass-xss`) has been promoted to the main query suite. This query finds potential cross-site scripting (XSS) vulnerabilities when using the :code:`html/template` package, caused by user input being cast to a type which bypasses the HTML autoescaping. It was originally contributed to the experimental query pack by @gagliardetto in `https://github.com/github/codeql-go/pull/493 <https://github.com/github/codeql-go/pull/493>`_.
+
+Language Libraries
+------------------
+
+Minor Analysis Improvements
+~~~~~~~~~~~~~~~~~~~~~~~~~~~
+
+Golang
+""""""
+
+*   The first argument of :code:`Client.Query` in :code:`cloud.google.com/go/bigquery` is now recognized as a SQL injection sink.
+
+JavaScript/TypeScript
+"""""""""""""""""""""
+
+*   Added taint flow through the :code:`URL` constructor from the :code:`url` package, improving the identification of SSRF vulnerabilities.
+
+Swift
+"""""
+
+*   Updated to allow analysis of Swift 6.1.2.
+
+New Features
+~~~~~~~~~~~~
+
+C/C++
+"""""
+
+*   Added a predicate :code:`getReferencedMember` to :code:`UsingDeclarationEntry`, which yields a member depending on a type template parameter.
diff --git a/docs/codeql/codeql-overview/codeql-changelog/index.rst b/docs/codeql/codeql-overview/codeql-changelog/index.rst
index be6d2582d6e..af427fd6915 100644
--- a/docs/codeql/codeql-overview/codeql-changelog/index.rst
+++ b/docs/codeql/codeql-overview/codeql-changelog/index.rst
@@ -11,6 +11,7 @@ A list of queries for each suite and language `is available here <https://docs.g
 .. toctree::
    :maxdepth: 1
 
+   codeql-cli-2.22.0
    codeql-cli-2.21.4
    codeql-cli-2.21.3
    codeql-cli-2.21.2
diff --git a/go/ql/src/CHANGELOG.md b/go/ql/src/CHANGELOG.md
index b711743ccc9..515fbad7adf 100644
--- a/go/ql/src/CHANGELOG.md
+++ b/go/ql/src/CHANGELOG.md
@@ -2,7 +2,7 @@
 
 ### New Queries
 
-* Query (`go/html-template-escaping-bypass-xss`) has been promoted to the main query suite. This query finds potential cross-site scripting (XSS) vulnerabilities when using the `html/template` package, caused by user input being cast to a type which bypasses the HTML autoescaping. It was originally contributed to the experimental query pack by @gagliardetto in <https://github.com/github/codeql-go/pull/493>.
+* Query (`go/html-template-escaping-bypass-xss`) has been promoted to the main query suite. This query finds potential cross-site scripting (XSS) vulnerabilities when using the `html/template` package, caused by user input being cast to a type which bypasses the HTML autoescaping. It was originally contributed to the experimental query pack by @gagliardetto in https://github.com/github/codeql-go/pull/493.
 
 ## 1.2.1
 
diff --git a/go/ql/src/change-notes/released/1.3.0.md b/go/ql/src/change-notes/released/1.3.0.md
index fe0c5a7af3c..84afeabc50d 100644
--- a/go/ql/src/change-notes/released/1.3.0.md
+++ b/go/ql/src/change-notes/released/1.3.0.md
@@ -2,4 +2,4 @@
 
 ### New Queries
 
-* Query (`go/html-template-escaping-bypass-xss`) has been promoted to the main query suite. This query finds potential cross-site scripting (XSS) vulnerabilities when using the `html/template` package, caused by user input being cast to a type which bypasses the HTML autoescaping. It was originally contributed to the experimental query pack by @gagliardetto in <https://github.com/github/codeql-go/pull/493>.
+* Query (`go/html-template-escaping-bypass-xss`) has been promoted to the main query suite. This query finds potential cross-site scripting (XSS) vulnerabilities when using the `html/template` package, caused by user input being cast to a type which bypasses the HTML autoescaping. It was originally contributed to the experimental query pack by @gagliardetto in https://github.com/github/codeql-go/pull/493.
diff --git a/java/ql/integration-tests/java/query-suite/java-code-scanning.qls.expected b/java/ql/integration-tests/java/query-suite/java-code-scanning.qls.expected
index a8ce00aca6c..3290e0d84b0 100644
--- a/java/ql/integration-tests/java/query-suite/java-code-scanning.qls.expected
+++ b/java/ql/integration-tests/java/query-suite/java-code-scanning.qls.expected
@@ -12,7 +12,6 @@ ql/java/ql/src/Security/CWE/CWE-023/PartialPathTraversalFromRemote.ql
 ql/java/ql/src/Security/CWE/CWE-074/JndiInjection.ql
 ql/java/ql/src/Security/CWE/CWE-074/XsltInjection.ql
 ql/java/ql/src/Security/CWE/CWE-078/ExecTainted.ql
-ql/java/ql/src/Security/CWE/CWE-078/ExecUnescaped.ql
 ql/java/ql/src/Security/CWE/CWE-079/XSS.ql
 ql/java/ql/src/Security/CWE/CWE-089/SqlTainted.ql
 ql/java/ql/src/Security/CWE/CWE-090/LdapInjection.ql
diff --git a/java/ql/src/Security/CWE/CWE-078/ExecUnescaped.ql b/java/ql/src/Security/CWE/CWE-078/ExecUnescaped.ql
index d50f583bbfe..afa675c7f7b 100644
--- a/java/ql/src/Security/CWE/CWE-078/ExecUnescaped.ql
+++ b/java/ql/src/Security/CWE/CWE-078/ExecUnescaped.ql
@@ -5,7 +5,7 @@
  * @kind problem
  * @problem.severity error
  * @security-severity 9.8
- * @precision high
+ * @precision medium
  * @id java/concatenated-command-line
  * @tags security
  *       external/cwe/cwe-078
diff --git a/java/ql/src/Security/CWE/CWE-134/ExternallyControlledFormatString.ql b/java/ql/src/Security/CWE/CWE-134/ExternallyControlledFormatString.ql
index fc5af977a33..ffb191327a2 100644
--- a/java/ql/src/Security/CWE/CWE-134/ExternallyControlledFormatString.ql
+++ b/java/ql/src/Security/CWE/CWE-134/ExternallyControlledFormatString.ql
@@ -3,7 +3,7 @@
  * @description Using external input in format strings can lead to exceptions or information leaks.
  * @kind path-problem
  * @problem.severity error
- * @security-severity 9.3
+ * @security-severity 7.3
  * @precision high
  * @id java/tainted-format-string
  * @tags security
diff --git a/java/ql/src/change-notes/2025-06-06-reduce-CWE-134-for-memory-safe-languages.md b/java/ql/src/change-notes/2025-06-06-reduce-CWE-134-for-memory-safe-languages.md
new file mode 100644
index 00000000000..6ab4beb7290
--- /dev/null
+++ b/java/ql/src/change-notes/2025-06-06-reduce-CWE-134-for-memory-safe-languages.md
@@ -0,0 +1,4 @@
+---
+category: queryMetadata
+---
+* Adjusts the `@security-severity` from 9.3 to 7.3 for `java/tainted-format-string` to align `CWE-134` severity for memory safe languages to better reflect their impact.
diff --git a/java/ql/src/change-notes/2025-06-10-reduce-precision-for-building-cmdline-with-string-concatenation.md b/java/ql/src/change-notes/2025-06-10-reduce-precision-for-building-cmdline-with-string-concatenation.md
new file mode 100644
index 00000000000..392e1965def
--- /dev/null
+++ b/java/ql/src/change-notes/2025-06-10-reduce-precision-for-building-cmdline-with-string-concatenation.md
@@ -0,0 +1,4 @@
+---
+category: queryMetadata
+---
+* Adjusts the `@precision` from high to medium for `java/concatenated-command-line` because it is producing false positive alerts when the concatenated strings are hard-coded.
diff --git a/javascript/extractor/src/com/semmle/js/extractor/ScopeManager.java b/javascript/extractor/src/com/semmle/js/extractor/ScopeManager.java
index e7306e77e01..43e70160fe8 100644
--- a/javascript/extractor/src/com/semmle/js/extractor/ScopeManager.java
+++ b/javascript/extractor/src/com/semmle/js/extractor/ScopeManager.java
@@ -426,7 +426,6 @@ public class ScopeManager {
       // cases where we turn on the 'declKind' flags
       @Override
       public Void visit(FunctionDeclaration nd, Void v) {
-        if (nd.hasDeclareKeyword() && !isInTypeScriptDeclarationFile()) return null;
         // strict mode functions are block-scoped, non-strict mode ones aren't
         if (blockscope == isStrict) visit(nd.getId(), DeclKind.var);
         return null;
@@ -434,7 +433,6 @@ public class ScopeManager {
 
       @Override
       public Void visit(ClassDeclaration nd, Void c) {
-        if (nd.hasDeclareKeyword() && !isInTypeScriptDeclarationFile()) return null;
         if (blockscope) visit(nd.getClassDef().getId(), DeclKind.varAndType);
         return null;
       }
@@ -483,7 +481,6 @@ public class ScopeManager {
 
       @Override
       public Void visit(VariableDeclaration nd, Void v) {
-        if (nd.hasDeclareKeyword() && !isInTypeScriptDeclarationFile()) return null;
         // in block scoping mode, only process 'let'; in non-block scoping
         // mode, only process non-'let'
         if (blockscope == nd.isBlockScoped(ecmaVersion)) visit(nd.getDeclarations());
@@ -518,8 +515,7 @@ public class ScopeManager {
       @Override
       public Void visit(NamespaceDeclaration nd, Void c) {
         if (blockscope) return null;
-        boolean isAmbientOutsideDtsFile = nd.hasDeclareKeyword() && !isInTypeScriptDeclarationFile();
-        boolean hasVariable = nd.isInstantiated() && !isAmbientOutsideDtsFile;
+        boolean hasVariable = nd.isInstantiated();
         visit(nd.getName(), hasVariable ? DeclKind.varAndNamespace : DeclKind.namespace);
         return null;
       }
diff --git a/javascript/extractor/tests/ts/output/trap/conditionalTypes.ts.trap b/javascript/extractor/tests/ts/output/trap/conditionalTypes.ts.trap
index 0751d283e6c..2a1c0efbd44 100644
--- a/javascript/extractor/tests/ts/output/trap/conditionalTypes.ts.trap
+++ b/javascript/extractor/tests/ts/output/trap/conditionalTypes.ts.trap
@@ -8434,1316 +8434,1316 @@ namespacedecl(#22807,#22182)
 scopes(#22808,9)
 scopenodes(#22805,#22808)
 scopenesting(#22808,#20000)
-#22809=@"local_type_name;{Unpacked};{#22808}"
-local_type_names(#22809,"Unpacked",#22808)
-#22810=@"local_type_name;{T0};{#22808}"
-local_type_names(#22810,"T0",#22808)
-#22811=@"local_type_name;{T1};{#22808}"
-local_type_names(#22811,"T1",#22808)
-#22812=@"local_type_name;{T2};{#22808}"
-local_type_names(#22812,"T2",#22808)
-#22813=@"local_type_name;{T3};{#22808}"
-local_type_names(#22813,"T3",#22808)
-#22814=@"local_type_name;{T4};{#22808}"
-local_type_names(#22814,"T4",#22808)
-#22815=@"local_type_name;{T5};{#22808}"
-local_type_names(#22815,"T5",#22808)
-#22816=@"local_type_name;{Foo};{#22808}"
-local_type_names(#22816,"Foo",#22808)
-#22817=@"local_type_name;{T10};{#22808}"
-local_type_names(#22817,"T10",#22808)
-#22818=@"local_type_name;{T11};{#22808}"
-local_type_names(#22818,"T11",#22808)
-#22819=@"local_type_name;{Bar};{#22808}"
-local_type_names(#22819,"Bar",#22808)
-#22820=@"local_type_name;{T20};{#22808}"
-local_type_names(#22820,"T20",#22808)
-#22821=@"local_type_name;{T21};{#22808}"
-local_type_names(#22821,"T21",#22808)
-#22822=@"local_type_name;{T30};{#22808}"
-local_type_names(#22822,"T30",#22808)
-#22823=@"local_type_name;{AnyFunction};{#22808}"
-local_type_names(#22823,"AnyFunction",#22808)
-#22824=@"local_type_name;{ReturnType};{#22808}"
-local_type_names(#22824,"ReturnType",#22808)
-#22825=*
-stmts(#22825,35,#22805,0,"type Un ... \n    T;")
-#22826=@"loc,{#10000},73,3,77,6"
-locations_default(#22826,#10000,73,3,77,6)
-hasLocation(#22825,#22826)
-stmt_containers(#22825,#22805)
-#22827=*
-typeexprs(#22827,1,#22825,0,"Unpacked")
-hasLocation(#22827,#21482)
-enclosing_stmt(#22827,#22825)
-expr_containers(#22827,#22805)
-literals("Unpacked","Unpacked",#22827)
-typedecl(#22827,#22809)
+#22809=@"var;{foo};{#22808}"
+variables(#22809,"foo",#22808)
+#22810=@"local_type_name;{Unpacked};{#22808}"
+local_type_names(#22810,"Unpacked",#22808)
+#22811=@"local_type_name;{T0};{#22808}"
+local_type_names(#22811,"T0",#22808)
+#22812=@"local_type_name;{T1};{#22808}"
+local_type_names(#22812,"T1",#22808)
+#22813=@"local_type_name;{T2};{#22808}"
+local_type_names(#22813,"T2",#22808)
+#22814=@"local_type_name;{T3};{#22808}"
+local_type_names(#22814,"T3",#22808)
+#22815=@"local_type_name;{T4};{#22808}"
+local_type_names(#22815,"T4",#22808)
+#22816=@"local_type_name;{T5};{#22808}"
+local_type_names(#22816,"T5",#22808)
+#22817=@"local_type_name;{Foo};{#22808}"
+local_type_names(#22817,"Foo",#22808)
+#22818=@"local_type_name;{T10};{#22808}"
+local_type_names(#22818,"T10",#22808)
+#22819=@"local_type_name;{T11};{#22808}"
+local_type_names(#22819,"T11",#22808)
+#22820=@"local_type_name;{Bar};{#22808}"
+local_type_names(#22820,"Bar",#22808)
+#22821=@"local_type_name;{T20};{#22808}"
+local_type_names(#22821,"T20",#22808)
+#22822=@"local_type_name;{T21};{#22808}"
+local_type_names(#22822,"T21",#22808)
+#22823=@"local_type_name;{T30};{#22808}"
+local_type_names(#22823,"T30",#22808)
+#22824=@"local_type_name;{AnyFunction};{#22808}"
+local_type_names(#22824,"AnyFunction",#22808)
+#22825=@"local_type_name;{ReturnType};{#22808}"
+local_type_names(#22825,"ReturnType",#22808)
+#22826=*
+stmts(#22826,35,#22805,0,"type Un ... \n    T;")
+#22827=@"loc,{#10000},73,3,77,6"
+locations_default(#22827,#10000,73,3,77,6)
+hasLocation(#22826,#22827)
+stmt_containers(#22826,#22805)
 #22828=*
-scopes(#22828,12)
-scopenodes(#22825,#22828)
-scopenesting(#22828,#22808)
-#22829=@"local_type_name;{T};{#22828}"
-local_type_names(#22829,"T",#22828)
-#22830=*
-typeexprs(#22830,22,#22825,2,"T")
-hasLocation(#22830,#21486)
-enclosing_stmt(#22830,#22825)
-expr_containers(#22830,#22805)
+typeexprs(#22828,1,#22826,0,"Unpacked")
+hasLocation(#22828,#21482)
+enclosing_stmt(#22828,#22826)
+expr_containers(#22828,#22805)
+literals("Unpacked","Unpacked",#22828)
+typedecl(#22828,#22810)
+#22829=*
+scopes(#22829,12)
+scopenodes(#22826,#22829)
+scopenesting(#22829,#22808)
+#22830=@"local_type_name;{T};{#22829}"
+local_type_names(#22830,"T",#22829)
 #22831=*
-typeexprs(#22831,1,#22830,0,"T")
+typeexprs(#22831,22,#22826,2,"T")
 hasLocation(#22831,#21486)
-enclosing_stmt(#22831,#22825)
+enclosing_stmt(#22831,#22826)
 expr_containers(#22831,#22805)
-literals("T","T",#22831)
-typedecl(#22831,#22829)
 #22832=*
-typeexprs(#22832,28,#22825,1,"T exten ... :\n    T")
-#22833=@"loc,{#10000},74,5,77,5"
-locations_default(#22833,#10000,74,5,77,5)
-hasLocation(#22832,#22833)
-enclosing_stmt(#22832,#22825)
+typeexprs(#22832,1,#22831,0,"T")
+hasLocation(#22832,#21486)
+enclosing_stmt(#22832,#22826)
 expr_containers(#22832,#22805)
-#22834=*
-typeexprs(#22834,0,#22832,0,"T")
-hasLocation(#22834,#21492)
-enclosing_stmt(#22834,#22825)
-expr_containers(#22834,#22805)
-literals("T","T",#22834)
-typebind(#22834,#22829)
+literals("T","T",#22832)
+typedecl(#22832,#22830)
+#22833=*
+typeexprs(#22833,28,#22826,1,"T exten ... :\n    T")
+#22834=@"loc,{#10000},74,5,77,5"
+locations_default(#22834,#10000,74,5,77,5)
+hasLocation(#22833,#22834)
+enclosing_stmt(#22833,#22826)
+expr_containers(#22833,#22805)
 #22835=*
-scopes(#22835,16)
-scopenodes(#22832,#22835)
-scopenesting(#22835,#22828)
-#22836=@"local_type_name;{U};{#22835}"
-local_type_names(#22836,"U",#22835)
-#22837=*
-typeexprs(#22837,6,#22832,1,"(infer U)[]")
-#22838=@"loc,{#10000},74,15,74,25"
-locations_default(#22838,#10000,74,15,74,25)
-hasLocation(#22837,#22838)
-enclosing_stmt(#22837,#22825)
-expr_containers(#22837,#22805)
-#22839=*
-typeexprs(#22839,10,#22837,0,"(infer U)")
-#22840=@"loc,{#10000},74,15,74,23"
-locations_default(#22840,#10000,74,15,74,23)
-hasLocation(#22839,#22840)
-enclosing_stmt(#22839,#22825)
-expr_containers(#22839,#22805)
-#22841=*
-typeexprs(#22841,29,#22839,0,"infer U")
-#22842=@"loc,{#10000},74,16,74,22"
-locations_default(#22842,#10000,74,16,74,22)
-hasLocation(#22841,#22842)
-enclosing_stmt(#22841,#22825)
-expr_containers(#22841,#22805)
-#22843=*
-typeexprs(#22843,22,#22841,0,"U")
-hasLocation(#22843,#21500)
-enclosing_stmt(#22843,#22825)
-expr_containers(#22843,#22805)
+typeexprs(#22835,0,#22833,0,"T")
+hasLocation(#22835,#21492)
+enclosing_stmt(#22835,#22826)
+expr_containers(#22835,#22805)
+literals("T","T",#22835)
+typebind(#22835,#22830)
+#22836=*
+scopes(#22836,16)
+scopenodes(#22833,#22836)
+scopenesting(#22836,#22829)
+#22837=@"local_type_name;{U};{#22836}"
+local_type_names(#22837,"U",#22836)
+#22838=*
+typeexprs(#22838,6,#22833,1,"(infer U)[]")
+#22839=@"loc,{#10000},74,15,74,25"
+locations_default(#22839,#10000,74,15,74,25)
+hasLocation(#22838,#22839)
+enclosing_stmt(#22838,#22826)
+expr_containers(#22838,#22805)
+#22840=*
+typeexprs(#22840,10,#22838,0,"(infer U)")
+#22841=@"loc,{#10000},74,15,74,23"
+locations_default(#22841,#10000,74,15,74,23)
+hasLocation(#22840,#22841)
+enclosing_stmt(#22840,#22826)
+expr_containers(#22840,#22805)
+#22842=*
+typeexprs(#22842,29,#22840,0,"infer U")
+#22843=@"loc,{#10000},74,16,74,22"
+locations_default(#22843,#10000,74,16,74,22)
+hasLocation(#22842,#22843)
+enclosing_stmt(#22842,#22826)
+expr_containers(#22842,#22805)
 #22844=*
-typeexprs(#22844,1,#22843,0,"U")
+typeexprs(#22844,22,#22842,0,"U")
 hasLocation(#22844,#21500)
-enclosing_stmt(#22844,#22825)
+enclosing_stmt(#22844,#22826)
 expr_containers(#22844,#22805)
-literals("U","U",#22844)
-typedecl(#22844,#22836)
 #22845=*
-typeexprs(#22845,0,#22832,2,"U")
-hasLocation(#22845,#21510)
-enclosing_stmt(#22845,#22825)
+typeexprs(#22845,1,#22844,0,"U")
+hasLocation(#22845,#21500)
+enclosing_stmt(#22845,#22826)
 expr_containers(#22845,#22805)
 literals("U","U",#22845)
-typebind(#22845,#22836)
+typedecl(#22845,#22837)
 #22846=*
-typeexprs(#22846,28,#22832,3,"T exten ... :\n    T")
-#22847=@"loc,{#10000},75,5,77,5"
-locations_default(#22847,#10000,75,5,77,5)
-hasLocation(#22846,#22847)
-enclosing_stmt(#22846,#22825)
+typeexprs(#22846,0,#22833,2,"U")
+hasLocation(#22846,#21510)
+enclosing_stmt(#22846,#22826)
 expr_containers(#22846,#22805)
-#22848=*
-typeexprs(#22848,0,#22846,0,"T")
-hasLocation(#22848,#21514)
-enclosing_stmt(#22848,#22825)
-expr_containers(#22848,#22805)
-literals("T","T",#22848)
-typebind(#22848,#22829)
+literals("U","U",#22846)
+typebind(#22846,#22837)
+#22847=*
+typeexprs(#22847,28,#22833,3,"T exten ... :\n    T")
+#22848=@"loc,{#10000},75,5,77,5"
+locations_default(#22848,#10000,75,5,77,5)
+hasLocation(#22847,#22848)
+enclosing_stmt(#22847,#22826)
+expr_containers(#22847,#22805)
 #22849=*
-scopes(#22849,16)
-scopenodes(#22846,#22849)
-scopenesting(#22849,#22828)
-#22850=@"local_type_name;{U};{#22849}"
-local_type_names(#22850,"U",#22849)
-#22851=*
-typeexprs(#22851,23,#22846,1,"(...arg ... infer U")
-#22852=@"loc,{#10000},75,15,75,41"
-locations_default(#22852,#10000,75,15,75,41)
-hasLocation(#22851,#22852)
-enclosing_stmt(#22851,#22825)
-expr_containers(#22851,#22805)
-#22853=*
-exprs(#22853,9,#22851,0,"(...arg ... infer U")
-hasLocation(#22853,#22852)
-enclosing_stmt(#22853,#22825)
-expr_containers(#22853,#22805)
+typeexprs(#22849,0,#22847,0,"T")
+hasLocation(#22849,#21514)
+enclosing_stmt(#22849,#22826)
+expr_containers(#22849,#22805)
+literals("T","T",#22849)
+typebind(#22849,#22830)
+#22850=*
+scopes(#22850,16)
+scopenodes(#22847,#22850)
+scopenesting(#22850,#22829)
+#22851=@"local_type_name;{U};{#22850}"
+local_type_names(#22851,"U",#22850)
+#22852=*
+typeexprs(#22852,23,#22847,1,"(...arg ... infer U")
+#22853=@"loc,{#10000},75,15,75,41"
+locations_default(#22853,#10000,75,15,75,41)
+hasLocation(#22852,#22853)
+enclosing_stmt(#22852,#22826)
+expr_containers(#22852,#22805)
 #22854=*
-scopes(#22854,1)
-scopenodes(#22853,#22854)
-scopenesting(#22854,#22849)
-#22855=@"var;{args};{#22854}"
-variables(#22855,"args",#22854)
-#22856=*
-exprs(#22856,78,#22853,0,"args")
-hasLocation(#22856,#21522)
-expr_containers(#22856,#22853)
-literals("args","args",#22856)
-decl(#22856,#22855)
-#22857=@"var;{arguments};{#22854}"
-variables(#22857,"arguments",#22854)
-is_arguments_object(#22857)
-#22858=*
-typeexprs(#22858,29,#22853,-3,"infer U")
-#22859=@"loc,{#10000},75,35,75,41"
-locations_default(#22859,#10000,75,35,75,41)
-hasLocation(#22858,#22859)
-expr_containers(#22858,#22853)
-#22860=*
-typeexprs(#22860,22,#22858,0,"U")
-hasLocation(#22860,#21538)
-expr_containers(#22860,#22853)
+exprs(#22854,9,#22852,0,"(...arg ... infer U")
+hasLocation(#22854,#22853)
+enclosing_stmt(#22854,#22826)
+expr_containers(#22854,#22805)
+#22855=*
+scopes(#22855,1)
+scopenodes(#22854,#22855)
+scopenesting(#22855,#22850)
+#22856=@"var;{args};{#22855}"
+variables(#22856,"args",#22855)
+#22857=*
+exprs(#22857,78,#22854,0,"args")
+hasLocation(#22857,#21522)
+expr_containers(#22857,#22854)
+literals("args","args",#22857)
+decl(#22857,#22856)
+#22858=@"var;{arguments};{#22855}"
+variables(#22858,"arguments",#22855)
+is_arguments_object(#22858)
+#22859=*
+typeexprs(#22859,29,#22854,-3,"infer U")
+#22860=@"loc,{#10000},75,35,75,41"
+locations_default(#22860,#10000,75,35,75,41)
+hasLocation(#22859,#22860)
+expr_containers(#22859,#22854)
 #22861=*
-typeexprs(#22861,1,#22860,0,"U")
+typeexprs(#22861,22,#22859,0,"U")
 hasLocation(#22861,#21538)
-expr_containers(#22861,#22853)
-literals("U","U",#22861)
-typedecl(#22861,#22850)
+expr_containers(#22861,#22854)
 #22862=*
-typeexprs(#22862,6,#22853,-6,"any[]")
-#22863=@"loc,{#10000},75,25,75,29"
-locations_default(#22863,#10000,75,25,75,29)
-hasLocation(#22862,#22863)
-expr_containers(#22862,#22853)
-#22864=*
-typeexprs(#22864,2,#22862,0,"any")
-hasLocation(#22864,#21526)
-expr_containers(#22864,#22853)
-literals("any","any",#22864)
-has_rest_parameter(#22853)
+typeexprs(#22862,1,#22861,0,"U")
+hasLocation(#22862,#21538)
+expr_containers(#22862,#22854)
+literals("U","U",#22862)
+typedecl(#22862,#22851)
+#22863=*
+typeexprs(#22863,6,#22854,-6,"any[]")
+#22864=@"loc,{#10000},75,25,75,29"
+locations_default(#22864,#10000,75,25,75,29)
+hasLocation(#22863,#22864)
+expr_containers(#22863,#22854)
 #22865=*
-typeexprs(#22865,0,#22846,2,"U")
-hasLocation(#22865,#21542)
-enclosing_stmt(#22865,#22825)
-expr_containers(#22865,#22805)
-literals("U","U",#22865)
-typebind(#22865,#22850)
+typeexprs(#22865,2,#22863,0,"any")
+hasLocation(#22865,#21526)
+expr_containers(#22865,#22854)
+literals("any","any",#22865)
+has_rest_parameter(#22854)
 #22866=*
-typeexprs(#22866,28,#22846,3,"T exten ... :\n    T")
-#22867=@"loc,{#10000},76,5,77,5"
-locations_default(#22867,#10000,76,5,77,5)
-hasLocation(#22866,#22867)
-enclosing_stmt(#22866,#22825)
+typeexprs(#22866,0,#22847,2,"U")
+hasLocation(#22866,#21542)
+enclosing_stmt(#22866,#22826)
 expr_containers(#22866,#22805)
-#22868=*
-typeexprs(#22868,0,#22866,0,"T")
-hasLocation(#22868,#21546)
-enclosing_stmt(#22868,#22825)
-expr_containers(#22868,#22805)
-literals("T","T",#22868)
-typebind(#22868,#22829)
+literals("U","U",#22866)
+typebind(#22866,#22851)
+#22867=*
+typeexprs(#22867,28,#22847,3,"T exten ... :\n    T")
+#22868=@"loc,{#10000},76,5,77,5"
+locations_default(#22868,#10000,76,5,77,5)
+hasLocation(#22867,#22868)
+enclosing_stmt(#22867,#22826)
+expr_containers(#22867,#22805)
 #22869=*
-scopes(#22869,16)
-scopenodes(#22866,#22869)
-scopenesting(#22869,#22828)
-#22870=@"local_type_name;{U};{#22869}"
-local_type_names(#22870,"U",#22869)
-#22871=*
-typeexprs(#22871,14,#22866,1,"Promise<infer U>")
-#22872=@"loc,{#10000},76,15,76,30"
-locations_default(#22872,#10000,76,15,76,30)
-hasLocation(#22871,#22872)
-enclosing_stmt(#22871,#22825)
-expr_containers(#22871,#22805)
-#22873=*
-typeexprs(#22873,0,#22871,-1,"Promise")
-hasLocation(#22873,#21550)
-enclosing_stmt(#22873,#22825)
-expr_containers(#22873,#22805)
-literals("Promise","Promise",#22873)
+typeexprs(#22869,0,#22867,0,"T")
+hasLocation(#22869,#21546)
+enclosing_stmt(#22869,#22826)
+expr_containers(#22869,#22805)
+literals("T","T",#22869)
+typebind(#22869,#22830)
+#22870=*
+scopes(#22870,16)
+scopenodes(#22867,#22870)
+scopenesting(#22870,#22829)
+#22871=@"local_type_name;{U};{#22870}"
+local_type_names(#22871,"U",#22870)
+#22872=*
+typeexprs(#22872,14,#22867,1,"Promise<infer U>")
+#22873=@"loc,{#10000},76,15,76,30"
+locations_default(#22873,#10000,76,15,76,30)
+hasLocation(#22872,#22873)
+enclosing_stmt(#22872,#22826)
+expr_containers(#22872,#22805)
 #22874=*
-typeexprs(#22874,29,#22871,0,"infer U")
-#22875=@"loc,{#10000},76,23,76,29"
-locations_default(#22875,#10000,76,23,76,29)
-hasLocation(#22874,#22875)
-enclosing_stmt(#22874,#22825)
+typeexprs(#22874,0,#22872,-1,"Promise")
+hasLocation(#22874,#21550)
+enclosing_stmt(#22874,#22826)
 expr_containers(#22874,#22805)
-#22876=*
-typeexprs(#22876,22,#22874,0,"U")
-hasLocation(#22876,#21556)
-enclosing_stmt(#22876,#22825)
-expr_containers(#22876,#22805)
+literals("Promise","Promise",#22874)
+#22875=*
+typeexprs(#22875,29,#22872,0,"infer U")
+#22876=@"loc,{#10000},76,23,76,29"
+locations_default(#22876,#10000,76,23,76,29)
+hasLocation(#22875,#22876)
+enclosing_stmt(#22875,#22826)
+expr_containers(#22875,#22805)
 #22877=*
-typeexprs(#22877,1,#22876,0,"U")
+typeexprs(#22877,22,#22875,0,"U")
 hasLocation(#22877,#21556)
-enclosing_stmt(#22877,#22825)
+enclosing_stmt(#22877,#22826)
 expr_containers(#22877,#22805)
-literals("U","U",#22877)
-typedecl(#22877,#22870)
 #22878=*
-typeexprs(#22878,0,#22866,2,"U")
-hasLocation(#22878,#21562)
-enclosing_stmt(#22878,#22825)
+typeexprs(#22878,1,#22877,0,"U")
+hasLocation(#22878,#21556)
+enclosing_stmt(#22878,#22826)
 expr_containers(#22878,#22805)
 literals("U","U",#22878)
-typebind(#22878,#22870)
+typedecl(#22878,#22871)
 #22879=*
-typeexprs(#22879,0,#22866,3,"T")
-hasLocation(#22879,#21566)
-enclosing_stmt(#22879,#22825)
+typeexprs(#22879,0,#22867,2,"U")
+hasLocation(#22879,#21562)
+enclosing_stmt(#22879,#22826)
 expr_containers(#22879,#22805)
-literals("T","T",#22879)
-typebind(#22879,#22829)
+literals("U","U",#22879)
+typebind(#22879,#22871)
 #22880=*
-stmts(#22880,35,#22805,1,"type T0 ... tring>;")
-#22881=@"loc,{#10000},79,3,79,29"
-locations_default(#22881,#10000,79,3,79,29)
-hasLocation(#22880,#22881)
-stmt_containers(#22880,#22805)
-#22882=*
-typeexprs(#22882,1,#22880,0,"T0")
-hasLocation(#22882,#21572)
-enclosing_stmt(#22882,#22880)
-expr_containers(#22882,#22805)
-literals("T0","T0",#22882)
-typedecl(#22882,#22810)
+typeexprs(#22880,0,#22867,3,"T")
+hasLocation(#22880,#21566)
+enclosing_stmt(#22880,#22826)
+expr_containers(#22880,#22805)
+literals("T","T",#22880)
+typebind(#22880,#22830)
+#22881=*
+stmts(#22881,35,#22805,1,"type T0 ... tring>;")
+#22882=@"loc,{#10000},79,3,79,29"
+locations_default(#22882,#10000,79,3,79,29)
+hasLocation(#22881,#22882)
+stmt_containers(#22881,#22805)
 #22883=*
-typeexprs(#22883,14,#22880,1,"Unpacked<string>")
-#22884=@"loc,{#10000},79,13,79,28"
-locations_default(#22884,#10000,79,13,79,28)
-hasLocation(#22883,#22884)
-enclosing_stmt(#22883,#22880)
+typeexprs(#22883,1,#22881,0,"T0")
+hasLocation(#22883,#21572)
+enclosing_stmt(#22883,#22881)
 expr_containers(#22883,#22805)
-#22885=*
-typeexprs(#22885,0,#22883,-1,"Unpacked")
-hasLocation(#22885,#21576)
-enclosing_stmt(#22885,#22880)
-expr_containers(#22885,#22805)
-literals("Unpacked","Unpacked",#22885)
-typebind(#22885,#22809)
+literals("T0","T0",#22883)
+typedecl(#22883,#22811)
+#22884=*
+typeexprs(#22884,14,#22881,1,"Unpacked<string>")
+#22885=@"loc,{#10000},79,13,79,28"
+locations_default(#22885,#10000,79,13,79,28)
+hasLocation(#22884,#22885)
+enclosing_stmt(#22884,#22881)
+expr_containers(#22884,#22805)
 #22886=*
-typeexprs(#22886,2,#22883,0,"string")
-hasLocation(#22886,#21580)
-enclosing_stmt(#22886,#22880)
+typeexprs(#22886,0,#22884,-1,"Unpacked")
+hasLocation(#22886,#21576)
+enclosing_stmt(#22886,#22881)
 expr_containers(#22886,#22805)
-literals("string","string",#22886)
+literals("Unpacked","Unpacked",#22886)
+typebind(#22886,#22810)
 #22887=*
-stmts(#22887,35,#22805,2,"type T1 ... ing[]>;")
-#22888=@"loc,{#10000},80,3,80,31"
-locations_default(#22888,#10000,80,3,80,31)
-hasLocation(#22887,#22888)
-stmt_containers(#22887,#22805)
-#22889=*
-typeexprs(#22889,1,#22887,0,"T1")
-hasLocation(#22889,#21588)
-enclosing_stmt(#22889,#22887)
-expr_containers(#22889,#22805)
-literals("T1","T1",#22889)
-typedecl(#22889,#22811)
+typeexprs(#22887,2,#22884,0,"string")
+hasLocation(#22887,#21580)
+enclosing_stmt(#22887,#22881)
+expr_containers(#22887,#22805)
+literals("string","string",#22887)
+#22888=*
+stmts(#22888,35,#22805,2,"type T1 ... ing[]>;")
+#22889=@"loc,{#10000},80,3,80,31"
+locations_default(#22889,#10000,80,3,80,31)
+hasLocation(#22888,#22889)
+stmt_containers(#22888,#22805)
 #22890=*
-typeexprs(#22890,14,#22887,1,"Unpacked<string[]>")
-#22891=@"loc,{#10000},80,13,80,30"
-locations_default(#22891,#10000,80,13,80,30)
-hasLocation(#22890,#22891)
-enclosing_stmt(#22890,#22887)
+typeexprs(#22890,1,#22888,0,"T1")
+hasLocation(#22890,#21588)
+enclosing_stmt(#22890,#22888)
 expr_containers(#22890,#22805)
-#22892=*
-typeexprs(#22892,0,#22890,-1,"Unpacked")
-hasLocation(#22892,#21592)
-enclosing_stmt(#22892,#22887)
-expr_containers(#22892,#22805)
-literals("Unpacked","Unpacked",#22892)
-typebind(#22892,#22809)
+literals("T1","T1",#22890)
+typedecl(#22890,#22812)
+#22891=*
+typeexprs(#22891,14,#22888,1,"Unpacked<string[]>")
+#22892=@"loc,{#10000},80,13,80,30"
+locations_default(#22892,#10000,80,13,80,30)
+hasLocation(#22891,#22892)
+enclosing_stmt(#22891,#22888)
+expr_containers(#22891,#22805)
 #22893=*
-typeexprs(#22893,6,#22890,0,"string[]")
-#22894=@"loc,{#10000},80,22,80,29"
-locations_default(#22894,#10000,80,22,80,29)
-hasLocation(#22893,#22894)
-enclosing_stmt(#22893,#22887)
+typeexprs(#22893,0,#22891,-1,"Unpacked")
+hasLocation(#22893,#21592)
+enclosing_stmt(#22893,#22888)
 expr_containers(#22893,#22805)
-#22895=*
-typeexprs(#22895,2,#22893,0,"string")
-hasLocation(#22895,#21596)
-enclosing_stmt(#22895,#22887)
-expr_containers(#22895,#22805)
-literals("string","string",#22895)
+literals("Unpacked","Unpacked",#22893)
+typebind(#22893,#22810)
+#22894=*
+typeexprs(#22894,6,#22891,0,"string[]")
+#22895=@"loc,{#10000},80,22,80,29"
+locations_default(#22895,#10000,80,22,80,29)
+hasLocation(#22894,#22895)
+enclosing_stmt(#22894,#22888)
+expr_containers(#22894,#22805)
 #22896=*
-stmts(#22896,35,#22805,3,"type T2 ... tring>;")
-#22897=@"loc,{#10000},81,3,81,35"
-locations_default(#22897,#10000,81,3,81,35)
-hasLocation(#22896,#22897)
-stmt_containers(#22896,#22805)
-#22898=*
-typeexprs(#22898,1,#22896,0,"T2")
-hasLocation(#22898,#21608)
-enclosing_stmt(#22898,#22896)
-expr_containers(#22898,#22805)
-literals("T2","T2",#22898)
-typedecl(#22898,#22812)
+typeexprs(#22896,2,#22894,0,"string")
+hasLocation(#22896,#21596)
+enclosing_stmt(#22896,#22888)
+expr_containers(#22896,#22805)
+literals("string","string",#22896)
+#22897=*
+stmts(#22897,35,#22805,3,"type T2 ... tring>;")
+#22898=@"loc,{#10000},81,3,81,35"
+locations_default(#22898,#10000,81,3,81,35)
+hasLocation(#22897,#22898)
+stmt_containers(#22897,#22805)
 #22899=*
-typeexprs(#22899,14,#22896,1,"Unpacke ... string>")
-#22900=@"loc,{#10000},81,13,81,34"
-locations_default(#22900,#10000,81,13,81,34)
-hasLocation(#22899,#22900)
-enclosing_stmt(#22899,#22896)
+typeexprs(#22899,1,#22897,0,"T2")
+hasLocation(#22899,#21608)
+enclosing_stmt(#22899,#22897)
 expr_containers(#22899,#22805)
-#22901=*
-typeexprs(#22901,0,#22899,-1,"Unpacked")
-hasLocation(#22901,#21612)
-enclosing_stmt(#22901,#22896)
-expr_containers(#22901,#22805)
-literals("Unpacked","Unpacked",#22901)
-typebind(#22901,#22809)
+literals("T2","T2",#22899)
+typedecl(#22899,#22813)
+#22900=*
+typeexprs(#22900,14,#22897,1,"Unpacke ... string>")
+#22901=@"loc,{#10000},81,13,81,34"
+locations_default(#22901,#10000,81,13,81,34)
+hasLocation(#22900,#22901)
+enclosing_stmt(#22900,#22897)
+expr_containers(#22900,#22805)
 #22902=*
-typeexprs(#22902,23,#22899,0,"() => string")
-#22903=@"loc,{#10000},81,22,81,33"
-locations_default(#22903,#10000,81,22,81,33)
-hasLocation(#22902,#22903)
-enclosing_stmt(#22902,#22896)
+typeexprs(#22902,0,#22900,-1,"Unpacked")
+hasLocation(#22902,#21612)
+enclosing_stmt(#22902,#22897)
 expr_containers(#22902,#22805)
-#22904=*
-exprs(#22904,9,#22902,0,"() => string")
-hasLocation(#22904,#22903)
-enclosing_stmt(#22904,#22896)
-expr_containers(#22904,#22805)
+literals("Unpacked","Unpacked",#22902)
+typebind(#22902,#22810)
+#22903=*
+typeexprs(#22903,23,#22900,0,"() => string")
+#22904=@"loc,{#10000},81,22,81,33"
+locations_default(#22904,#10000,81,22,81,33)
+hasLocation(#22903,#22904)
+enclosing_stmt(#22903,#22897)
+expr_containers(#22903,#22805)
 #22905=*
-scopes(#22905,1)
-scopenodes(#22904,#22905)
-scopenesting(#22905,#22808)
-#22906=@"var;{arguments};{#22905}"
-variables(#22906,"arguments",#22905)
-is_arguments_object(#22906)
-#22907=*
-typeexprs(#22907,2,#22904,-3,"string")
-hasLocation(#22907,#21622)
-expr_containers(#22907,#22904)
-literals("string","string",#22907)
+exprs(#22905,9,#22903,0,"() => string")
+hasLocation(#22905,#22904)
+enclosing_stmt(#22905,#22897)
+expr_containers(#22905,#22805)
+#22906=*
+scopes(#22906,1)
+scopenodes(#22905,#22906)
+scopenesting(#22906,#22808)
+#22907=@"var;{arguments};{#22906}"
+variables(#22907,"arguments",#22906)
+is_arguments_object(#22907)
 #22908=*
-stmts(#22908,35,#22805,4,"type T3 ... ring>>;")
-#22909=@"loc,{#10000},82,3,82,38"
-locations_default(#22909,#10000,82,3,82,38)
-hasLocation(#22908,#22909)
-stmt_containers(#22908,#22805)
-#22910=*
-typeexprs(#22910,1,#22908,0,"T3")
-hasLocation(#22910,#21630)
-enclosing_stmt(#22910,#22908)
-expr_containers(#22910,#22805)
-literals("T3","T3",#22910)
-typedecl(#22910,#22813)
+typeexprs(#22908,2,#22905,-3,"string")
+hasLocation(#22908,#21622)
+expr_containers(#22908,#22905)
+literals("string","string",#22908)
+#22909=*
+stmts(#22909,35,#22805,4,"type T3 ... ring>>;")
+#22910=@"loc,{#10000},82,3,82,38"
+locations_default(#22910,#10000,82,3,82,38)
+hasLocation(#22909,#22910)
+stmt_containers(#22909,#22805)
 #22911=*
-typeexprs(#22911,14,#22908,1,"Unpacke ... tring>>")
-#22912=@"loc,{#10000},82,13,82,37"
-locations_default(#22912,#10000,82,13,82,37)
-hasLocation(#22911,#22912)
-enclosing_stmt(#22911,#22908)
+typeexprs(#22911,1,#22909,0,"T3")
+hasLocation(#22911,#21630)
+enclosing_stmt(#22911,#22909)
 expr_containers(#22911,#22805)
-#22913=*
-typeexprs(#22913,0,#22911,-1,"Unpacked")
-hasLocation(#22913,#21634)
-enclosing_stmt(#22913,#22908)
-expr_containers(#22913,#22805)
-literals("Unpacked","Unpacked",#22913)
-typebind(#22913,#22809)
+literals("T3","T3",#22911)
+typedecl(#22911,#22814)
+#22912=*
+typeexprs(#22912,14,#22909,1,"Unpacke ... tring>>")
+#22913=@"loc,{#10000},82,13,82,37"
+locations_default(#22913,#10000,82,13,82,37)
+hasLocation(#22912,#22913)
+enclosing_stmt(#22912,#22909)
+expr_containers(#22912,#22805)
 #22914=*
-typeexprs(#22914,14,#22911,0,"Promise<string>")
-#22915=@"loc,{#10000},82,22,82,36"
-locations_default(#22915,#10000,82,22,82,36)
-hasLocation(#22914,#22915)
-enclosing_stmt(#22914,#22908)
+typeexprs(#22914,0,#22912,-1,"Unpacked")
+hasLocation(#22914,#21634)
+enclosing_stmt(#22914,#22909)
 expr_containers(#22914,#22805)
-#22916=*
-typeexprs(#22916,0,#22914,-1,"Promise")
-hasLocation(#22916,#21638)
-enclosing_stmt(#22916,#22908)
-expr_containers(#22916,#22805)
-literals("Promise","Promise",#22916)
+literals("Unpacked","Unpacked",#22914)
+typebind(#22914,#22810)
+#22915=*
+typeexprs(#22915,14,#22912,0,"Promise<string>")
+#22916=@"loc,{#10000},82,22,82,36"
+locations_default(#22916,#10000,82,22,82,36)
+hasLocation(#22915,#22916)
+enclosing_stmt(#22915,#22909)
+expr_containers(#22915,#22805)
 #22917=*
-typeexprs(#22917,2,#22914,0,"string")
-hasLocation(#22917,#21642)
-enclosing_stmt(#22917,#22908)
+typeexprs(#22917,0,#22915,-1,"Promise")
+hasLocation(#22917,#21638)
+enclosing_stmt(#22917,#22909)
 expr_containers(#22917,#22805)
-literals("string","string",#22917)
+literals("Promise","Promise",#22917)
 #22918=*
-stmts(#22918,35,#22805,5,"type T4 ... ng>[]>;")
-#22919=@"loc,{#10000},83,3,83,40"
-locations_default(#22919,#10000,83,3,83,40)
-hasLocation(#22918,#22919)
-stmt_containers(#22918,#22805)
-#22920=*
-typeexprs(#22920,1,#22918,0,"T4")
-hasLocation(#22920,#21652)
-enclosing_stmt(#22920,#22918)
-expr_containers(#22920,#22805)
-literals("T4","T4",#22920)
-typedecl(#22920,#22814)
+typeexprs(#22918,2,#22915,0,"string")
+hasLocation(#22918,#21642)
+enclosing_stmt(#22918,#22909)
+expr_containers(#22918,#22805)
+literals("string","string",#22918)
+#22919=*
+stmts(#22919,35,#22805,5,"type T4 ... ng>[]>;")
+#22920=@"loc,{#10000},83,3,83,40"
+locations_default(#22920,#10000,83,3,83,40)
+hasLocation(#22919,#22920)
+stmt_containers(#22919,#22805)
 #22921=*
-typeexprs(#22921,14,#22918,1,"Unpacke ... ing>[]>")
-#22922=@"loc,{#10000},83,13,83,39"
-locations_default(#22922,#10000,83,13,83,39)
-hasLocation(#22921,#22922)
-enclosing_stmt(#22921,#22918)
+typeexprs(#22921,1,#22919,0,"T4")
+hasLocation(#22921,#21652)
+enclosing_stmt(#22921,#22919)
 expr_containers(#22921,#22805)
-#22923=*
-typeexprs(#22923,0,#22921,-1,"Unpacked")
-hasLocation(#22923,#21656)
-enclosing_stmt(#22923,#22918)
-expr_containers(#22923,#22805)
-literals("Unpacked","Unpacked",#22923)
-typebind(#22923,#22809)
+literals("T4","T4",#22921)
+typedecl(#22921,#22815)
+#22922=*
+typeexprs(#22922,14,#22919,1,"Unpacke ... ing>[]>")
+#22923=@"loc,{#10000},83,13,83,39"
+locations_default(#22923,#10000,83,13,83,39)
+hasLocation(#22922,#22923)
+enclosing_stmt(#22922,#22919)
+expr_containers(#22922,#22805)
 #22924=*
-typeexprs(#22924,6,#22921,0,"Promise<string>[]")
-#22925=@"loc,{#10000},83,22,83,38"
-locations_default(#22925,#10000,83,22,83,38)
-hasLocation(#22924,#22925)
-enclosing_stmt(#22924,#22918)
+typeexprs(#22924,0,#22922,-1,"Unpacked")
+hasLocation(#22924,#21656)
+enclosing_stmt(#22924,#22919)
 expr_containers(#22924,#22805)
-#22926=*
-typeexprs(#22926,14,#22924,0,"Promise<string>")
-#22927=@"loc,{#10000},83,22,83,36"
-locations_default(#22927,#10000,83,22,83,36)
-hasLocation(#22926,#22927)
-enclosing_stmt(#22926,#22918)
-expr_containers(#22926,#22805)
-#22928=*
-typeexprs(#22928,0,#22926,-1,"Promise")
-hasLocation(#22928,#21660)
-enclosing_stmt(#22928,#22918)
-expr_containers(#22928,#22805)
-literals("Promise","Promise",#22928)
+literals("Unpacked","Unpacked",#22924)
+typebind(#22924,#22810)
+#22925=*
+typeexprs(#22925,6,#22922,0,"Promise<string>[]")
+#22926=@"loc,{#10000},83,22,83,38"
+locations_default(#22926,#10000,83,22,83,38)
+hasLocation(#22925,#22926)
+enclosing_stmt(#22925,#22919)
+expr_containers(#22925,#22805)
+#22927=*
+typeexprs(#22927,14,#22925,0,"Promise<string>")
+#22928=@"loc,{#10000},83,22,83,36"
+locations_default(#22928,#10000,83,22,83,36)
+hasLocation(#22927,#22928)
+enclosing_stmt(#22927,#22919)
+expr_containers(#22927,#22805)
 #22929=*
-typeexprs(#22929,2,#22926,0,"string")
-hasLocation(#22929,#21664)
-enclosing_stmt(#22929,#22918)
+typeexprs(#22929,0,#22927,-1,"Promise")
+hasLocation(#22929,#21660)
+enclosing_stmt(#22929,#22919)
 expr_containers(#22929,#22805)
-literals("string","string",#22929)
+literals("Promise","Promise",#22929)
 #22930=*
-stmts(#22930,35,#22805,6,"type T5 ... g>[]>>;")
-#22931=@"loc,{#10000},84,3,84,50"
-locations_default(#22931,#10000,84,3,84,50)
-hasLocation(#22930,#22931)
-stmt_containers(#22930,#22805)
-#22932=*
-typeexprs(#22932,1,#22930,0,"T5")
-hasLocation(#22932,#21678)
-enclosing_stmt(#22932,#22930)
-expr_containers(#22932,#22805)
-literals("T5","T5",#22932)
-typedecl(#22932,#22815)
+typeexprs(#22930,2,#22927,0,"string")
+hasLocation(#22930,#21664)
+enclosing_stmt(#22930,#22919)
+expr_containers(#22930,#22805)
+literals("string","string",#22930)
+#22931=*
+stmts(#22931,35,#22805,6,"type T5 ... g>[]>>;")
+#22932=@"loc,{#10000},84,3,84,50"
+locations_default(#22932,#10000,84,3,84,50)
+hasLocation(#22931,#22932)
+stmt_containers(#22931,#22805)
 #22933=*
-typeexprs(#22933,14,#22930,1,"Unpacke ... ng>[]>>")
-#22934=@"loc,{#10000},84,13,84,49"
-locations_default(#22934,#10000,84,13,84,49)
-hasLocation(#22933,#22934)
-enclosing_stmt(#22933,#22930)
+typeexprs(#22933,1,#22931,0,"T5")
+hasLocation(#22933,#21678)
+enclosing_stmt(#22933,#22931)
 expr_containers(#22933,#22805)
-#22935=*
-typeexprs(#22935,0,#22933,-1,"Unpacked")
-hasLocation(#22935,#21682)
-enclosing_stmt(#22935,#22930)
-expr_containers(#22935,#22805)
-literals("Unpacked","Unpacked",#22935)
-typebind(#22935,#22809)
+literals("T5","T5",#22933)
+typedecl(#22933,#22816)
+#22934=*
+typeexprs(#22934,14,#22931,1,"Unpacke ... ng>[]>>")
+#22935=@"loc,{#10000},84,13,84,49"
+locations_default(#22935,#10000,84,13,84,49)
+hasLocation(#22934,#22935)
+enclosing_stmt(#22934,#22931)
+expr_containers(#22934,#22805)
 #22936=*
-typeexprs(#22936,14,#22933,0,"Unpacke ... ing>[]>")
-#22937=@"loc,{#10000},84,22,84,48"
-locations_default(#22937,#10000,84,22,84,48)
-hasLocation(#22936,#22937)
-enclosing_stmt(#22936,#22930)
+typeexprs(#22936,0,#22934,-1,"Unpacked")
+hasLocation(#22936,#21682)
+enclosing_stmt(#22936,#22931)
 expr_containers(#22936,#22805)
-#22938=*
-typeexprs(#22938,0,#22936,-1,"Unpacked")
-hasLocation(#22938,#21686)
-enclosing_stmt(#22938,#22930)
-expr_containers(#22938,#22805)
-literals("Unpacked","Unpacked",#22938)
-typebind(#22938,#22809)
+literals("Unpacked","Unpacked",#22936)
+typebind(#22936,#22810)
+#22937=*
+typeexprs(#22937,14,#22934,0,"Unpacke ... ing>[]>")
+#22938=@"loc,{#10000},84,22,84,48"
+locations_default(#22938,#10000,84,22,84,48)
+hasLocation(#22937,#22938)
+enclosing_stmt(#22937,#22931)
+expr_containers(#22937,#22805)
 #22939=*
-typeexprs(#22939,6,#22936,0,"Promise<string>[]")
-#22940=@"loc,{#10000},84,31,84,47"
-locations_default(#22940,#10000,84,31,84,47)
-hasLocation(#22939,#22940)
-enclosing_stmt(#22939,#22930)
+typeexprs(#22939,0,#22937,-1,"Unpacked")
+hasLocation(#22939,#21686)
+enclosing_stmt(#22939,#22931)
 expr_containers(#22939,#22805)
-#22941=*
-typeexprs(#22941,14,#22939,0,"Promise<string>")
-#22942=@"loc,{#10000},84,31,84,45"
-locations_default(#22942,#10000,84,31,84,45)
-hasLocation(#22941,#22942)
-enclosing_stmt(#22941,#22930)
-expr_containers(#22941,#22805)
-#22943=*
-typeexprs(#22943,0,#22941,-1,"Promise")
-hasLocation(#22943,#21690)
-enclosing_stmt(#22943,#22930)
-expr_containers(#22943,#22805)
-literals("Promise","Promise",#22943)
+literals("Unpacked","Unpacked",#22939)
+typebind(#22939,#22810)
+#22940=*
+typeexprs(#22940,6,#22937,0,"Promise<string>[]")
+#22941=@"loc,{#10000},84,31,84,47"
+locations_default(#22941,#10000,84,31,84,47)
+hasLocation(#22940,#22941)
+enclosing_stmt(#22940,#22931)
+expr_containers(#22940,#22805)
+#22942=*
+typeexprs(#22942,14,#22940,0,"Promise<string>")
+#22943=@"loc,{#10000},84,31,84,45"
+locations_default(#22943,#10000,84,31,84,45)
+hasLocation(#22942,#22943)
+enclosing_stmt(#22942,#22931)
+expr_containers(#22942,#22805)
 #22944=*
-typeexprs(#22944,2,#22941,0,"string")
-hasLocation(#22944,#21694)
-enclosing_stmt(#22944,#22930)
+typeexprs(#22944,0,#22942,-1,"Promise")
+hasLocation(#22944,#21690)
+enclosing_stmt(#22944,#22931)
 expr_containers(#22944,#22805)
-literals("string","string",#22944)
+literals("Promise","Promise",#22944)
 #22945=*
-stmts(#22945,35,#22805,7,"type Fo ...  never;")
-#22946=@"loc,{#10000},86,3,86,65"
-locations_default(#22946,#10000,86,3,86,65)
-hasLocation(#22945,#22946)
-stmt_containers(#22945,#22805)
-#22947=*
-typeexprs(#22947,1,#22945,0,"Foo")
-hasLocation(#22947,#21710)
-enclosing_stmt(#22947,#22945)
-expr_containers(#22947,#22805)
-literals("Foo","Foo",#22947)
-typedecl(#22947,#22816)
+typeexprs(#22945,2,#22942,0,"string")
+hasLocation(#22945,#21694)
+enclosing_stmt(#22945,#22931)
+expr_containers(#22945,#22805)
+literals("string","string",#22945)
+#22946=*
+stmts(#22946,35,#22805,7,"type Fo ...  never;")
+#22947=@"loc,{#10000},86,3,86,65"
+locations_default(#22947,#10000,86,3,86,65)
+hasLocation(#22946,#22947)
+stmt_containers(#22946,#22805)
 #22948=*
-scopes(#22948,12)
-scopenodes(#22945,#22948)
-scopenesting(#22948,#22808)
-#22949=@"local_type_name;{T};{#22948}"
-local_type_names(#22949,"T",#22948)
-#22950=*
-typeexprs(#22950,22,#22945,2,"T")
-hasLocation(#22950,#21714)
-enclosing_stmt(#22950,#22945)
-expr_containers(#22950,#22805)
+typeexprs(#22948,1,#22946,0,"Foo")
+hasLocation(#22948,#21710)
+enclosing_stmt(#22948,#22946)
+expr_containers(#22948,#22805)
+literals("Foo","Foo",#22948)
+typedecl(#22948,#22817)
+#22949=*
+scopes(#22949,12)
+scopenodes(#22946,#22949)
+scopenesting(#22949,#22808)
+#22950=@"local_type_name;{T};{#22949}"
+local_type_names(#22950,"T",#22949)
 #22951=*
-typeexprs(#22951,1,#22950,0,"T")
+typeexprs(#22951,22,#22946,2,"T")
 hasLocation(#22951,#21714)
-enclosing_stmt(#22951,#22945)
+enclosing_stmt(#22951,#22946)
 expr_containers(#22951,#22805)
-literals("T","T",#22951)
-typedecl(#22951,#22949)
 #22952=*
-typeexprs(#22952,28,#22945,1,"T exten ... : never")
-#22953=@"loc,{#10000},86,17,86,64"
-locations_default(#22953,#10000,86,17,86,64)
-hasLocation(#22952,#22953)
-enclosing_stmt(#22952,#22945)
+typeexprs(#22952,1,#22951,0,"T")
+hasLocation(#22952,#21714)
+enclosing_stmt(#22952,#22946)
 expr_containers(#22952,#22805)
-#22954=*
-typeexprs(#22954,0,#22952,0,"T")
-hasLocation(#22954,#21720)
-enclosing_stmt(#22954,#22945)
-expr_containers(#22954,#22805)
-literals("T","T",#22954)
-typebind(#22954,#22949)
+literals("T","T",#22952)
+typedecl(#22952,#22950)
+#22953=*
+typeexprs(#22953,28,#22946,1,"T exten ... : never")
+#22954=@"loc,{#10000},86,17,86,64"
+locations_default(#22954,#10000,86,17,86,64)
+hasLocation(#22953,#22954)
+enclosing_stmt(#22953,#22946)
+expr_containers(#22953,#22805)
 #22955=*
-typeexprs(#22955,21,#22952,1,"{ a: in ... fer U }")
-#22956=@"loc,{#10000},86,27,86,52"
-locations_default(#22956,#10000,86,27,86,52)
-hasLocation(#22955,#22956)
-enclosing_stmt(#22955,#22945)
+typeexprs(#22955,0,#22953,0,"T")
+hasLocation(#22955,#21720)
+enclosing_stmt(#22955,#22946)
 expr_containers(#22955,#22805)
-#22957=*
-properties(#22957,#22955,0,8,"a: infer U,")
-#22958=@"loc,{#10000},86,29,86,39"
-locations_default(#22958,#10000,86,29,86,39)
-hasLocation(#22957,#22958)
-#22959=*
-exprs(#22959,0,#22957,0,"a")
-hasLocation(#22959,#21726)
-enclosing_stmt(#22959,#22945)
-expr_containers(#22959,#22805)
-literals("a","a",#22959)
-is_abstract_member(#22957)
+literals("T","T",#22955)
+typebind(#22955,#22950)
+#22956=*
+typeexprs(#22956,21,#22953,1,"{ a: in ... fer U }")
+#22957=@"loc,{#10000},86,27,86,52"
+locations_default(#22957,#10000,86,27,86,52)
+hasLocation(#22956,#22957)
+enclosing_stmt(#22956,#22946)
+expr_containers(#22956,#22805)
+#22958=*
+properties(#22958,#22956,0,8,"a: infer U,")
+#22959=@"loc,{#10000},86,29,86,39"
+locations_default(#22959,#10000,86,29,86,39)
+hasLocation(#22958,#22959)
 #22960=*
-typeexprs(#22960,29,#22957,2,"infer U")
-#22961=@"loc,{#10000},86,32,86,38"
-locations_default(#22961,#10000,86,32,86,38)
-hasLocation(#22960,#22961)
-enclosing_stmt(#22960,#22945)
+exprs(#22960,0,#22958,0,"a")
+hasLocation(#22960,#21726)
+enclosing_stmt(#22960,#22946)
 expr_containers(#22960,#22805)
-#22962=*
-typeexprs(#22962,22,#22960,0,"U")
-hasLocation(#22962,#21732)
-enclosing_stmt(#22962,#22945)
-expr_containers(#22962,#22805)
+literals("a","a",#22960)
+is_abstract_member(#22958)
+#22961=*
+typeexprs(#22961,29,#22958,2,"infer U")
+#22962=@"loc,{#10000},86,32,86,38"
+locations_default(#22962,#10000,86,32,86,38)
+hasLocation(#22961,#22962)
+enclosing_stmt(#22961,#22946)
+expr_containers(#22961,#22805)
 #22963=*
-typeexprs(#22963,1,#22962,0,"U")
+typeexprs(#22963,22,#22961,0,"U")
 hasLocation(#22963,#21732)
-enclosing_stmt(#22963,#22945)
+enclosing_stmt(#22963,#22946)
 expr_containers(#22963,#22805)
-literals("U","U",#22963)
 #22964=*
-properties(#22964,#22955,1,8,"b: infer U")
-#22965=@"loc,{#10000},86,41,86,50"
-locations_default(#22965,#10000,86,41,86,50)
-hasLocation(#22964,#22965)
-#22966=*
-exprs(#22966,0,#22964,0,"b")
-hasLocation(#22966,#21736)
-enclosing_stmt(#22966,#22945)
-expr_containers(#22966,#22805)
-literals("b","b",#22966)
-is_abstract_member(#22964)
+typeexprs(#22964,1,#22963,0,"U")
+hasLocation(#22964,#21732)
+enclosing_stmt(#22964,#22946)
+expr_containers(#22964,#22805)
+literals("U","U",#22964)
+#22965=*
+properties(#22965,#22956,1,8,"b: infer U")
+#22966=@"loc,{#10000},86,41,86,50"
+locations_default(#22966,#10000,86,41,86,50)
+hasLocation(#22965,#22966)
 #22967=*
-typeexprs(#22967,29,#22964,2,"infer U")
-#22968=@"loc,{#10000},86,44,86,50"
-locations_default(#22968,#10000,86,44,86,50)
-hasLocation(#22967,#22968)
-enclosing_stmt(#22967,#22945)
+exprs(#22967,0,#22965,0,"b")
+hasLocation(#22967,#21736)
+enclosing_stmt(#22967,#22946)
 expr_containers(#22967,#22805)
-#22969=*
-typeexprs(#22969,22,#22967,0,"U")
-hasLocation(#22969,#21742)
-enclosing_stmt(#22969,#22945)
-expr_containers(#22969,#22805)
+literals("b","b",#22967)
+is_abstract_member(#22965)
+#22968=*
+typeexprs(#22968,29,#22965,2,"infer U")
+#22969=@"loc,{#10000},86,44,86,50"
+locations_default(#22969,#10000,86,44,86,50)
+hasLocation(#22968,#22969)
+enclosing_stmt(#22968,#22946)
+expr_containers(#22968,#22805)
 #22970=*
-typeexprs(#22970,1,#22969,0,"U")
+typeexprs(#22970,22,#22968,0,"U")
 hasLocation(#22970,#21742)
-enclosing_stmt(#22970,#22945)
+enclosing_stmt(#22970,#22946)
 expr_containers(#22970,#22805)
-literals("U","U",#22970)
 #22971=*
-typeexprs(#22971,0,#22952,2,"U")
-hasLocation(#22971,#21748)
-enclosing_stmt(#22971,#22945)
+typeexprs(#22971,1,#22970,0,"U")
+hasLocation(#22971,#21742)
+enclosing_stmt(#22971,#22946)
 expr_containers(#22971,#22805)
 literals("U","U",#22971)
 #22972=*
-typeexprs(#22972,2,#22952,3,"never")
-hasLocation(#22972,#21752)
-enclosing_stmt(#22972,#22945)
+typeexprs(#22972,0,#22953,2,"U")
+hasLocation(#22972,#21748)
+enclosing_stmt(#22972,#22946)
 expr_containers(#22972,#22805)
-literals("never","never",#22972)
+literals("U","U",#22972)
 #22973=*
-stmts(#22973,35,#22805,8,"type T1 ... ing }>;")
-#22974=@"loc,{#10000},87,3,87,43"
-locations_default(#22974,#10000,87,3,87,43)
-hasLocation(#22973,#22974)
-stmt_containers(#22973,#22805)
-#22975=*
-typeexprs(#22975,1,#22973,0,"T10")
-hasLocation(#22975,#21758)
-enclosing_stmt(#22975,#22973)
-expr_containers(#22975,#22805)
-literals("T10","T10",#22975)
-typedecl(#22975,#22817)
+typeexprs(#22973,2,#22953,3,"never")
+hasLocation(#22973,#21752)
+enclosing_stmt(#22973,#22946)
+expr_containers(#22973,#22805)
+literals("never","never",#22973)
+#22974=*
+stmts(#22974,35,#22805,8,"type T1 ... ing }>;")
+#22975=@"loc,{#10000},87,3,87,43"
+locations_default(#22975,#10000,87,3,87,43)
+hasLocation(#22974,#22975)
+stmt_containers(#22974,#22805)
 #22976=*
-typeexprs(#22976,14,#22973,1,"Foo<{ a ... ring }>")
-#22977=@"loc,{#10000},87,14,87,42"
-locations_default(#22977,#10000,87,14,87,42)
-hasLocation(#22976,#22977)
-enclosing_stmt(#22976,#22973)
+typeexprs(#22976,1,#22974,0,"T10")
+hasLocation(#22976,#21758)
+enclosing_stmt(#22976,#22974)
 expr_containers(#22976,#22805)
-#22978=*
-typeexprs(#22978,0,#22976,-1,"Foo")
-hasLocation(#22978,#21762)
-enclosing_stmt(#22978,#22973)
-expr_containers(#22978,#22805)
-literals("Foo","Foo",#22978)
-typebind(#22978,#22816)
+literals("T10","T10",#22976)
+typedecl(#22976,#22818)
+#22977=*
+typeexprs(#22977,14,#22974,1,"Foo<{ a ... ring }>")
+#22978=@"loc,{#10000},87,14,87,42"
+locations_default(#22978,#10000,87,14,87,42)
+hasLocation(#22977,#22978)
+enclosing_stmt(#22977,#22974)
+expr_containers(#22977,#22805)
 #22979=*
-typeexprs(#22979,21,#22976,0,"{ a: st ... tring }")
-#22980=@"loc,{#10000},87,18,87,41"
-locations_default(#22980,#10000,87,18,87,41)
-hasLocation(#22979,#22980)
-enclosing_stmt(#22979,#22973)
+typeexprs(#22979,0,#22977,-1,"Foo")
+hasLocation(#22979,#21762)
+enclosing_stmt(#22979,#22974)
 expr_containers(#22979,#22805)
-#22981=*
-properties(#22981,#22979,0,8,"a: string,")
-#22982=@"loc,{#10000},87,20,87,29"
-locations_default(#22982,#10000,87,20,87,29)
-hasLocation(#22981,#22982)
-#22983=*
-exprs(#22983,0,#22981,0,"a")
-hasLocation(#22983,#21768)
-enclosing_stmt(#22983,#22973)
-expr_containers(#22983,#22805)
-literals("a","a",#22983)
-is_abstract_member(#22981)
+literals("Foo","Foo",#22979)
+typebind(#22979,#22817)
+#22980=*
+typeexprs(#22980,21,#22977,0,"{ a: st ... tring }")
+#22981=@"loc,{#10000},87,18,87,41"
+locations_default(#22981,#10000,87,18,87,41)
+hasLocation(#22980,#22981)
+enclosing_stmt(#22980,#22974)
+expr_containers(#22980,#22805)
+#22982=*
+properties(#22982,#22980,0,8,"a: string,")
+#22983=@"loc,{#10000},87,20,87,29"
+locations_default(#22983,#10000,87,20,87,29)
+hasLocation(#22982,#22983)
 #22984=*
-typeexprs(#22984,2,#22981,2,"string")
-hasLocation(#22984,#21772)
-enclosing_stmt(#22984,#22973)
+exprs(#22984,0,#22982,0,"a")
+hasLocation(#22984,#21768)
+enclosing_stmt(#22984,#22974)
 expr_containers(#22984,#22805)
-literals("string","string",#22984)
+literals("a","a",#22984)
+is_abstract_member(#22982)
 #22985=*
-properties(#22985,#22979,1,8,"b: string")
-#22986=@"loc,{#10000},87,31,87,39"
-locations_default(#22986,#10000,87,31,87,39)
-hasLocation(#22985,#22986)
-#22987=*
-exprs(#22987,0,#22985,0,"b")
-hasLocation(#22987,#21776)
-enclosing_stmt(#22987,#22973)
-expr_containers(#22987,#22805)
-literals("b","b",#22987)
-is_abstract_member(#22985)
+typeexprs(#22985,2,#22982,2,"string")
+hasLocation(#22985,#21772)
+enclosing_stmt(#22985,#22974)
+expr_containers(#22985,#22805)
+literals("string","string",#22985)
+#22986=*
+properties(#22986,#22980,1,8,"b: string")
+#22987=@"loc,{#10000},87,31,87,39"
+locations_default(#22987,#10000,87,31,87,39)
+hasLocation(#22986,#22987)
 #22988=*
-typeexprs(#22988,2,#22985,2,"string")
-hasLocation(#22988,#21780)
-enclosing_stmt(#22988,#22973)
+exprs(#22988,0,#22986,0,"b")
+hasLocation(#22988,#21776)
+enclosing_stmt(#22988,#22974)
 expr_containers(#22988,#22805)
-literals("string","string",#22988)
+literals("b","b",#22988)
+is_abstract_member(#22986)
 #22989=*
-stmts(#22989,35,#22805,9,"type T1 ... ber }>;")
-#22990=@"loc,{#10000},88,3,88,43"
-locations_default(#22990,#10000,88,3,88,43)
-hasLocation(#22989,#22990)
-stmt_containers(#22989,#22805)
-#22991=*
-typeexprs(#22991,1,#22989,0,"T11")
-hasLocation(#22991,#21790)
-enclosing_stmt(#22991,#22989)
-expr_containers(#22991,#22805)
-literals("T11","T11",#22991)
-typedecl(#22991,#22818)
+typeexprs(#22989,2,#22986,2,"string")
+hasLocation(#22989,#21780)
+enclosing_stmt(#22989,#22974)
+expr_containers(#22989,#22805)
+literals("string","string",#22989)
+#22990=*
+stmts(#22990,35,#22805,9,"type T1 ... ber }>;")
+#22991=@"loc,{#10000},88,3,88,43"
+locations_default(#22991,#10000,88,3,88,43)
+hasLocation(#22990,#22991)
+stmt_containers(#22990,#22805)
 #22992=*
-typeexprs(#22992,14,#22989,1,"Foo<{ a ... mber }>")
-#22993=@"loc,{#10000},88,14,88,42"
-locations_default(#22993,#10000,88,14,88,42)
-hasLocation(#22992,#22993)
-enclosing_stmt(#22992,#22989)
+typeexprs(#22992,1,#22990,0,"T11")
+hasLocation(#22992,#21790)
+enclosing_stmt(#22992,#22990)
 expr_containers(#22992,#22805)
-#22994=*
-typeexprs(#22994,0,#22992,-1,"Foo")
-hasLocation(#22994,#21794)
-enclosing_stmt(#22994,#22989)
-expr_containers(#22994,#22805)
-literals("Foo","Foo",#22994)
-typebind(#22994,#22816)
+literals("T11","T11",#22992)
+typedecl(#22992,#22819)
+#22993=*
+typeexprs(#22993,14,#22990,1,"Foo<{ a ... mber }>")
+#22994=@"loc,{#10000},88,14,88,42"
+locations_default(#22994,#10000,88,14,88,42)
+hasLocation(#22993,#22994)
+enclosing_stmt(#22993,#22990)
+expr_containers(#22993,#22805)
 #22995=*
-typeexprs(#22995,21,#22992,0,"{ a: st ... umber }")
-#22996=@"loc,{#10000},88,18,88,41"
-locations_default(#22996,#10000,88,18,88,41)
-hasLocation(#22995,#22996)
-enclosing_stmt(#22995,#22989)
+typeexprs(#22995,0,#22993,-1,"Foo")
+hasLocation(#22995,#21794)
+enclosing_stmt(#22995,#22990)
 expr_containers(#22995,#22805)
-#22997=*
-properties(#22997,#22995,0,8,"a: string,")
-#22998=@"loc,{#10000},88,20,88,29"
-locations_default(#22998,#10000,88,20,88,29)
-hasLocation(#22997,#22998)
-#22999=*
-exprs(#22999,0,#22997,0,"a")
-hasLocation(#22999,#21800)
-enclosing_stmt(#22999,#22989)
-expr_containers(#22999,#22805)
-literals("a","a",#22999)
-is_abstract_member(#22997)
+literals("Foo","Foo",#22995)
+typebind(#22995,#22817)
+#22996=*
+typeexprs(#22996,21,#22993,0,"{ a: st ... umber }")
+#22997=@"loc,{#10000},88,18,88,41"
+locations_default(#22997,#10000,88,18,88,41)
+hasLocation(#22996,#22997)
+enclosing_stmt(#22996,#22990)
+expr_containers(#22996,#22805)
+#22998=*
+properties(#22998,#22996,0,8,"a: string,")
+#22999=@"loc,{#10000},88,20,88,29"
+locations_default(#22999,#10000,88,20,88,29)
+hasLocation(#22998,#22999)
 #23000=*
-typeexprs(#23000,2,#22997,2,"string")
-hasLocation(#23000,#21804)
-enclosing_stmt(#23000,#22989)
+exprs(#23000,0,#22998,0,"a")
+hasLocation(#23000,#21800)
+enclosing_stmt(#23000,#22990)
 expr_containers(#23000,#22805)
-literals("string","string",#23000)
+literals("a","a",#23000)
+is_abstract_member(#22998)
 #23001=*
-properties(#23001,#22995,1,8,"b: number")
-#23002=@"loc,{#10000},88,31,88,39"
-locations_default(#23002,#10000,88,31,88,39)
-hasLocation(#23001,#23002)
-#23003=*
-exprs(#23003,0,#23001,0,"b")
-hasLocation(#23003,#21808)
-enclosing_stmt(#23003,#22989)
-expr_containers(#23003,#22805)
-literals("b","b",#23003)
-is_abstract_member(#23001)
+typeexprs(#23001,2,#22998,2,"string")
+hasLocation(#23001,#21804)
+enclosing_stmt(#23001,#22990)
+expr_containers(#23001,#22805)
+literals("string","string",#23001)
+#23002=*
+properties(#23002,#22996,1,8,"b: number")
+#23003=@"loc,{#10000},88,31,88,39"
+locations_default(#23003,#10000,88,31,88,39)
+hasLocation(#23002,#23003)
 #23004=*
-typeexprs(#23004,2,#23001,2,"number")
-hasLocation(#23004,#21812)
-enclosing_stmt(#23004,#22989)
+exprs(#23004,0,#23002,0,"b")
+hasLocation(#23004,#21808)
+enclosing_stmt(#23004,#22990)
 expr_containers(#23004,#22805)
-literals("number","number",#23004)
+literals("b","b",#23004)
+is_abstract_member(#23002)
 #23005=*
-stmts(#23005,35,#22805,10,"type Ba ...  never;")
-#23006=@"loc,{#10000},90,3,90,91"
-locations_default(#23006,#10000,90,3,90,91)
-hasLocation(#23005,#23006)
-stmt_containers(#23005,#22805)
-#23007=*
-typeexprs(#23007,1,#23005,0,"Bar")
-hasLocation(#23007,#21822)
-enclosing_stmt(#23007,#23005)
-expr_containers(#23007,#22805)
-literals("Bar","Bar",#23007)
-typedecl(#23007,#22819)
+typeexprs(#23005,2,#23002,2,"number")
+hasLocation(#23005,#21812)
+enclosing_stmt(#23005,#22990)
+expr_containers(#23005,#22805)
+literals("number","number",#23005)
+#23006=*
+stmts(#23006,35,#22805,10,"type Ba ...  never;")
+#23007=@"loc,{#10000},90,3,90,91"
+locations_default(#23007,#10000,90,3,90,91)
+hasLocation(#23006,#23007)
+stmt_containers(#23006,#22805)
 #23008=*
-scopes(#23008,12)
-scopenodes(#23005,#23008)
-scopenesting(#23008,#22808)
-#23009=@"local_type_name;{T};{#23008}"
-local_type_names(#23009,"T",#23008)
-#23010=*
-typeexprs(#23010,22,#23005,2,"T")
-hasLocation(#23010,#21826)
-enclosing_stmt(#23010,#23005)
-expr_containers(#23010,#22805)
+typeexprs(#23008,1,#23006,0,"Bar")
+hasLocation(#23008,#21822)
+enclosing_stmt(#23008,#23006)
+expr_containers(#23008,#22805)
+literals("Bar","Bar",#23008)
+typedecl(#23008,#22820)
+#23009=*
+scopes(#23009,12)
+scopenodes(#23006,#23009)
+scopenesting(#23009,#22808)
+#23010=@"local_type_name;{T};{#23009}"
+local_type_names(#23010,"T",#23009)
 #23011=*
-typeexprs(#23011,1,#23010,0,"T")
+typeexprs(#23011,22,#23006,2,"T")
 hasLocation(#23011,#21826)
-enclosing_stmt(#23011,#23005)
+enclosing_stmt(#23011,#23006)
 expr_containers(#23011,#22805)
-literals("T","T",#23011)
-typedecl(#23011,#23009)
 #23012=*
-typeexprs(#23012,28,#23005,1,"T exten ... : never")
-#23013=@"loc,{#10000},90,17,90,90"
-locations_default(#23013,#10000,90,17,90,90)
-hasLocation(#23012,#23013)
-enclosing_stmt(#23012,#23005)
+typeexprs(#23012,1,#23011,0,"T")
+hasLocation(#23012,#21826)
+enclosing_stmt(#23012,#23006)
 expr_containers(#23012,#22805)
-#23014=*
-typeexprs(#23014,0,#23012,0,"T")
-hasLocation(#23014,#21832)
-enclosing_stmt(#23014,#23005)
-expr_containers(#23014,#22805)
-literals("T","T",#23014)
-typebind(#23014,#23009)
+literals("T","T",#23012)
+typedecl(#23012,#23010)
+#23013=*
+typeexprs(#23013,28,#23006,1,"T exten ... : never")
+#23014=@"loc,{#10000},90,17,90,90"
+locations_default(#23014,#10000,90,17,90,90)
+hasLocation(#23013,#23014)
+enclosing_stmt(#23013,#23006)
+expr_containers(#23013,#22805)
 #23015=*
-typeexprs(#23015,21,#23012,1,"{ a: (x ...  void }")
-#23016=@"loc,{#10000},90,27,90,78"
-locations_default(#23016,#10000,90,27,90,78)
-hasLocation(#23015,#23016)
-enclosing_stmt(#23015,#23005)
+typeexprs(#23015,0,#23013,0,"T")
+hasLocation(#23015,#21832)
+enclosing_stmt(#23015,#23006)
 expr_containers(#23015,#22805)
-#23017=*
-properties(#23017,#23015,0,8,"a: (x:  ... > void,")
-#23018=@"loc,{#10000},90,29,90,52"
-locations_default(#23018,#10000,90,29,90,52)
-hasLocation(#23017,#23018)
-#23019=*
-exprs(#23019,0,#23017,0,"a")
-hasLocation(#23019,#21838)
-enclosing_stmt(#23019,#23005)
-expr_containers(#23019,#22805)
-literals("a","a",#23019)
-is_abstract_member(#23017)
+literals("T","T",#23015)
+typebind(#23015,#23010)
+#23016=*
+typeexprs(#23016,21,#23013,1,"{ a: (x ...  void }")
+#23017=@"loc,{#10000},90,27,90,78"
+locations_default(#23017,#10000,90,27,90,78)
+hasLocation(#23016,#23017)
+enclosing_stmt(#23016,#23006)
+expr_containers(#23016,#22805)
+#23018=*
+properties(#23018,#23016,0,8,"a: (x:  ... > void,")
+#23019=@"loc,{#10000},90,29,90,52"
+locations_default(#23019,#10000,90,29,90,52)
+hasLocation(#23018,#23019)
 #23020=*
-typeexprs(#23020,23,#23017,2,"(x: infer U) => void")
-#23021=@"loc,{#10000},90,32,90,51"
-locations_default(#23021,#10000,90,32,90,51)
-hasLocation(#23020,#23021)
-enclosing_stmt(#23020,#23005)
+exprs(#23020,0,#23018,0,"a")
+hasLocation(#23020,#21838)
+enclosing_stmt(#23020,#23006)
 expr_containers(#23020,#22805)
-#23022=*
-exprs(#23022,9,#23020,0,"(x: infer U) => void")
-hasLocation(#23022,#23021)
-enclosing_stmt(#23022,#23005)
-expr_containers(#23022,#22805)
+literals("a","a",#23020)
+is_abstract_member(#23018)
+#23021=*
+typeexprs(#23021,23,#23018,2,"(x: infer U) => void")
+#23022=@"loc,{#10000},90,32,90,51"
+locations_default(#23022,#10000,90,32,90,51)
+hasLocation(#23021,#23022)
+enclosing_stmt(#23021,#23006)
+expr_containers(#23021,#22805)
 #23023=*
-scopes(#23023,1)
-scopenodes(#23022,#23023)
-scopenesting(#23023,#23008)
-#23024=@"var;{x};{#23023}"
-variables(#23024,"x",#23023)
-#23025=*
-exprs(#23025,78,#23022,0,"x")
-hasLocation(#23025,#21844)
-expr_containers(#23025,#23022)
-literals("x","x",#23025)
-decl(#23025,#23024)
-#23026=@"var;{arguments};{#23023}"
-variables(#23026,"arguments",#23023)
-is_arguments_object(#23026)
-#23027=*
-typeexprs(#23027,2,#23022,-3,"void")
-hasLocation(#23027,#21856)
-expr_containers(#23027,#23022)
-literals("void","void",#23027)
+exprs(#23023,9,#23021,0,"(x: infer U) => void")
+hasLocation(#23023,#23022)
+enclosing_stmt(#23023,#23006)
+expr_containers(#23023,#22805)
+#23024=*
+scopes(#23024,1)
+scopenodes(#23023,#23024)
+scopenesting(#23024,#23009)
+#23025=@"var;{x};{#23024}"
+variables(#23025,"x",#23024)
+#23026=*
+exprs(#23026,78,#23023,0,"x")
+hasLocation(#23026,#21844)
+expr_containers(#23026,#23023)
+literals("x","x",#23026)
+decl(#23026,#23025)
+#23027=@"var;{arguments};{#23024}"
+variables(#23027,"arguments",#23024)
+is_arguments_object(#23027)
 #23028=*
-typeexprs(#23028,29,#23022,-6,"infer U")
-#23029=@"loc,{#10000},90,36,90,42"
-locations_default(#23029,#10000,90,36,90,42)
-hasLocation(#23028,#23029)
-expr_containers(#23028,#23022)
-#23030=*
-typeexprs(#23030,22,#23028,0,"U")
-hasLocation(#23030,#21850)
-expr_containers(#23030,#23022)
+typeexprs(#23028,2,#23023,-3,"void")
+hasLocation(#23028,#21856)
+expr_containers(#23028,#23023)
+literals("void","void",#23028)
+#23029=*
+typeexprs(#23029,29,#23023,-6,"infer U")
+#23030=@"loc,{#10000},90,36,90,42"
+locations_default(#23030,#10000,90,36,90,42)
+hasLocation(#23029,#23030)
+expr_containers(#23029,#23023)
 #23031=*
-typeexprs(#23031,1,#23030,0,"U")
+typeexprs(#23031,22,#23029,0,"U")
 hasLocation(#23031,#21850)
-expr_containers(#23031,#23022)
-literals("U","U",#23031)
+expr_containers(#23031,#23023)
 #23032=*
-properties(#23032,#23015,1,8,"b: (x:  ... => void")
-#23033=@"loc,{#10000},90,54,90,76"
-locations_default(#23033,#10000,90,54,90,76)
-hasLocation(#23032,#23033)
-#23034=*
-exprs(#23034,0,#23032,0,"b")
-hasLocation(#23034,#21860)
-enclosing_stmt(#23034,#23005)
-expr_containers(#23034,#22805)
-literals("b","b",#23034)
-is_abstract_member(#23032)
+typeexprs(#23032,1,#23031,0,"U")
+hasLocation(#23032,#21850)
+expr_containers(#23032,#23023)
+literals("U","U",#23032)
+#23033=*
+properties(#23033,#23016,1,8,"b: (x:  ... => void")
+#23034=@"loc,{#10000},90,54,90,76"
+locations_default(#23034,#10000,90,54,90,76)
+hasLocation(#23033,#23034)
 #23035=*
-typeexprs(#23035,23,#23032,2,"(x: infer U) => void")
-#23036=@"loc,{#10000},90,57,90,76"
-locations_default(#23036,#10000,90,57,90,76)
-hasLocation(#23035,#23036)
-enclosing_stmt(#23035,#23005)
+exprs(#23035,0,#23033,0,"b")
+hasLocation(#23035,#21860)
+enclosing_stmt(#23035,#23006)
 expr_containers(#23035,#22805)
-#23037=*
-exprs(#23037,9,#23035,0,"(x: infer U) => void")
-hasLocation(#23037,#23036)
-enclosing_stmt(#23037,#23005)
-expr_containers(#23037,#22805)
+literals("b","b",#23035)
+is_abstract_member(#23033)
+#23036=*
+typeexprs(#23036,23,#23033,2,"(x: infer U) => void")
+#23037=@"loc,{#10000},90,57,90,76"
+locations_default(#23037,#10000,90,57,90,76)
+hasLocation(#23036,#23037)
+enclosing_stmt(#23036,#23006)
+expr_containers(#23036,#22805)
 #23038=*
-scopes(#23038,1)
-scopenodes(#23037,#23038)
-scopenesting(#23038,#23008)
-#23039=@"var;{x};{#23038}"
-variables(#23039,"x",#23038)
-#23040=*
-exprs(#23040,78,#23037,0,"x")
-hasLocation(#23040,#21866)
-expr_containers(#23040,#23037)
-literals("x","x",#23040)
-decl(#23040,#23039)
-#23041=@"var;{arguments};{#23038}"
-variables(#23041,"arguments",#23038)
-is_arguments_object(#23041)
-#23042=*
-typeexprs(#23042,2,#23037,-3,"void")
-hasLocation(#23042,#21878)
-expr_containers(#23042,#23037)
-literals("void","void",#23042)
+exprs(#23038,9,#23036,0,"(x: infer U) => void")
+hasLocation(#23038,#23037)
+enclosing_stmt(#23038,#23006)
+expr_containers(#23038,#22805)
+#23039=*
+scopes(#23039,1)
+scopenodes(#23038,#23039)
+scopenesting(#23039,#23009)
+#23040=@"var;{x};{#23039}"
+variables(#23040,"x",#23039)
+#23041=*
+exprs(#23041,78,#23038,0,"x")
+hasLocation(#23041,#21866)
+expr_containers(#23041,#23038)
+literals("x","x",#23041)
+decl(#23041,#23040)
+#23042=@"var;{arguments};{#23039}"
+variables(#23042,"arguments",#23039)
+is_arguments_object(#23042)
 #23043=*
-typeexprs(#23043,29,#23037,-6,"infer U")
-#23044=@"loc,{#10000},90,61,90,67"
-locations_default(#23044,#10000,90,61,90,67)
-hasLocation(#23043,#23044)
-expr_containers(#23043,#23037)
-#23045=*
-typeexprs(#23045,22,#23043,0,"U")
-hasLocation(#23045,#21872)
-expr_containers(#23045,#23037)
+typeexprs(#23043,2,#23038,-3,"void")
+hasLocation(#23043,#21878)
+expr_containers(#23043,#23038)
+literals("void","void",#23043)
+#23044=*
+typeexprs(#23044,29,#23038,-6,"infer U")
+#23045=@"loc,{#10000},90,61,90,67"
+locations_default(#23045,#10000,90,61,90,67)
+hasLocation(#23044,#23045)
+expr_containers(#23044,#23038)
 #23046=*
-typeexprs(#23046,1,#23045,0,"U")
+typeexprs(#23046,22,#23044,0,"U")
 hasLocation(#23046,#21872)
-expr_containers(#23046,#23037)
-literals("U","U",#23046)
+expr_containers(#23046,#23038)
 #23047=*
-typeexprs(#23047,0,#23012,2,"U")
-hasLocation(#23047,#21884)
-enclosing_stmt(#23047,#23005)
-expr_containers(#23047,#22805)
+typeexprs(#23047,1,#23046,0,"U")
+hasLocation(#23047,#21872)
+expr_containers(#23047,#23038)
 literals("U","U",#23047)
 #23048=*
-typeexprs(#23048,2,#23012,3,"never")
-hasLocation(#23048,#21888)
-enclosing_stmt(#23048,#23005)
+typeexprs(#23048,0,#23013,2,"U")
+hasLocation(#23048,#21884)
+enclosing_stmt(#23048,#23006)
 expr_containers(#23048,#22805)
-literals("never","never",#23048)
+literals("U","U",#23048)
 #23049=*
-stmts(#23049,35,#22805,11,"type T2 ... oid }>;")
-#23050=@"loc,{#10000},91,3,91,69"
-locations_default(#23050,#10000,91,3,91,69)
-hasLocation(#23049,#23050)
-stmt_containers(#23049,#22805)
-#23051=*
-typeexprs(#23051,1,#23049,0,"T20")
-hasLocation(#23051,#21894)
-enclosing_stmt(#23051,#23049)
-expr_containers(#23051,#22805)
-literals("T20","T20",#23051)
-typedecl(#23051,#22820)
+typeexprs(#23049,2,#23013,3,"never")
+hasLocation(#23049,#21888)
+enclosing_stmt(#23049,#23006)
+expr_containers(#23049,#22805)
+literals("never","never",#23049)
+#23050=*
+stmts(#23050,35,#22805,11,"type T2 ... oid }>;")
+#23051=@"loc,{#10000},91,3,91,69"
+locations_default(#23051,#10000,91,3,91,69)
+hasLocation(#23050,#23051)
+stmt_containers(#23050,#22805)
 #23052=*
-typeexprs(#23052,14,#23049,1,"Bar<{ a ... void }>")
-#23053=@"loc,{#10000},91,14,91,68"
-locations_default(#23053,#10000,91,14,91,68)
-hasLocation(#23052,#23053)
-enclosing_stmt(#23052,#23049)
+typeexprs(#23052,1,#23050,0,"T20")
+hasLocation(#23052,#21894)
+enclosing_stmt(#23052,#23050)
 expr_containers(#23052,#22805)
-#23054=*
-typeexprs(#23054,0,#23052,-1,"Bar")
-hasLocation(#23054,#21898)
-enclosing_stmt(#23054,#23049)
-expr_containers(#23054,#22805)
-literals("Bar","Bar",#23054)
-typebind(#23054,#22819)
+literals("T20","T20",#23052)
+typedecl(#23052,#22821)
+#23053=*
+typeexprs(#23053,14,#23050,1,"Bar<{ a ... void }>")
+#23054=@"loc,{#10000},91,14,91,68"
+locations_default(#23054,#10000,91,14,91,68)
+hasLocation(#23053,#23054)
+enclosing_stmt(#23053,#23050)
+expr_containers(#23053,#22805)
 #23055=*
-typeexprs(#23055,21,#23052,0,"{ a: (x ...  void }")
-#23056=@"loc,{#10000},91,18,91,67"
-locations_default(#23056,#10000,91,18,91,67)
-hasLocation(#23055,#23056)
-enclosing_stmt(#23055,#23049)
+typeexprs(#23055,0,#23053,-1,"Bar")
+hasLocation(#23055,#21898)
+enclosing_stmt(#23055,#23050)
 expr_containers(#23055,#22805)
-#23057=*
-properties(#23057,#23055,0,8,"a: (x:  ... > void,")
-#23058=@"loc,{#10000},91,20,91,42"
-locations_default(#23058,#10000,91,20,91,42)
-hasLocation(#23057,#23058)
-#23059=*
-exprs(#23059,0,#23057,0,"a")
-hasLocation(#23059,#21904)
-enclosing_stmt(#23059,#23049)
-expr_containers(#23059,#22805)
-literals("a","a",#23059)
-is_abstract_member(#23057)
+literals("Bar","Bar",#23055)
+typebind(#23055,#22820)
+#23056=*
+typeexprs(#23056,21,#23053,0,"{ a: (x ...  void }")
+#23057=@"loc,{#10000},91,18,91,67"
+locations_default(#23057,#10000,91,18,91,67)
+hasLocation(#23056,#23057)
+enclosing_stmt(#23056,#23050)
+expr_containers(#23056,#22805)
+#23058=*
+properties(#23058,#23056,0,8,"a: (x:  ... > void,")
+#23059=@"loc,{#10000},91,20,91,42"
+locations_default(#23059,#10000,91,20,91,42)
+hasLocation(#23058,#23059)
 #23060=*
-typeexprs(#23060,23,#23057,2,"(x: string) => void")
-#23061=@"loc,{#10000},91,23,91,41"
-locations_default(#23061,#10000,91,23,91,41)
-hasLocation(#23060,#23061)
-enclosing_stmt(#23060,#23049)
+exprs(#23060,0,#23058,0,"a")
+hasLocation(#23060,#21904)
+enclosing_stmt(#23060,#23050)
 expr_containers(#23060,#22805)
-#23062=*
-exprs(#23062,9,#23060,0,"(x: string) => void")
-hasLocation(#23062,#23061)
-enclosing_stmt(#23062,#23049)
-expr_containers(#23062,#22805)
+literals("a","a",#23060)
+is_abstract_member(#23058)
+#23061=*
+typeexprs(#23061,23,#23058,2,"(x: string) => void")
+#23062=@"loc,{#10000},91,23,91,41"
+locations_default(#23062,#10000,91,23,91,41)
+hasLocation(#23061,#23062)
+enclosing_stmt(#23061,#23050)
+expr_containers(#23061,#22805)
 #23063=*
-scopes(#23063,1)
-scopenodes(#23062,#23063)
-scopenesting(#23063,#22808)
-#23064=@"var;{x};{#23063}"
-variables(#23064,"x",#23063)
-#23065=*
-exprs(#23065,78,#23062,0,"x")
-hasLocation(#23065,#21910)
-expr_containers(#23065,#23062)
-literals("x","x",#23065)
-decl(#23065,#23064)
-#23066=@"var;{arguments};{#23063}"
-variables(#23066,"arguments",#23063)
-is_arguments_object(#23066)
-#23067=*
-typeexprs(#23067,2,#23062,-3,"void")
-hasLocation(#23067,#21920)
-expr_containers(#23067,#23062)
-literals("void","void",#23067)
+exprs(#23063,9,#23061,0,"(x: string) => void")
+hasLocation(#23063,#23062)
+enclosing_stmt(#23063,#23050)
+expr_containers(#23063,#22805)
+#23064=*
+scopes(#23064,1)
+scopenodes(#23063,#23064)
+scopenesting(#23064,#22808)
+#23065=@"var;{x};{#23064}"
+variables(#23065,"x",#23064)
+#23066=*
+exprs(#23066,78,#23063,0,"x")
+hasLocation(#23066,#21910)
+expr_containers(#23066,#23063)
+literals("x","x",#23066)
+decl(#23066,#23065)
+#23067=@"var;{arguments};{#23064}"
+variables(#23067,"arguments",#23064)
+is_arguments_object(#23067)
 #23068=*
-typeexprs(#23068,2,#23062,-6,"string")
-hasLocation(#23068,#21914)
-expr_containers(#23068,#23062)
-literals("string","string",#23068)
+typeexprs(#23068,2,#23063,-3,"void")
+hasLocation(#23068,#21920)
+expr_containers(#23068,#23063)
+literals("void","void",#23068)
 #23069=*
-properties(#23069,#23055,1,8,"b: (x:  ... => void")
-#23070=@"loc,{#10000},91,44,91,65"
-locations_default(#23070,#10000,91,44,91,65)
-hasLocation(#23069,#23070)
-#23071=*
-exprs(#23071,0,#23069,0,"b")
-hasLocation(#23071,#21924)
-enclosing_stmt(#23071,#23049)
-expr_containers(#23071,#22805)
-literals("b","b",#23071)
-is_abstract_member(#23069)
+typeexprs(#23069,2,#23063,-6,"string")
+hasLocation(#23069,#21914)
+expr_containers(#23069,#23063)
+literals("string","string",#23069)
+#23070=*
+properties(#23070,#23056,1,8,"b: (x:  ... => void")
+#23071=@"loc,{#10000},91,44,91,65"
+locations_default(#23071,#10000,91,44,91,65)
+hasLocation(#23070,#23071)
 #23072=*
-typeexprs(#23072,23,#23069,2,"(x: string) => void")
-#23073=@"loc,{#10000},91,47,91,65"
-locations_default(#23073,#10000,91,47,91,65)
-hasLocation(#23072,#23073)
-enclosing_stmt(#23072,#23049)
+exprs(#23072,0,#23070,0,"b")
+hasLocation(#23072,#21924)
+enclosing_stmt(#23072,#23050)
 expr_containers(#23072,#22805)
-#23074=*
-exprs(#23074,9,#23072,0,"(x: string) => void")
-hasLocation(#23074,#23073)
-enclosing_stmt(#23074,#23049)
-expr_containers(#23074,#22805)
+literals("b","b",#23072)
+is_abstract_member(#23070)
+#23073=*
+typeexprs(#23073,23,#23070,2,"(x: string) => void")
+#23074=@"loc,{#10000},91,47,91,65"
+locations_default(#23074,#10000,91,47,91,65)
+hasLocation(#23073,#23074)
+enclosing_stmt(#23073,#23050)
+expr_containers(#23073,#22805)
 #23075=*
-scopes(#23075,1)
-scopenodes(#23074,#23075)
-scopenesting(#23075,#22808)
-#23076=@"var;{x};{#23075}"
-variables(#23076,"x",#23075)
-#23077=*
-exprs(#23077,78,#23074,0,"x")
-hasLocation(#23077,#21930)
-expr_containers(#23077,#23074)
-literals("x","x",#23077)
-decl(#23077,#23076)
-#23078=@"var;{arguments};{#23075}"
-variables(#23078,"arguments",#23075)
-is_arguments_object(#23078)
-#23079=*
-typeexprs(#23079,2,#23074,-3,"void")
-hasLocation(#23079,#21940)
-expr_containers(#23079,#23074)
-literals("void","void",#23079)
+exprs(#23075,9,#23073,0,"(x: string) => void")
+hasLocation(#23075,#23074)
+enclosing_stmt(#23075,#23050)
+expr_containers(#23075,#22805)
+#23076=*
+scopes(#23076,1)
+scopenodes(#23075,#23076)
+scopenesting(#23076,#22808)
+#23077=@"var;{x};{#23076}"
+variables(#23077,"x",#23076)
+#23078=*
+exprs(#23078,78,#23075,0,"x")
+hasLocation(#23078,#21930)
+expr_containers(#23078,#23075)
+literals("x","x",#23078)
+decl(#23078,#23077)
+#23079=@"var;{arguments};{#23076}"
+variables(#23079,"arguments",#23076)
+is_arguments_object(#23079)
 #23080=*
-typeexprs(#23080,2,#23074,-6,"string")
-hasLocation(#23080,#21934)
-expr_containers(#23080,#23074)
-literals("string","string",#23080)
+typeexprs(#23080,2,#23075,-3,"void")
+hasLocation(#23080,#21940)
+expr_containers(#23080,#23075)
+literals("void","void",#23080)
 #23081=*
-stmts(#23081,35,#22805,12,"type T2 ... oid }>;")
-#23082=@"loc,{#10000},92,3,92,69"
-locations_default(#23082,#10000,92,3,92,69)
-hasLocation(#23081,#23082)
-stmt_containers(#23081,#22805)
-#23083=*
-typeexprs(#23083,1,#23081,0,"T21")
-hasLocation(#23083,#21950)
-enclosing_stmt(#23083,#23081)
-expr_containers(#23083,#22805)
-literals("T21","T21",#23083)
-typedecl(#23083,#22821)
+typeexprs(#23081,2,#23075,-6,"string")
+hasLocation(#23081,#21934)
+expr_containers(#23081,#23075)
+literals("string","string",#23081)
+#23082=*
+stmts(#23082,35,#22805,12,"type T2 ... oid }>;")
+#23083=@"loc,{#10000},92,3,92,69"
+locations_default(#23083,#10000,92,3,92,69)
+hasLocation(#23082,#23083)
+stmt_containers(#23082,#22805)
 #23084=*
-typeexprs(#23084,14,#23081,1,"Bar<{ a ... void }>")
-#23085=@"loc,{#10000},92,14,92,68"
-locations_default(#23085,#10000,92,14,92,68)
-hasLocation(#23084,#23085)
-enclosing_stmt(#23084,#23081)
+typeexprs(#23084,1,#23082,0,"T21")
+hasLocation(#23084,#21950)
+enclosing_stmt(#23084,#23082)
 expr_containers(#23084,#22805)
-#23086=*
-typeexprs(#23086,0,#23084,-1,"Bar")
-hasLocation(#23086,#21954)
-enclosing_stmt(#23086,#23081)
-expr_containers(#23086,#22805)
-literals("Bar","Bar",#23086)
-typebind(#23086,#22819)
+literals("T21","T21",#23084)
+typedecl(#23084,#22822)
+#23085=*
+typeexprs(#23085,14,#23082,1,"Bar<{ a ... void }>")
+#23086=@"loc,{#10000},92,14,92,68"
+locations_default(#23086,#10000,92,14,92,68)
+hasLocation(#23085,#23086)
+enclosing_stmt(#23085,#23082)
+expr_containers(#23085,#22805)
 #23087=*
-typeexprs(#23087,21,#23084,0,"{ a: (x ...  void }")
-#23088=@"loc,{#10000},92,18,92,67"
-locations_default(#23088,#10000,92,18,92,67)
-hasLocation(#23087,#23088)
-enclosing_stmt(#23087,#23081)
+typeexprs(#23087,0,#23085,-1,"Bar")
+hasLocation(#23087,#21954)
+enclosing_stmt(#23087,#23082)
 expr_containers(#23087,#22805)
-#23089=*
-properties(#23089,#23087,0,8,"a: (x:  ... > void,")
-#23090=@"loc,{#10000},92,20,92,42"
-locations_default(#23090,#10000,92,20,92,42)
-hasLocation(#23089,#23090)
-#23091=*
-exprs(#23091,0,#23089,0,"a")
-hasLocation(#23091,#21960)
-enclosing_stmt(#23091,#23081)
-expr_containers(#23091,#22805)
-literals("a","a",#23091)
-is_abstract_member(#23089)
+literals("Bar","Bar",#23087)
+typebind(#23087,#22820)
+#23088=*
+typeexprs(#23088,21,#23085,0,"{ a: (x ...  void }")
+#23089=@"loc,{#10000},92,18,92,67"
+locations_default(#23089,#10000,92,18,92,67)
+hasLocation(#23088,#23089)
+enclosing_stmt(#23088,#23082)
+expr_containers(#23088,#22805)
+#23090=*
+properties(#23090,#23088,0,8,"a: (x:  ... > void,")
+#23091=@"loc,{#10000},92,20,92,42"
+locations_default(#23091,#10000,92,20,92,42)
+hasLocation(#23090,#23091)
 #23092=*
-typeexprs(#23092,23,#23089,2,"(x: string) => void")
-#23093=@"loc,{#10000},92,23,92,41"
-locations_default(#23093,#10000,92,23,92,41)
-hasLocation(#23092,#23093)
-enclosing_stmt(#23092,#23081)
+exprs(#23092,0,#23090,0,"a")
+hasLocation(#23092,#21960)
+enclosing_stmt(#23092,#23082)
 expr_containers(#23092,#22805)
-#23094=*
-exprs(#23094,9,#23092,0,"(x: string) => void")
-hasLocation(#23094,#23093)
-enclosing_stmt(#23094,#23081)
-expr_containers(#23094,#22805)
+literals("a","a",#23092)
+is_abstract_member(#23090)
+#23093=*
+typeexprs(#23093,23,#23090,2,"(x: string) => void")
+#23094=@"loc,{#10000},92,23,92,41"
+locations_default(#23094,#10000,92,23,92,41)
+hasLocation(#23093,#23094)
+enclosing_stmt(#23093,#23082)
+expr_containers(#23093,#22805)
 #23095=*
-scopes(#23095,1)
-scopenodes(#23094,#23095)
-scopenesting(#23095,#22808)
-#23096=@"var;{x};{#23095}"
-variables(#23096,"x",#23095)
-#23097=*
-exprs(#23097,78,#23094,0,"x")
-hasLocation(#23097,#21966)
-expr_containers(#23097,#23094)
-literals("x","x",#23097)
-decl(#23097,#23096)
-#23098=@"var;{arguments};{#23095}"
-variables(#23098,"arguments",#23095)
-is_arguments_object(#23098)
-#23099=*
-typeexprs(#23099,2,#23094,-3,"void")
-hasLocation(#23099,#21976)
-expr_containers(#23099,#23094)
-literals("void","void",#23099)
+exprs(#23095,9,#23093,0,"(x: string) => void")
+hasLocation(#23095,#23094)
+enclosing_stmt(#23095,#23082)
+expr_containers(#23095,#22805)
+#23096=*
+scopes(#23096,1)
+scopenodes(#23095,#23096)
+scopenesting(#23096,#22808)
+#23097=@"var;{x};{#23096}"
+variables(#23097,"x",#23096)
+#23098=*
+exprs(#23098,78,#23095,0,"x")
+hasLocation(#23098,#21966)
+expr_containers(#23098,#23095)
+literals("x","x",#23098)
+decl(#23098,#23097)
+#23099=@"var;{arguments};{#23096}"
+variables(#23099,"arguments",#23096)
+is_arguments_object(#23099)
 #23100=*
-typeexprs(#23100,2,#23094,-6,"string")
-hasLocation(#23100,#21970)
-expr_containers(#23100,#23094)
-literals("string","string",#23100)
+typeexprs(#23100,2,#23095,-3,"void")
+hasLocation(#23100,#21976)
+expr_containers(#23100,#23095)
+literals("void","void",#23100)
 #23101=*
-properties(#23101,#23087,1,8,"b: (x:  ... => void")
-#23102=@"loc,{#10000},92,44,92,65"
-locations_default(#23102,#10000,92,44,92,65)
-hasLocation(#23101,#23102)
-#23103=*
-exprs(#23103,0,#23101,0,"b")
-hasLocation(#23103,#21980)
-enclosing_stmt(#23103,#23081)
-expr_containers(#23103,#22805)
-literals("b","b",#23103)
-is_abstract_member(#23101)
+typeexprs(#23101,2,#23095,-6,"string")
+hasLocation(#23101,#21970)
+expr_containers(#23101,#23095)
+literals("string","string",#23101)
+#23102=*
+properties(#23102,#23088,1,8,"b: (x:  ... => void")
+#23103=@"loc,{#10000},92,44,92,65"
+locations_default(#23103,#10000,92,44,92,65)
+hasLocation(#23102,#23103)
 #23104=*
-typeexprs(#23104,23,#23101,2,"(x: number) => void")
-#23105=@"loc,{#10000},92,47,92,65"
-locations_default(#23105,#10000,92,47,92,65)
-hasLocation(#23104,#23105)
-enclosing_stmt(#23104,#23081)
+exprs(#23104,0,#23102,0,"b")
+hasLocation(#23104,#21980)
+enclosing_stmt(#23104,#23082)
 expr_containers(#23104,#22805)
-#23106=*
-exprs(#23106,9,#23104,0,"(x: number) => void")
-hasLocation(#23106,#23105)
-enclosing_stmt(#23106,#23081)
-expr_containers(#23106,#22805)
+literals("b","b",#23104)
+is_abstract_member(#23102)
+#23105=*
+typeexprs(#23105,23,#23102,2,"(x: number) => void")
+#23106=@"loc,{#10000},92,47,92,65"
+locations_default(#23106,#10000,92,47,92,65)
+hasLocation(#23105,#23106)
+enclosing_stmt(#23105,#23082)
+expr_containers(#23105,#22805)
 #23107=*
-scopes(#23107,1)
-scopenodes(#23106,#23107)
-scopenesting(#23107,#22808)
-#23108=@"var;{x};{#23107}"
-variables(#23108,"x",#23107)
-#23109=*
-exprs(#23109,78,#23106,0,"x")
-hasLocation(#23109,#21986)
-expr_containers(#23109,#23106)
-literals("x","x",#23109)
-decl(#23109,#23108)
-#23110=@"var;{arguments};{#23107}"
-variables(#23110,"arguments",#23107)
-is_arguments_object(#23110)
-#23111=*
-typeexprs(#23111,2,#23106,-3,"void")
-hasLocation(#23111,#21996)
-expr_containers(#23111,#23106)
-literals("void","void",#23111)
+exprs(#23107,9,#23105,0,"(x: number) => void")
+hasLocation(#23107,#23106)
+enclosing_stmt(#23107,#23082)
+expr_containers(#23107,#22805)
+#23108=*
+scopes(#23108,1)
+scopenodes(#23107,#23108)
+scopenesting(#23108,#22808)
+#23109=@"var;{x};{#23108}"
+variables(#23109,"x",#23108)
+#23110=*
+exprs(#23110,78,#23107,0,"x")
+hasLocation(#23110,#21986)
+expr_containers(#23110,#23107)
+literals("x","x",#23110)
+decl(#23110,#23109)
+#23111=@"var;{arguments};{#23108}"
+variables(#23111,"arguments",#23108)
+is_arguments_object(#23111)
 #23112=*
-typeexprs(#23112,2,#23106,-6,"number")
-hasLocation(#23112,#21990)
-expr_containers(#23112,#23106)
-literals("number","number",#23112)
+typeexprs(#23112,2,#23107,-3,"void")
+hasLocation(#23112,#21996)
+expr_containers(#23112,#23107)
+literals("void","void",#23112)
 #23113=*
-stmts(#23113,17,#22805,13,"declare ... number;")
-#23114=@"loc,{#10000},94,3,94,42"
-locations_default(#23114,#10000,94,3,94,42)
-hasLocation(#23113,#23114)
-stmt_containers(#23113,#22805)
-has_declare_keyword(#23113)
-#23115=*
-exprs(#23115,78,#23113,-1,"foo")
-hasLocation(#23115,#22008)
-expr_containers(#23115,#23113)
-literals("foo","foo",#23115)
-#23116=@"var;{foo};{#20000}"
-variables(#23116,"foo",#20000)
-decl(#23115,#23116)
+typeexprs(#23113,2,#23107,-6,"number")
+hasLocation(#23113,#21990)
+expr_containers(#23113,#23107)
+literals("number","number",#23113)
+#23114=*
+stmts(#23114,17,#22805,13,"declare ... number;")
+#23115=@"loc,{#10000},94,3,94,42"
+locations_default(#23115,#10000,94,3,94,42)
+hasLocation(#23114,#23115)
+stmt_containers(#23114,#22805)
+has_declare_keyword(#23114)
+#23116=*
+exprs(#23116,78,#23114,-1,"foo")
+hasLocation(#23116,#22008)
+expr_containers(#23116,#23114)
+literals("foo","foo",#23116)
+decl(#23116,#22809)
 #23117=*
 scopes(#23117,1)
-scopenodes(#23113,#23117)
+scopenodes(#23114,#23117)
 scopenesting(#23117,#22808)
 #23118=@"var;{x};{#23117}"
 variables(#23118,"x",#23117)
 #23119=*
-exprs(#23119,78,#23113,0,"x")
+exprs(#23119,78,#23114,0,"x")
 hasLocation(#23119,#22012)
-expr_containers(#23119,#23113)
+expr_containers(#23119,#23114)
 literals("x","x",#23119)
 decl(#23119,#23118)
 #23120=@"var;{arguments};{#23117}"
 variables(#23120,"arguments",#23117)
 is_arguments_object(#23120)
 #23121=*
-typeexprs(#23121,2,#23113,-3,"number")
+typeexprs(#23121,2,#23114,-3,"number")
 hasLocation(#23121,#22022)
-expr_containers(#23121,#23113)
+expr_containers(#23121,#23114)
 literals("number","number",#23121)
 #23122=*
-typeexprs(#23122,2,#23113,-6,"string")
+typeexprs(#23122,2,#23114,-6,"string")
 hasLocation(#23122,#22016)
-expr_containers(#23122,#23113)
+expr_containers(#23122,#23114)
 literals("string","string",#23122)
 #23123=*
 stmts(#23123,17,#22805,14,"declare ... string;")
@@ -9757,7 +9757,7 @@ exprs(#23125,78,#23123,-1,"foo")
 hasLocation(#23125,#22030)
 expr_containers(#23125,#23123)
 literals("foo","foo",#23125)
-decl(#23125,#23116)
+decl(#23125,#22809)
 #23126=*
 scopes(#23126,1)
 scopenodes(#23123,#23126)
@@ -9795,7 +9795,7 @@ exprs(#23134,78,#23132,-1,"foo")
 hasLocation(#23134,#22052)
 expr_containers(#23134,#23132)
 literals("foo","foo",#23134)
-decl(#23134,#23116)
+decl(#23134,#22809)
 #23135=*
 scopes(#23135,1)
 scopenodes(#23132,#23135)
@@ -9855,7 +9855,7 @@ hasLocation(#23149,#22080)
 enclosing_stmt(#23149,#23147)
 expr_containers(#23149,#22805)
 literals("T30","T30",#23149)
-typedecl(#23149,#22822)
+typedecl(#23149,#22823)
 #23150=*
 typeexprs(#23150,14,#23147,1,"ReturnT ... of foo>")
 #23151=@"loc,{#10000},97,14,97,35"
@@ -9869,7 +9869,7 @@ hasLocation(#23152,#22084)
 enclosing_stmt(#23152,#23147)
 expr_containers(#23152,#22805)
 literals("ReturnType","ReturnType",#23152)
-typebind(#23152,#22824)
+typebind(#23152,#22825)
 #23153=*
 typeexprs(#23153,16,#23150,0,"typeof foo")
 #23154=@"loc,{#10000},97,25,97,34"
@@ -9883,7 +9883,7 @@ hasLocation(#23155,#22090)
 enclosing_stmt(#23155,#23147)
 expr_containers(#23155,#22805)
 literals("foo","foo",#23155)
-bind(#23155,#23116)
+bind(#23155,#22809)
 #23156=*
 stmts(#23156,35,#22805,17,"type An ... => any;")
 #23157=@"loc,{#10000},99,3,99,45"
@@ -9896,7 +9896,7 @@ hasLocation(#23158,#22098)
 enclosing_stmt(#23158,#23156)
 expr_containers(#23158,#22805)
 literals("AnyFunction","AnyFunction",#23158)
-typedecl(#23158,#22823)
+typedecl(#23158,#22824)
 #23159=*
 typeexprs(#23159,23,#23156,1,"(...arg ...  => any")
 #23160=@"loc,{#10000},99,22,99,44"
@@ -9953,7 +9953,7 @@ hasLocation(#23172,#22126)
 enclosing_stmt(#23172,#23170)
 expr_containers(#23172,#22805)
 literals("ReturnType","ReturnType",#23172)
-typedecl(#23172,#22824)
+typedecl(#23172,#22825)
 #23173=*
 scopes(#23173,12)
 scopenodes(#23170,#23173)
@@ -9980,7 +9980,7 @@ hasLocation(#23178,#22134)
 enclosing_stmt(#23178,#23170)
 expr_containers(#23178,#22805)
 literals("AnyFunction","AnyFunction",#23178)
-typebind(#23178,#22823)
+typebind(#23178,#22824)
 #23179=*
 typeexprs(#23179,28,#23170,1,"T exten ... R : any")
 #23180=@"loc,{#10000},100,44,100,90"
@@ -10084,21 +10084,21 @@ successor(#23156,#23170)
 successor(#23147,#23156)
 successor(#23132,#23147)
 successor(#23123,#23132)
-successor(#23113,#23123)
-successor(#23081,#23113)
-successor(#23049,#23081)
-successor(#23005,#23049)
-successor(#22989,#23005)
-successor(#22973,#22989)
-successor(#22945,#22973)
-successor(#22930,#22945)
-successor(#22918,#22930)
-successor(#22908,#22918)
-successor(#22896,#22908)
-successor(#22887,#22896)
-successor(#22880,#22887)
-successor(#22825,#22880)
-successor(#22805,#22825)
+successor(#23114,#23123)
+successor(#23082,#23114)
+successor(#23050,#23082)
+successor(#23006,#23050)
+successor(#22990,#23006)
+successor(#22974,#22990)
+successor(#22946,#22974)
+successor(#22931,#22946)
+successor(#22919,#22931)
+successor(#22909,#22919)
+successor(#22897,#22909)
+successor(#22888,#22897)
+successor(#22881,#22888)
+successor(#22826,#22881)
+successor(#22805,#22826)
 successor(#22185,#22183)
 successor(#22777,#22807)
 successor(#22770,#22777)
diff --git a/javascript/extractor/tests/ts/output/trap/declareClass.ts.trap b/javascript/extractor/tests/ts/output/trap/declareClass.ts.trap
index 6bc9fb5ffb2..83ada22ef89 100644
--- a/javascript/extractor/tests/ts/output/trap/declareClass.ts.trap
+++ b/javascript/extractor/tests/ts/output/trap/declareClass.ts.trap
@@ -50,61 +50,64 @@ toplevels(#20001,0)
 #20016=@"loc,{#10000},1,1,2,0"
 locations_default(#20016,#10000,1,1,2,0)
 hasLocation(#20001,#20016)
-#20017=*
-stmts(#20017,26,#20001,0,"declare class C {}")
-hasLocation(#20017,#20003)
-stmt_containers(#20017,#20001)
-has_declare_keyword(#20017)
-#20018=*
-exprs(#20018,78,#20017,0,"C")
-hasLocation(#20018,#20009)
-enclosing_stmt(#20018,#20017)
-expr_containers(#20018,#20001)
-literals("C","C",#20018)
-#20019=@"var;{C};{#20000}"
-variables(#20019,"C",#20000)
-decl(#20018,#20019)
+#20017=@"var;{C};{#20000}"
+variables(#20017,"C",#20000)
+#20018=@"local_type_name;{C};{#20000}"
+local_type_names(#20018,"C",#20000)
+#20019=*
+stmts(#20019,26,#20001,0,"declare class C {}")
+hasLocation(#20019,#20003)
+stmt_containers(#20019,#20001)
+has_declare_keyword(#20019)
 #20020=*
-scopes(#20020,10)
-scopenodes(#20017,#20020)
-scopenesting(#20020,#20000)
+exprs(#20020,78,#20019,0,"C")
+hasLocation(#20020,#20009)
+enclosing_stmt(#20020,#20019)
+expr_containers(#20020,#20001)
+literals("C","C",#20020)
+decl(#20020,#20017)
+typedecl(#20020,#20018)
 #20021=*
-properties(#20021,#20017,2,0,"constructor() {}")
-#20022=@"loc,{#10000},1,17,1,16"
-locations_default(#20022,#10000,1,17,1,16)
-hasLocation(#20021,#20022)
-#20023=*
-exprs(#20023,0,#20021,0,"constructor")
-hasLocation(#20023,#20022)
-enclosing_stmt(#20023,#20017)
-expr_containers(#20023,#20001)
-literals("constructor","constructor",#20023)
+scopes(#20021,10)
+scopenodes(#20019,#20021)
+scopenesting(#20021,#20000)
+#20022=*
+properties(#20022,#20019,2,0,"constructor() {}")
+#20023=@"loc,{#10000},1,17,1,16"
+locations_default(#20023,#10000,1,17,1,16)
+hasLocation(#20022,#20023)
 #20024=*
-exprs(#20024,9,#20021,1,"() {}")
-hasLocation(#20024,#20022)
-enclosing_stmt(#20024,#20017)
+exprs(#20024,0,#20022,0,"constructor")
+hasLocation(#20024,#20023)
+enclosing_stmt(#20024,#20019)
 expr_containers(#20024,#20001)
+literals("constructor","constructor",#20024)
 #20025=*
-scopes(#20025,1)
-scopenodes(#20024,#20025)
-scopenesting(#20025,#20020)
-#20026=@"var;{arguments};{#20025}"
-variables(#20026,"arguments",#20025)
-is_arguments_object(#20026)
-#20027=*
-stmts(#20027,1,#20024,-2,"{}")
-hasLocation(#20027,#20022)
-stmt_containers(#20027,#20024)
-is_method(#20021)
+exprs(#20025,9,#20022,1,"() {}")
+hasLocation(#20025,#20023)
+enclosing_stmt(#20025,#20019)
+expr_containers(#20025,#20001)
+#20026=*
+scopes(#20026,1)
+scopenodes(#20025,#20026)
+scopenesting(#20026,#20021)
+#20027=@"var;{arguments};{#20026}"
+variables(#20027,"arguments",#20026)
+is_arguments_object(#20027)
 #20028=*
-entry_cfg_node(#20028,#20001)
-#20029=@"loc,{#10000},1,1,1,0"
-locations_default(#20029,#10000,1,1,1,0)
-hasLocation(#20028,#20029)
-#20030=*
-exit_cfg_node(#20030,#20001)
-hasLocation(#20030,#20015)
-successor(#20017,#20030)
-successor(#20028,#20017)
+stmts(#20028,1,#20025,-2,"{}")
+hasLocation(#20028,#20023)
+stmt_containers(#20028,#20025)
+is_method(#20022)
+#20029=*
+entry_cfg_node(#20029,#20001)
+#20030=@"loc,{#10000},1,1,1,0"
+locations_default(#20030,#10000,1,1,1,0)
+hasLocation(#20029,#20030)
+#20031=*
+exit_cfg_node(#20031,#20001)
+hasLocation(#20031,#20015)
+successor(#20019,#20031)
+successor(#20029,#20019)
 numlines(#10000,1,1,0)
 filetype(#10000,"typescript")
diff --git a/javascript/extractor/tests/ts/output/trap/functiondecorators.ts.trap b/javascript/extractor/tests/ts/output/trap/functiondecorators.ts.trap
index 89cd1760443..00276bb6464 100644
--- a/javascript/extractor/tests/ts/output/trap/functiondecorators.ts.trap
+++ b/javascript/extractor/tests/ts/output/trap/functiondecorators.ts.trap
@@ -584,62 +584,63 @@ toplevels(#20001,0)
 #20221=@"loc,{#10000},1,1,16,0"
 locations_default(#20221,#10000,1,1,16,0)
 hasLocation(#20001,#20221)
-#20222=@"var;{C};{#20000}"
-variables(#20222,"C",#20000)
-#20223=@"local_type_name;{C};{#20000}"
-local_type_names(#20223,"C",#20000)
-#20224=*
-stmts(#20224,18,#20001,0,"declare var A : any;")
-hasLocation(#20224,#20003)
-stmt_containers(#20224,#20001)
-has_declare_keyword(#20224)
-#20225=*
-exprs(#20225,64,#20224,0,"A : any")
-#20226=@"loc,{#10000},1,13,1,19"
-locations_default(#20226,#10000,1,13,1,19)
-hasLocation(#20225,#20226)
-enclosing_stmt(#20225,#20224)
-expr_containers(#20225,#20001)
+#20222=@"var;{A};{#20000}"
+variables(#20222,"A",#20000)
+#20223=@"var;{B};{#20000}"
+variables(#20223,"B",#20000)
+#20224=@"var;{C};{#20000}"
+variables(#20224,"C",#20000)
+variables(#20224,"C",#20000)
+#20225=@"local_type_name;{C};{#20000}"
+local_type_names(#20225,"C",#20000)
+#20226=*
+stmts(#20226,18,#20001,0,"declare var A : any;")
+hasLocation(#20226,#20003)
+stmt_containers(#20226,#20001)
+has_declare_keyword(#20226)
 #20227=*
-exprs(#20227,78,#20225,0,"A")
-hasLocation(#20227,#20037)
-enclosing_stmt(#20227,#20224)
+exprs(#20227,64,#20226,0,"A : any")
+#20228=@"loc,{#10000},1,13,1,19"
+locations_default(#20228,#10000,1,13,1,19)
+hasLocation(#20227,#20228)
+enclosing_stmt(#20227,#20226)
 expr_containers(#20227,#20001)
-literals("A","A",#20227)
-#20228=@"var;{A};{#20000}"
-variables(#20228,"A",#20000)
-decl(#20227,#20228)
 #20229=*
-typeexprs(#20229,2,#20225,2,"any")
-hasLocation(#20229,#20041)
-enclosing_stmt(#20229,#20224)
+exprs(#20229,78,#20227,0,"A")
+hasLocation(#20229,#20037)
+enclosing_stmt(#20229,#20226)
 expr_containers(#20229,#20001)
-literals("any","any",#20229)
+literals("A","A",#20229)
+decl(#20229,#20222)
 #20230=*
-stmts(#20230,18,#20001,1,"declare var B : any;")
-hasLocation(#20230,#20005)
-stmt_containers(#20230,#20001)
-has_declare_keyword(#20230)
+typeexprs(#20230,2,#20227,2,"any")
+hasLocation(#20230,#20041)
+enclosing_stmt(#20230,#20226)
+expr_containers(#20230,#20001)
+literals("any","any",#20230)
 #20231=*
-exprs(#20231,64,#20230,0,"B : any")
-#20232=@"loc,{#10000},2,13,2,19"
-locations_default(#20232,#10000,2,13,2,19)
-hasLocation(#20231,#20232)
-enclosing_stmt(#20231,#20230)
-expr_containers(#20231,#20001)
-#20233=*
-exprs(#20233,78,#20231,0,"B")
-hasLocation(#20233,#20049)
-enclosing_stmt(#20233,#20230)
-expr_containers(#20233,#20001)
-literals("B","B",#20233)
-#20234=@"var;{B};{#20000}"
-variables(#20234,"B",#20000)
-decl(#20233,#20234)
+stmts(#20231,18,#20001,1,"declare var B : any;")
+hasLocation(#20231,#20005)
+stmt_containers(#20231,#20001)
+has_declare_keyword(#20231)
+#20232=*
+exprs(#20232,64,#20231,0,"B : any")
+#20233=@"loc,{#10000},2,13,2,19"
+locations_default(#20233,#10000,2,13,2,19)
+hasLocation(#20232,#20233)
+enclosing_stmt(#20232,#20231)
+expr_containers(#20232,#20001)
+#20234=*
+exprs(#20234,78,#20232,0,"B")
+hasLocation(#20234,#20049)
+enclosing_stmt(#20234,#20231)
+expr_containers(#20234,#20001)
+literals("B","B",#20234)
+decl(#20234,#20223)
 #20235=*
-typeexprs(#20235,2,#20231,2,"any")
+typeexprs(#20235,2,#20232,2,"any")
 hasLocation(#20235,#20053)
-enclosing_stmt(#20235,#20230)
+enclosing_stmt(#20235,#20231)
 expr_containers(#20235,#20001)
 literals("any","any",#20235)
 #20236=*
@@ -660,7 +661,7 @@ hasLocation(#20239,#20061)
 enclosing_stmt(#20239,#20236)
 expr_containers(#20239,#20001)
 literals("C","C",#20239)
-decl(#20239,#20222)
+decl(#20239,#20224)
 #20240=*
 typeexprs(#20240,2,#20237,2,"any")
 hasLocation(#20240,#20065)
@@ -679,8 +680,8 @@ hasLocation(#20243,#20071)
 enclosing_stmt(#20243,#20241)
 expr_containers(#20243,#20001)
 literals("C","C",#20243)
-decl(#20243,#20222)
-typedecl(#20243,#20223)
+decl(#20243,#20224)
+typedecl(#20243,#20225)
 #20244=*
 scopes(#20244,10)
 scopenodes(#20241,#20244)
@@ -769,7 +770,7 @@ exprs(#20266,79,#20265,0,"A")
 hasLocation(#20266,#20093)
 expr_containers(#20266,#20258)
 literals("A","A",#20266)
-bind(#20266,#20228)
+bind(#20266,#20222)
 #20267=*
 stmts(#20267,1,#20258,-2,"{}")
 #20268=@"loc,{#10000},7,12,7,13"
@@ -825,7 +826,7 @@ exprs(#20281,79,#20279,0,"A")
 hasLocation(#20281,#20109)
 expr_containers(#20281,#20272)
 literals("A","A",#20281)
-bind(#20281,#20228)
+bind(#20281,#20222)
 #20282=*
 exprs(#20282,94,#20277,1,"@B")
 #20283=@"loc,{#10000},8,9,8,10"
@@ -837,7 +838,7 @@ exprs(#20284,79,#20282,0,"B")
 hasLocation(#20284,#20113)
 expr_containers(#20284,#20272)
 literals("B","B",#20284)
-bind(#20284,#20234)
+bind(#20284,#20223)
 #20285=*
 stmts(#20285,1,#20272,-2,"{}")
 #20286=@"loc,{#10000},8,16,8,17"
@@ -899,7 +900,7 @@ exprs(#20300,79,#20299,0,"A")
 hasLocation(#20300,#20133)
 expr_containers(#20300,#20290)
 literals("A","A",#20300)
-bind(#20300,#20228)
+bind(#20300,#20222)
 #20301=*
 stmts(#20301,1,#20290,-2,"{}")
 #20302=@"loc,{#10000},10,18,10,19"
@@ -963,7 +964,7 @@ exprs(#20317,79,#20315,0,"A")
 hasLocation(#20317,#20153)
 expr_containers(#20317,#20306)
 literals("A","A",#20317)
-bind(#20317,#20228)
+bind(#20317,#20222)
 #20318=*
 exprs(#20318,94,#20313,1,"@B")
 #20319=@"loc,{#10000},11,15,11,16"
@@ -975,7 +976,7 @@ exprs(#20320,79,#20318,0,"B")
 hasLocation(#20320,#20157)
 expr_containers(#20320,#20306)
 literals("B","B",#20320)
-bind(#20320,#20234)
+bind(#20320,#20223)
 #20321=*
 stmts(#20321,1,#20306,-2,"{}")
 #20322=@"loc,{#10000},11,22,11,23"
@@ -1037,7 +1038,7 @@ exprs(#20336,79,#20335,0,"A")
 hasLocation(#20336,#20173)
 expr_containers(#20336,#20326)
 literals("A","A",#20336)
-bind(#20336,#20228)
+bind(#20336,#20222)
 #20337=*
 exprs(#20337,104,#20326,-12,"@B")
 #20338=@"loc,{#10000},13,12,13,13"
@@ -1053,7 +1054,7 @@ exprs(#20340,79,#20339,0,"B")
 hasLocation(#20340,#20181)
 expr_containers(#20340,#20326)
 literals("B","B",#20340)
-bind(#20340,#20234)
+bind(#20340,#20223)
 #20341=*
 stmts(#20341,1,#20326,-2,"{}")
 #20342=@"loc,{#10000},13,18,13,19"
@@ -1115,7 +1116,7 @@ exprs(#20356,79,#20355,0,"A")
 hasLocation(#20356,#20197)
 expr_containers(#20356,#20346)
 literals("A","A",#20356)
-bind(#20356,#20228)
+bind(#20356,#20222)
 #20357=*
 exprs(#20357,104,#20346,-12,"@B @C")
 #20358=@"loc,{#10000},14,12,14,16"
@@ -1133,7 +1134,7 @@ exprs(#20361,79,#20359,0,"B")
 hasLocation(#20361,#20205)
 expr_containers(#20361,#20346)
 literals("B","B",#20361)
-bind(#20361,#20234)
+bind(#20361,#20223)
 #20362=*
 exprs(#20362,94,#20357,1,"@C")
 #20363=@"loc,{#10000},14,15,14,16"
@@ -1145,7 +1146,7 @@ exprs(#20364,79,#20362,0,"C")
 hasLocation(#20364,#20209)
 expr_containers(#20364,#20346)
 literals("C","C",#20364)
-bind(#20364,#20222)
+bind(#20364,#20224)
 #20365=*
 stmts(#20365,1,#20346,-2,"{}")
 #20366=@"loc,{#10000},14,22,14,23"
@@ -1349,8 +1350,8 @@ successor(#20265,#20263)
 successor(#20263,#20281)
 successor(#20241,#20266)
 successor(#20236,#20243)
-successor(#20230,#20236)
-successor(#20224,#20230)
-successor(#20374,#20224)
+successor(#20231,#20236)
+successor(#20226,#20231)
+successor(#20374,#20226)
 numlines(#10000,15,12,0)
 filetype(#10000,"typescript")
diff --git a/javascript/extractor/tests/ts/output/trap/nobody.ts.trap b/javascript/extractor/tests/ts/output/trap/nobody.ts.trap
index 44a32603e09..717d79423ab 100644
--- a/javascript/extractor/tests/ts/output/trap/nobody.ts.trap
+++ b/javascript/extractor/tests/ts/output/trap/nobody.ts.trap
@@ -694,506 +694,509 @@ toplevels(#20001,0)
 #20252=@"loc,{#10000},2,1,30,0"
 locations_default(#20252,#10000,2,1,30,0)
 hasLocation(#20001,#20252)
-#20253=@"var;{C};{#20000}"
-variables(#20253,"C",#20000)
-#20254=@"local_type_name;{C};{#20000}"
-local_type_names(#20254,"C",#20000)
-#20255=*
-stmts(#20255,17,#20001,0,"declare ... on f();")
-hasLocation(#20255,#20020)
-stmt_containers(#20255,#20001)
-has_declare_keyword(#20255)
-#20256=*
-exprs(#20256,78,#20255,-1,"f")
-hasLocation(#20256,#20079)
-expr_containers(#20256,#20255)
-literals("f","f",#20256)
-#20257=@"var;{f};{#20000}"
-variables(#20257,"f",#20000)
-decl(#20256,#20257)
+#20253=@"var;{f};{#20000}"
+variables(#20253,"f",#20000)
+#20254=@"var;{C};{#20000}"
+variables(#20254,"C",#20000)
+#20255=@"var;{D};{#20000}"
+variables(#20255,"D",#20000)
+#20256=@"local_type_name;{C};{#20000}"
+local_type_names(#20256,"C",#20000)
+#20257=@"local_type_name;{D};{#20000}"
+local_type_names(#20257,"D",#20000)
 #20258=*
-scopes(#20258,1)
-scopenodes(#20255,#20258)
-scopenesting(#20258,#20000)
-#20259=@"var;{arguments};{#20258}"
-variables(#20259,"arguments",#20258)
-is_arguments_object(#20259)
+stmts(#20258,17,#20001,0,"declare ... on f();")
+hasLocation(#20258,#20020)
+stmt_containers(#20258,#20001)
+has_declare_keyword(#20258)
+#20259=*
+exprs(#20259,78,#20258,-1,"f")
+hasLocation(#20259,#20079)
+expr_containers(#20259,#20258)
+literals("f","f",#20259)
+decl(#20259,#20253)
 #20260=*
-stmts(#20260,26,#20001,1,"abstrac ... mber;\n}")
-#20261=@"loc,{#10000},4,1,15,1"
-locations_default(#20261,#10000,4,1,15,1)
-hasLocation(#20260,#20261)
-stmt_containers(#20260,#20001)
-is_abstract_class(#20260)
+scopes(#20260,1)
+scopenodes(#20258,#20260)
+scopenesting(#20260,#20000)
+#20261=@"var;{arguments};{#20260}"
+variables(#20261,"arguments",#20260)
+is_arguments_object(#20261)
 #20262=*
-exprs(#20262,78,#20260,0,"C")
-hasLocation(#20262,#20091)
-enclosing_stmt(#20262,#20260)
-expr_containers(#20262,#20001)
-literals("C","C",#20262)
-decl(#20262,#20253)
-typedecl(#20262,#20254)
-#20263=*
-scopes(#20263,10)
-scopenodes(#20260,#20263)
-scopenesting(#20263,#20000)
+stmts(#20262,26,#20001,1,"abstrac ... mber;\n}")
+#20263=@"loc,{#10000},4,1,15,1"
+locations_default(#20263,#10000,4,1,15,1)
+hasLocation(#20262,#20263)
+stmt_containers(#20262,#20001)
+is_abstract_class(#20262)
 #20264=*
-properties(#20264,#20260,2,0,"abstract h();")
-#20265=@"loc,{#10000},6,3,6,15"
-locations_default(#20265,#10000,6,3,6,15)
-hasLocation(#20264,#20265)
+exprs(#20264,78,#20262,0,"C")
+hasLocation(#20264,#20091)
+enclosing_stmt(#20264,#20262)
+expr_containers(#20264,#20001)
+literals("C","C",#20264)
+decl(#20264,#20254)
+typedecl(#20264,#20256)
+#20265=*
+scopes(#20265,10)
+scopenodes(#20262,#20265)
+scopenesting(#20265,#20000)
 #20266=*
-exprs(#20266,0,#20264,0,"h")
-hasLocation(#20266,#20097)
-enclosing_stmt(#20266,#20260)
-expr_containers(#20266,#20001)
-literals("h","h",#20266)
-#20267=*
-exprs(#20267,9,#20264,1,"abstract h();")
-hasLocation(#20267,#20265)
-enclosing_stmt(#20267,#20260)
-expr_containers(#20267,#20001)
+properties(#20266,#20262,2,0,"abstract h();")
+#20267=@"loc,{#10000},6,3,6,15"
+locations_default(#20267,#10000,6,3,6,15)
+hasLocation(#20266,#20267)
 #20268=*
-scopes(#20268,1)
-scopenodes(#20267,#20268)
-scopenesting(#20268,#20263)
-#20269=@"var;{arguments};{#20268}"
-variables(#20269,"arguments",#20268)
-is_arguments_object(#20269)
-is_method(#20264)
-is_abstract_member(#20264)
+exprs(#20268,0,#20266,0,"h")
+hasLocation(#20268,#20097)
+enclosing_stmt(#20268,#20262)
+expr_containers(#20268,#20001)
+literals("h","h",#20268)
+#20269=*
+exprs(#20269,9,#20266,1,"abstract h();")
+hasLocation(#20269,#20267)
+enclosing_stmt(#20269,#20262)
+expr_containers(#20269,#20001)
 #20270=*
-properties(#20270,#20260,3,0,"g(x: nu ... number;")
-#20271=@"loc,{#10000},9,3,9,23"
-locations_default(#20271,#10000,9,3,9,23)
-hasLocation(#20270,#20271)
+scopes(#20270,1)
+scopenodes(#20269,#20270)
+scopenesting(#20270,#20265)
+#20271=@"var;{arguments};{#20270}"
+variables(#20271,"arguments",#20270)
+is_arguments_object(#20271)
+is_method(#20266)
+is_abstract_member(#20266)
 #20272=*
-exprs(#20272,0,#20270,0,"g")
-hasLocation(#20272,#20105)
-enclosing_stmt(#20272,#20260)
-expr_containers(#20272,#20001)
-literals("g","g",#20272)
-#20273=*
-exprs(#20273,9,#20270,1,"g(x: nu ... number;")
-hasLocation(#20273,#20271)
-enclosing_stmt(#20273,#20260)
-expr_containers(#20273,#20001)
+properties(#20272,#20262,3,0,"g(x: nu ... number;")
+#20273=@"loc,{#10000},9,3,9,23"
+locations_default(#20273,#10000,9,3,9,23)
+hasLocation(#20272,#20273)
 #20274=*
-scopes(#20274,1)
-scopenodes(#20273,#20274)
-scopenesting(#20274,#20263)
-#20275=@"var;{x};{#20274}"
-variables(#20275,"x",#20274)
+exprs(#20274,0,#20272,0,"g")
+hasLocation(#20274,#20105)
+enclosing_stmt(#20274,#20262)
+expr_containers(#20274,#20001)
+literals("g","g",#20274)
+#20275=*
+exprs(#20275,9,#20272,1,"g(x: nu ... number;")
+hasLocation(#20275,#20273)
+enclosing_stmt(#20275,#20262)
+expr_containers(#20275,#20001)
 #20276=*
-exprs(#20276,78,#20273,0,"x")
-hasLocation(#20276,#20109)
-expr_containers(#20276,#20273)
-literals("x","x",#20276)
-decl(#20276,#20275)
-#20277=@"var;{arguments};{#20274}"
-variables(#20277,"arguments",#20274)
-is_arguments_object(#20277)
+scopes(#20276,1)
+scopenodes(#20275,#20276)
+scopenesting(#20276,#20265)
+#20277=@"var;{x};{#20276}"
+variables(#20277,"x",#20276)
 #20278=*
-typeexprs(#20278,2,#20273,-3,"number")
-hasLocation(#20278,#20119)
-expr_containers(#20278,#20273)
-literals("number","number",#20278)
-#20279=*
-typeexprs(#20279,2,#20273,-6,"number")
-hasLocation(#20279,#20113)
-expr_containers(#20279,#20273)
-literals("number","number",#20279)
-is_method(#20270)
+exprs(#20278,78,#20275,0,"x")
+hasLocation(#20278,#20109)
+expr_containers(#20278,#20275)
+literals("x","x",#20278)
+decl(#20278,#20277)
+#20279=@"var;{arguments};{#20276}"
+variables(#20279,"arguments",#20276)
+is_arguments_object(#20279)
 #20280=*
-properties(#20280,#20260,4,0,"g(x: st ... string;")
-#20281=@"loc,{#10000},10,3,10,23"
-locations_default(#20281,#10000,10,3,10,23)
-hasLocation(#20280,#20281)
+typeexprs(#20280,2,#20275,-3,"number")
+hasLocation(#20280,#20119)
+expr_containers(#20280,#20275)
+literals("number","number",#20280)
+#20281=*
+typeexprs(#20281,2,#20275,-6,"number")
+hasLocation(#20281,#20113)
+expr_containers(#20281,#20275)
+literals("number","number",#20281)
+is_method(#20272)
 #20282=*
-exprs(#20282,0,#20280,0,"g")
-hasLocation(#20282,#20123)
-enclosing_stmt(#20282,#20260)
-expr_containers(#20282,#20001)
-literals("g","g",#20282)
-#20283=*
-exprs(#20283,9,#20280,1,"g(x: st ... string;")
-hasLocation(#20283,#20281)
-enclosing_stmt(#20283,#20260)
-expr_containers(#20283,#20001)
+properties(#20282,#20262,4,0,"g(x: st ... string;")
+#20283=@"loc,{#10000},10,3,10,23"
+locations_default(#20283,#10000,10,3,10,23)
+hasLocation(#20282,#20283)
 #20284=*
-scopes(#20284,1)
-scopenodes(#20283,#20284)
-scopenesting(#20284,#20263)
-#20285=@"var;{x};{#20284}"
-variables(#20285,"x",#20284)
+exprs(#20284,0,#20282,0,"g")
+hasLocation(#20284,#20123)
+enclosing_stmt(#20284,#20262)
+expr_containers(#20284,#20001)
+literals("g","g",#20284)
+#20285=*
+exprs(#20285,9,#20282,1,"g(x: st ... string;")
+hasLocation(#20285,#20283)
+enclosing_stmt(#20285,#20262)
+expr_containers(#20285,#20001)
 #20286=*
-exprs(#20286,78,#20283,0,"x")
-hasLocation(#20286,#20127)
-expr_containers(#20286,#20283)
-literals("x","x",#20286)
-decl(#20286,#20285)
-#20287=@"var;{arguments};{#20284}"
-variables(#20287,"arguments",#20284)
-is_arguments_object(#20287)
+scopes(#20286,1)
+scopenodes(#20285,#20286)
+scopenesting(#20286,#20265)
+#20287=@"var;{x};{#20286}"
+variables(#20287,"x",#20286)
 #20288=*
-typeexprs(#20288,2,#20283,-3,"string")
-hasLocation(#20288,#20137)
-expr_containers(#20288,#20283)
-literals("string","string",#20288)
-#20289=*
-typeexprs(#20289,2,#20283,-6,"string")
-hasLocation(#20289,#20131)
-expr_containers(#20289,#20283)
-literals("string","string",#20289)
-is_method(#20280)
+exprs(#20288,78,#20285,0,"x")
+hasLocation(#20288,#20127)
+expr_containers(#20288,#20285)
+literals("x","x",#20288)
+decl(#20288,#20287)
+#20289=@"var;{arguments};{#20286}"
+variables(#20289,"arguments",#20286)
+is_arguments_object(#20289)
 #20290=*
-properties(#20290,#20260,5,0,"g(x: any) {}")
-#20291=@"loc,{#10000},11,3,11,14"
-locations_default(#20291,#10000,11,3,11,14)
-hasLocation(#20290,#20291)
+typeexprs(#20290,2,#20285,-3,"string")
+hasLocation(#20290,#20137)
+expr_containers(#20290,#20285)
+literals("string","string",#20290)
+#20291=*
+typeexprs(#20291,2,#20285,-6,"string")
+hasLocation(#20291,#20131)
+expr_containers(#20291,#20285)
+literals("string","string",#20291)
+is_method(#20282)
 #20292=*
-exprs(#20292,0,#20290,0,"g")
-hasLocation(#20292,#20141)
-enclosing_stmt(#20292,#20260)
-expr_containers(#20292,#20001)
-literals("g","g",#20292)
-#20293=*
-exprs(#20293,9,#20290,1,"g(x: any) {}")
-hasLocation(#20293,#20291)
-enclosing_stmt(#20293,#20260)
-expr_containers(#20293,#20001)
+properties(#20292,#20262,5,0,"g(x: any) {}")
+#20293=@"loc,{#10000},11,3,11,14"
+locations_default(#20293,#10000,11,3,11,14)
+hasLocation(#20292,#20293)
 #20294=*
-scopes(#20294,1)
-scopenodes(#20293,#20294)
-scopenesting(#20294,#20263)
-#20295=@"var;{x};{#20294}"
-variables(#20295,"x",#20294)
+exprs(#20294,0,#20292,0,"g")
+hasLocation(#20294,#20141)
+enclosing_stmt(#20294,#20262)
+expr_containers(#20294,#20001)
+literals("g","g",#20294)
+#20295=*
+exprs(#20295,9,#20292,1,"g(x: any) {}")
+hasLocation(#20295,#20293)
+enclosing_stmt(#20295,#20262)
+expr_containers(#20295,#20001)
 #20296=*
-exprs(#20296,78,#20293,0,"x")
-hasLocation(#20296,#20145)
-expr_containers(#20296,#20293)
-literals("x","x",#20296)
-decl(#20296,#20295)
-#20297=@"var;{arguments};{#20294}"
-variables(#20297,"arguments",#20294)
-is_arguments_object(#20297)
+scopes(#20296,1)
+scopenodes(#20295,#20296)
+scopenesting(#20296,#20265)
+#20297=@"var;{x};{#20296}"
+variables(#20297,"x",#20296)
 #20298=*
-typeexprs(#20298,2,#20293,-6,"any")
-hasLocation(#20298,#20149)
-expr_containers(#20298,#20293)
-literals("any","any",#20298)
-#20299=*
-stmts(#20299,1,#20293,-2,"{}")
-#20300=@"loc,{#10000},11,13,11,14"
-locations_default(#20300,#10000,11,13,11,14)
-hasLocation(#20299,#20300)
-stmt_containers(#20299,#20293)
-is_method(#20290)
+exprs(#20298,78,#20295,0,"x")
+hasLocation(#20298,#20145)
+expr_containers(#20298,#20295)
+literals("x","x",#20298)
+decl(#20298,#20297)
+#20299=@"var;{arguments};{#20296}"
+variables(#20299,"arguments",#20296)
+is_arguments_object(#20299)
+#20300=*
+typeexprs(#20300,2,#20295,-6,"any")
+hasLocation(#20300,#20149)
+expr_containers(#20300,#20295)
+literals("any","any",#20300)
 #20301=*
-properties(#20301,#20260,6,8,"abstract x: number;")
-#20302=@"loc,{#10000},14,3,14,21"
-locations_default(#20302,#10000,14,3,14,21)
+stmts(#20301,1,#20295,-2,"{}")
+#20302=@"loc,{#10000},11,13,11,14"
+locations_default(#20302,#10000,11,13,11,14)
 hasLocation(#20301,#20302)
+stmt_containers(#20301,#20295)
+is_method(#20292)
 #20303=*
-#20304=*
-exprs(#20304,0,#20301,0,"x")
-hasLocation(#20304,#20159)
-expr_containers(#20304,#20303)
-literals("x","x",#20304)
-is_abstract_member(#20301)
+properties(#20303,#20262,6,8,"abstract x: number;")
+#20304=@"loc,{#10000},14,3,14,21"
+locations_default(#20304,#10000,14,3,14,21)
+hasLocation(#20303,#20304)
 #20305=*
-typeexprs(#20305,2,#20301,2,"number")
-hasLocation(#20305,#20163)
-enclosing_stmt(#20305,#20260)
-expr_containers(#20305,#20001)
-literals("number","number",#20305)
 #20306=*
-properties(#20306,#20260,7,0,"constructor() {}")
-#20307=@"loc,{#10000},4,18,4,17"
-locations_default(#20307,#10000,4,18,4,17)
-hasLocation(#20306,#20307)
+exprs(#20306,0,#20303,0,"x")
+hasLocation(#20306,#20159)
+expr_containers(#20306,#20305)
+literals("x","x",#20306)
+is_abstract_member(#20303)
+#20307=*
+typeexprs(#20307,2,#20303,2,"number")
+hasLocation(#20307,#20163)
+enclosing_stmt(#20307,#20262)
+expr_containers(#20307,#20001)
+literals("number","number",#20307)
 #20308=*
-exprs(#20308,0,#20306,0,"constructor")
-hasLocation(#20308,#20307)
-enclosing_stmt(#20308,#20260)
-expr_containers(#20308,#20001)
-literals("constructor","constructor",#20308)
-exprs(#20303,9,#20306,1,"() {}")
-hasLocation(#20303,#20307)
-enclosing_stmt(#20303,#20260)
-expr_containers(#20303,#20001)
-#20309=*
-scopes(#20309,1)
-scopenodes(#20303,#20309)
-scopenesting(#20309,#20263)
-#20310=@"var;{arguments};{#20309}"
-variables(#20310,"arguments",#20309)
-is_arguments_object(#20310)
+properties(#20308,#20262,7,0,"constructor() {}")
+#20309=@"loc,{#10000},4,18,4,17"
+locations_default(#20309,#10000,4,18,4,17)
+hasLocation(#20308,#20309)
+#20310=*
+exprs(#20310,0,#20308,0,"constructor")
+hasLocation(#20310,#20309)
+enclosing_stmt(#20310,#20262)
+expr_containers(#20310,#20001)
+literals("constructor","constructor",#20310)
+exprs(#20305,9,#20308,1,"() {}")
+hasLocation(#20305,#20309)
+enclosing_stmt(#20305,#20262)
+expr_containers(#20305,#20001)
 #20311=*
-stmts(#20311,1,#20303,-2,"{}")
-hasLocation(#20311,#20307)
-stmt_containers(#20311,#20303)
-is_method(#20306)
-#20312=*
-stmts(#20312,26,#20001,2,"declare ... mber;\n}")
-#20313=@"loc,{#10000},18,1,29,1"
-locations_default(#20313,#10000,18,1,29,1)
-hasLocation(#20312,#20313)
-stmt_containers(#20312,#20001)
-has_declare_keyword(#20312)
-is_abstract_class(#20312)
+scopes(#20311,1)
+scopenodes(#20305,#20311)
+scopenesting(#20311,#20265)
+#20312=@"var;{arguments};{#20311}"
+variables(#20312,"arguments",#20311)
+is_arguments_object(#20312)
+#20313=*
+stmts(#20313,1,#20305,-2,"{}")
+hasLocation(#20313,#20309)
+stmt_containers(#20313,#20305)
+is_method(#20308)
 #20314=*
-exprs(#20314,78,#20312,0,"D")
-hasLocation(#20314,#20174)
-enclosing_stmt(#20314,#20312)
-expr_containers(#20314,#20001)
-literals("D","D",#20314)
-#20315=@"var;{D};{#20000}"
-variables(#20315,"D",#20000)
-decl(#20314,#20315)
+stmts(#20314,26,#20001,2,"declare ... mber;\n}")
+#20315=@"loc,{#10000},18,1,29,1"
+locations_default(#20315,#10000,18,1,29,1)
+hasLocation(#20314,#20315)
+stmt_containers(#20314,#20001)
+has_declare_keyword(#20314)
+is_abstract_class(#20314)
 #20316=*
-scopes(#20316,10)
-scopenodes(#20312,#20316)
-scopenesting(#20316,#20000)
+exprs(#20316,78,#20314,0,"D")
+hasLocation(#20316,#20174)
+enclosing_stmt(#20316,#20314)
+expr_containers(#20316,#20001)
+literals("D","D",#20316)
+decl(#20316,#20255)
+typedecl(#20316,#20257)
 #20317=*
-properties(#20317,#20312,2,0,"abstract h();")
-#20318=@"loc,{#10000},20,3,20,15"
-locations_default(#20318,#10000,20,3,20,15)
-hasLocation(#20317,#20318)
-#20319=*
-exprs(#20319,0,#20317,0,"h")
-hasLocation(#20319,#20180)
-enclosing_stmt(#20319,#20312)
-expr_containers(#20319,#20001)
-literals("h","h",#20319)
+scopes(#20317,10)
+scopenodes(#20314,#20317)
+scopenesting(#20317,#20000)
+#20318=*
+properties(#20318,#20314,2,0,"abstract h();")
+#20319=@"loc,{#10000},20,3,20,15"
+locations_default(#20319,#10000,20,3,20,15)
+hasLocation(#20318,#20319)
 #20320=*
-exprs(#20320,9,#20317,1,"abstract h();")
-hasLocation(#20320,#20318)
-enclosing_stmt(#20320,#20312)
+exprs(#20320,0,#20318,0,"h")
+hasLocation(#20320,#20180)
+enclosing_stmt(#20320,#20314)
 expr_containers(#20320,#20001)
+literals("h","h",#20320)
 #20321=*
-scopes(#20321,1)
-scopenodes(#20320,#20321)
-scopenesting(#20321,#20316)
-#20322=@"var;{arguments};{#20321}"
-variables(#20322,"arguments",#20321)
-is_arguments_object(#20322)
-is_method(#20317)
-is_abstract_member(#20317)
-#20323=*
-properties(#20323,#20312,3,0,"g(x: nu ... number;")
-#20324=@"loc,{#10000},23,3,23,23"
-locations_default(#20324,#10000,23,3,23,23)
-hasLocation(#20323,#20324)
-#20325=*
-exprs(#20325,0,#20323,0,"g")
-hasLocation(#20325,#20188)
-enclosing_stmt(#20325,#20312)
-expr_containers(#20325,#20001)
-literals("g","g",#20325)
+exprs(#20321,9,#20318,1,"abstract h();")
+hasLocation(#20321,#20319)
+enclosing_stmt(#20321,#20314)
+expr_containers(#20321,#20001)
+#20322=*
+scopes(#20322,1)
+scopenodes(#20321,#20322)
+scopenesting(#20322,#20317)
+#20323=@"var;{arguments};{#20322}"
+variables(#20323,"arguments",#20322)
+is_arguments_object(#20323)
+is_method(#20318)
+is_abstract_member(#20318)
+#20324=*
+properties(#20324,#20314,3,0,"g(x: nu ... number;")
+#20325=@"loc,{#10000},23,3,23,23"
+locations_default(#20325,#10000,23,3,23,23)
+hasLocation(#20324,#20325)
 #20326=*
-exprs(#20326,9,#20323,1,"g(x: nu ... number;")
-hasLocation(#20326,#20324)
-enclosing_stmt(#20326,#20312)
+exprs(#20326,0,#20324,0,"g")
+hasLocation(#20326,#20188)
+enclosing_stmt(#20326,#20314)
 expr_containers(#20326,#20001)
+literals("g","g",#20326)
 #20327=*
-scopes(#20327,1)
-scopenodes(#20326,#20327)
-scopenesting(#20327,#20316)
-#20328=@"var;{x};{#20327}"
-variables(#20328,"x",#20327)
-#20329=*
-exprs(#20329,78,#20326,0,"x")
-hasLocation(#20329,#20192)
-expr_containers(#20329,#20326)
-literals("x","x",#20329)
-decl(#20329,#20328)
-#20330=@"var;{arguments};{#20327}"
-variables(#20330,"arguments",#20327)
-is_arguments_object(#20330)
-#20331=*
-typeexprs(#20331,2,#20326,-3,"number")
-hasLocation(#20331,#20202)
-expr_containers(#20331,#20326)
-literals("number","number",#20331)
+exprs(#20327,9,#20324,1,"g(x: nu ... number;")
+hasLocation(#20327,#20325)
+enclosing_stmt(#20327,#20314)
+expr_containers(#20327,#20001)
+#20328=*
+scopes(#20328,1)
+scopenodes(#20327,#20328)
+scopenesting(#20328,#20317)
+#20329=@"var;{x};{#20328}"
+variables(#20329,"x",#20328)
+#20330=*
+exprs(#20330,78,#20327,0,"x")
+hasLocation(#20330,#20192)
+expr_containers(#20330,#20327)
+literals("x","x",#20330)
+decl(#20330,#20329)
+#20331=@"var;{arguments};{#20328}"
+variables(#20331,"arguments",#20328)
+is_arguments_object(#20331)
 #20332=*
-typeexprs(#20332,2,#20326,-6,"number")
-hasLocation(#20332,#20196)
-expr_containers(#20332,#20326)
+typeexprs(#20332,2,#20327,-3,"number")
+hasLocation(#20332,#20202)
+expr_containers(#20332,#20327)
 literals("number","number",#20332)
-is_method(#20323)
 #20333=*
-properties(#20333,#20312,4,0,"g(x: st ... string;")
-#20334=@"loc,{#10000},24,3,24,23"
-locations_default(#20334,#10000,24,3,24,23)
-hasLocation(#20333,#20334)
-#20335=*
-exprs(#20335,0,#20333,0,"g")
-hasLocation(#20335,#20206)
-enclosing_stmt(#20335,#20312)
-expr_containers(#20335,#20001)
-literals("g","g",#20335)
+typeexprs(#20333,2,#20327,-6,"number")
+hasLocation(#20333,#20196)
+expr_containers(#20333,#20327)
+literals("number","number",#20333)
+is_method(#20324)
+#20334=*
+properties(#20334,#20314,4,0,"g(x: st ... string;")
+#20335=@"loc,{#10000},24,3,24,23"
+locations_default(#20335,#10000,24,3,24,23)
+hasLocation(#20334,#20335)
 #20336=*
-exprs(#20336,9,#20333,1,"g(x: st ... string;")
-hasLocation(#20336,#20334)
-enclosing_stmt(#20336,#20312)
+exprs(#20336,0,#20334,0,"g")
+hasLocation(#20336,#20206)
+enclosing_stmt(#20336,#20314)
 expr_containers(#20336,#20001)
+literals("g","g",#20336)
 #20337=*
-scopes(#20337,1)
-scopenodes(#20336,#20337)
-scopenesting(#20337,#20316)
-#20338=@"var;{x};{#20337}"
-variables(#20338,"x",#20337)
-#20339=*
-exprs(#20339,78,#20336,0,"x")
-hasLocation(#20339,#20210)
-expr_containers(#20339,#20336)
-literals("x","x",#20339)
-decl(#20339,#20338)
-#20340=@"var;{arguments};{#20337}"
-variables(#20340,"arguments",#20337)
-is_arguments_object(#20340)
-#20341=*
-typeexprs(#20341,2,#20336,-3,"string")
-hasLocation(#20341,#20220)
-expr_containers(#20341,#20336)
-literals("string","string",#20341)
+exprs(#20337,9,#20334,1,"g(x: st ... string;")
+hasLocation(#20337,#20335)
+enclosing_stmt(#20337,#20314)
+expr_containers(#20337,#20001)
+#20338=*
+scopes(#20338,1)
+scopenodes(#20337,#20338)
+scopenesting(#20338,#20317)
+#20339=@"var;{x};{#20338}"
+variables(#20339,"x",#20338)
+#20340=*
+exprs(#20340,78,#20337,0,"x")
+hasLocation(#20340,#20210)
+expr_containers(#20340,#20337)
+literals("x","x",#20340)
+decl(#20340,#20339)
+#20341=@"var;{arguments};{#20338}"
+variables(#20341,"arguments",#20338)
+is_arguments_object(#20341)
 #20342=*
-typeexprs(#20342,2,#20336,-6,"string")
-hasLocation(#20342,#20214)
-expr_containers(#20342,#20336)
+typeexprs(#20342,2,#20337,-3,"string")
+hasLocation(#20342,#20220)
+expr_containers(#20342,#20337)
 literals("string","string",#20342)
-is_method(#20333)
 #20343=*
-properties(#20343,#20312,5,0,"g(x: any) {}")
-#20344=@"loc,{#10000},25,3,25,14"
-locations_default(#20344,#10000,25,3,25,14)
-hasLocation(#20343,#20344)
-#20345=*
-exprs(#20345,0,#20343,0,"g")
-hasLocation(#20345,#20224)
-enclosing_stmt(#20345,#20312)
-expr_containers(#20345,#20001)
-literals("g","g",#20345)
+typeexprs(#20343,2,#20337,-6,"string")
+hasLocation(#20343,#20214)
+expr_containers(#20343,#20337)
+literals("string","string",#20343)
+is_method(#20334)
+#20344=*
+properties(#20344,#20314,5,0,"g(x: any) {}")
+#20345=@"loc,{#10000},25,3,25,14"
+locations_default(#20345,#10000,25,3,25,14)
+hasLocation(#20344,#20345)
 #20346=*
-exprs(#20346,9,#20343,1,"g(x: any) {}")
-hasLocation(#20346,#20344)
-enclosing_stmt(#20346,#20312)
+exprs(#20346,0,#20344,0,"g")
+hasLocation(#20346,#20224)
+enclosing_stmt(#20346,#20314)
 expr_containers(#20346,#20001)
+literals("g","g",#20346)
 #20347=*
-scopes(#20347,1)
-scopenodes(#20346,#20347)
-scopenesting(#20347,#20316)
-#20348=@"var;{x};{#20347}"
-variables(#20348,"x",#20347)
-#20349=*
-exprs(#20349,78,#20346,0,"x")
-hasLocation(#20349,#20228)
-expr_containers(#20349,#20346)
-literals("x","x",#20349)
-decl(#20349,#20348)
-#20350=@"var;{arguments};{#20347}"
-variables(#20350,"arguments",#20347)
-is_arguments_object(#20350)
-#20351=*
-typeexprs(#20351,2,#20346,-6,"any")
-hasLocation(#20351,#20232)
-expr_containers(#20351,#20346)
-literals("any","any",#20351)
+exprs(#20347,9,#20344,1,"g(x: any) {}")
+hasLocation(#20347,#20345)
+enclosing_stmt(#20347,#20314)
+expr_containers(#20347,#20001)
+#20348=*
+scopes(#20348,1)
+scopenodes(#20347,#20348)
+scopenesting(#20348,#20317)
+#20349=@"var;{x};{#20348}"
+variables(#20349,"x",#20348)
+#20350=*
+exprs(#20350,78,#20347,0,"x")
+hasLocation(#20350,#20228)
+expr_containers(#20350,#20347)
+literals("x","x",#20350)
+decl(#20350,#20349)
+#20351=@"var;{arguments};{#20348}"
+variables(#20351,"arguments",#20348)
+is_arguments_object(#20351)
 #20352=*
-stmts(#20352,1,#20346,-2,"{}")
-#20353=@"loc,{#10000},25,13,25,14"
-locations_default(#20353,#10000,25,13,25,14)
-hasLocation(#20352,#20353)
-stmt_containers(#20352,#20346)
-is_method(#20343)
-#20354=*
-properties(#20354,#20312,6,8,"abstract x: number;")
-#20355=@"loc,{#10000},28,3,28,21"
-locations_default(#20355,#10000,28,3,28,21)
-hasLocation(#20354,#20355)
-#20356=*
+typeexprs(#20352,2,#20347,-6,"any")
+hasLocation(#20352,#20232)
+expr_containers(#20352,#20347)
+literals("any","any",#20352)
+#20353=*
+stmts(#20353,1,#20347,-2,"{}")
+#20354=@"loc,{#10000},25,13,25,14"
+locations_default(#20354,#10000,25,13,25,14)
+hasLocation(#20353,#20354)
+stmt_containers(#20353,#20347)
+is_method(#20344)
+#20355=*
+properties(#20355,#20314,6,8,"abstract x: number;")
+#20356=@"loc,{#10000},28,3,28,21"
+locations_default(#20356,#10000,28,3,28,21)
+hasLocation(#20355,#20356)
 #20357=*
-exprs(#20357,0,#20354,0,"x")
-hasLocation(#20357,#20242)
-expr_containers(#20357,#20356)
-literals("x","x",#20357)
-is_abstract_member(#20354)
 #20358=*
-typeexprs(#20358,2,#20354,2,"number")
-hasLocation(#20358,#20246)
-enclosing_stmt(#20358,#20312)
-expr_containers(#20358,#20001)
-literals("number","number",#20358)
+exprs(#20358,0,#20355,0,"x")
+hasLocation(#20358,#20242)
+expr_containers(#20358,#20357)
+literals("x","x",#20358)
+is_abstract_member(#20355)
 #20359=*
-properties(#20359,#20312,7,0,"constructor() {}")
-#20360=@"loc,{#10000},18,26,18,25"
-locations_default(#20360,#10000,18,26,18,25)
-hasLocation(#20359,#20360)
-#20361=*
-exprs(#20361,0,#20359,0,"constructor")
-hasLocation(#20361,#20360)
-enclosing_stmt(#20361,#20312)
-expr_containers(#20361,#20001)
-literals("constructor","constructor",#20361)
-exprs(#20356,9,#20359,1,"() {}")
-hasLocation(#20356,#20360)
-enclosing_stmt(#20356,#20312)
-expr_containers(#20356,#20001)
+typeexprs(#20359,2,#20355,2,"number")
+hasLocation(#20359,#20246)
+enclosing_stmt(#20359,#20314)
+expr_containers(#20359,#20001)
+literals("number","number",#20359)
+#20360=*
+properties(#20360,#20314,7,0,"constructor() {}")
+#20361=@"loc,{#10000},18,26,18,25"
+locations_default(#20361,#10000,18,26,18,25)
+hasLocation(#20360,#20361)
 #20362=*
-scopes(#20362,1)
-scopenodes(#20356,#20362)
-scopenesting(#20362,#20316)
-#20363=@"var;{arguments};{#20362}"
-variables(#20363,"arguments",#20362)
-is_arguments_object(#20363)
-#20364=*
-stmts(#20364,1,#20356,-2,"{}")
-hasLocation(#20364,#20360)
-stmt_containers(#20364,#20356)
-is_method(#20359)
+exprs(#20362,0,#20360,0,"constructor")
+hasLocation(#20362,#20361)
+enclosing_stmt(#20362,#20314)
+expr_containers(#20362,#20001)
+literals("constructor","constructor",#20362)
+exprs(#20357,9,#20360,1,"() {}")
+hasLocation(#20357,#20361)
+enclosing_stmt(#20357,#20314)
+expr_containers(#20357,#20001)
+#20363=*
+scopes(#20363,1)
+scopenodes(#20357,#20363)
+scopenesting(#20363,#20317)
+#20364=@"var;{arguments};{#20363}"
+variables(#20364,"arguments",#20363)
+is_arguments_object(#20364)
 #20365=*
-entry_cfg_node(#20365,#20001)
-#20366=@"loc,{#10000},2,1,2,0"
-locations_default(#20366,#10000,2,1,2,0)
-hasLocation(#20365,#20366)
-#20367=*
-exit_cfg_node(#20367,#20001)
-hasLocation(#20367,#20251)
-successor(#20312,#20367)
-successor(#20303,#20306)
+stmts(#20365,1,#20357,-2,"{}")
+hasLocation(#20365,#20361)
+stmt_containers(#20365,#20357)
+is_method(#20360)
+#20366=*
+entry_cfg_node(#20366,#20001)
+#20367=@"loc,{#10000},2,1,2,0"
+locations_default(#20367,#10000,2,1,2,0)
+hasLocation(#20366,#20367)
 #20368=*
-entry_cfg_node(#20368,#20303)
-hasLocation(#20368,#20307)
+exit_cfg_node(#20368,#20001)
+hasLocation(#20368,#20251)
+successor(#20314,#20368)
+successor(#20305,#20308)
 #20369=*
-exit_cfg_node(#20369,#20303)
-hasLocation(#20369,#20307)
-successor(#20311,#20369)
-successor(#20368,#20311)
-successor(#20308,#20303)
-successor(#20306,#20260)
-successor(#20293,#20290)
+entry_cfg_node(#20369,#20305)
+hasLocation(#20369,#20309)
 #20370=*
-entry_cfg_node(#20370,#20293)
-#20371=@"loc,{#10000},11,3,11,2"
-locations_default(#20371,#10000,11,3,11,2)
-hasLocation(#20370,#20371)
-#20372=*
-exit_cfg_node(#20372,#20293)
-#20373=@"loc,{#10000},11,15,11,14"
-locations_default(#20373,#10000,11,15,11,14)
-hasLocation(#20372,#20373)
-successor(#20299,#20372)
-successor(#20296,#20299)
-successor(#20370,#20296)
-successor(#20292,#20293)
-successor(#20290,#20308)
-successor(#20280,#20292)
-successor(#20270,#20280)
-successor(#20264,#20270)
-successor(#20262,#20264)
-successor(#20260,#20312)
-successor(#20255,#20262)
-successor(#20365,#20255)
+exit_cfg_node(#20370,#20305)
+hasLocation(#20370,#20309)
+successor(#20313,#20370)
+successor(#20369,#20313)
+successor(#20310,#20305)
+successor(#20308,#20262)
+successor(#20295,#20292)
+#20371=*
+entry_cfg_node(#20371,#20295)
+#20372=@"loc,{#10000},11,3,11,2"
+locations_default(#20372,#10000,11,3,11,2)
+hasLocation(#20371,#20372)
+#20373=*
+exit_cfg_node(#20373,#20295)
+#20374=@"loc,{#10000},11,15,11,14"
+locations_default(#20374,#10000,11,15,11,14)
+hasLocation(#20373,#20374)
+successor(#20301,#20373)
+successor(#20298,#20301)
+successor(#20371,#20298)
+successor(#20294,#20295)
+successor(#20292,#20310)
+successor(#20282,#20294)
+successor(#20272,#20282)
+successor(#20266,#20272)
+successor(#20264,#20266)
+successor(#20262,#20314)
+successor(#20258,#20264)
+successor(#20366,#20258)
 numlines(#10000,29,15,8)
 filetype(#10000,"typescript")
diff --git a/javascript/extractor/tests/ts/output/trap/thisparameter.ts.trap b/javascript/extractor/tests/ts/output/trap/thisparameter.ts.trap
index 0e766cf77b9..27b075f05c7 100644
--- a/javascript/extractor/tests/ts/output/trap/thisparameter.ts.trap
+++ b/javascript/extractor/tests/ts/output/trap/thisparameter.ts.trap
@@ -425,146 +425,146 @@ hasLocation(#20001,#20158)
 variables(#20159,"declaration",#20000)
 #20160=@"var;{f};{#20000}"
 variables(#20160,"f",#20000)
-#20161=@"var;{C};{#20000}"
-variables(#20161,"C",#20000)
-#20162=@"local_type_name;{C};{#20000}"
-local_type_names(#20162,"C",#20000)
-#20163=@"local_type_name;{I};{#20000}"
-local_type_names(#20163,"I",#20000)
-#20164=*
-stmts(#20164,17,#20001,0,"functio ... ber) {}")
-hasLocation(#20164,#20003)
-stmt_containers(#20164,#20001)
+#20161=@"var;{ambient};{#20000}"
+variables(#20161,"ambient",#20000)
+#20162=@"var;{C};{#20000}"
+variables(#20162,"C",#20000)
+#20163=@"local_type_name;{C};{#20000}"
+local_type_names(#20163,"C",#20000)
+#20164=@"local_type_name;{I};{#20000}"
+local_type_names(#20164,"I",#20000)
 #20165=*
-exprs(#20165,78,#20164,-1,"declaration")
-hasLocation(#20165,#20033)
-expr_containers(#20165,#20164)
-literals("declaration","declaration",#20165)
-decl(#20165,#20159)
+stmts(#20165,17,#20001,0,"functio ... ber) {}")
+hasLocation(#20165,#20003)
+stmt_containers(#20165,#20001)
 #20166=*
-scopes(#20166,1)
-scopenodes(#20164,#20166)
-scopenesting(#20166,#20000)
-#20167=@"var;{x};{#20166}"
-variables(#20167,"x",#20166)
-#20168=*
-exprs(#20168,78,#20164,0,"x")
-hasLocation(#20168,#20045)
-expr_containers(#20168,#20164)
-literals("x","x",#20168)
-decl(#20168,#20167)
-#20169=@"var;{arguments};{#20166}"
-variables(#20169,"arguments",#20166)
-is_arguments_object(#20169)
-#20170=*
-typeexprs(#20170,2,#20164,-4,"void")
-hasLocation(#20170,#20041)
-expr_containers(#20170,#20164)
-literals("void","void",#20170)
+exprs(#20166,78,#20165,-1,"declaration")
+hasLocation(#20166,#20033)
+expr_containers(#20166,#20165)
+literals("declaration","declaration",#20166)
+decl(#20166,#20159)
+#20167=*
+scopes(#20167,1)
+scopenodes(#20165,#20167)
+scopenesting(#20167,#20000)
+#20168=@"var;{x};{#20167}"
+variables(#20168,"x",#20167)
+#20169=*
+exprs(#20169,78,#20165,0,"x")
+hasLocation(#20169,#20045)
+expr_containers(#20169,#20165)
+literals("x","x",#20169)
+decl(#20169,#20168)
+#20170=@"var;{arguments};{#20167}"
+variables(#20170,"arguments",#20167)
+is_arguments_object(#20170)
 #20171=*
-typeexprs(#20171,2,#20164,-6,"number")
-hasLocation(#20171,#20049)
-expr_containers(#20171,#20164)
-literals("number","number",#20171)
+typeexprs(#20171,2,#20165,-4,"void")
+hasLocation(#20171,#20041)
+expr_containers(#20171,#20165)
+literals("void","void",#20171)
 #20172=*
-stmts(#20172,1,#20164,-2,"{}")
-#20173=@"loc,{#10000},1,45,1,46"
-locations_default(#20173,#10000,1,45,1,46)
-hasLocation(#20172,#20173)
-stmt_containers(#20172,#20164)
-#20174=*
-stmts(#20174,18,#20001,1,"var f = ... ber) {}")
-hasLocation(#20174,#20007)
-stmt_containers(#20174,#20001)
+typeexprs(#20172,2,#20165,-6,"number")
+hasLocation(#20172,#20049)
+expr_containers(#20172,#20165)
+literals("number","number",#20172)
+#20173=*
+stmts(#20173,1,#20165,-2,"{}")
+#20174=@"loc,{#10000},1,45,1,46"
+locations_default(#20174,#10000,1,45,1,46)
+hasLocation(#20173,#20174)
+stmt_containers(#20173,#20165)
 #20175=*
-exprs(#20175,64,#20174,0,"f = fun ... ber) {}")
-#20176=@"loc,{#10000},3,5,3,44"
-locations_default(#20176,#10000,3,5,3,44)
-hasLocation(#20175,#20176)
-enclosing_stmt(#20175,#20174)
-expr_containers(#20175,#20001)
-#20177=*
-exprs(#20177,78,#20175,0,"f")
-hasLocation(#20177,#20059)
-enclosing_stmt(#20177,#20174)
-expr_containers(#20177,#20001)
-literals("f","f",#20177)
-decl(#20177,#20160)
+stmts(#20175,18,#20001,1,"var f = ... ber) {}")
+hasLocation(#20175,#20007)
+stmt_containers(#20175,#20001)
+#20176=*
+exprs(#20176,64,#20175,0,"f = fun ... ber) {}")
+#20177=@"loc,{#10000},3,5,3,44"
+locations_default(#20177,#10000,3,5,3,44)
+hasLocation(#20176,#20177)
+enclosing_stmt(#20176,#20175)
+expr_containers(#20176,#20001)
 #20178=*
-exprs(#20178,9,#20175,1,"functio ... ber) {}")
-#20179=@"loc,{#10000},3,9,3,44"
-locations_default(#20179,#10000,3,9,3,44)
-hasLocation(#20178,#20179)
-enclosing_stmt(#20178,#20174)
+exprs(#20178,78,#20176,0,"f")
+hasLocation(#20178,#20059)
+enclosing_stmt(#20178,#20175)
 expr_containers(#20178,#20001)
-#20180=*
-scopes(#20180,1)
-scopenodes(#20178,#20180)
-scopenesting(#20180,#20000)
-#20181=@"var;{x};{#20180}"
-variables(#20181,"x",#20180)
-#20182=*
-exprs(#20182,78,#20178,0,"x")
-hasLocation(#20182,#20075)
-expr_containers(#20182,#20178)
-literals("x","x",#20182)
-decl(#20182,#20181)
-#20183=@"var;{arguments};{#20180}"
-variables(#20183,"arguments",#20180)
-is_arguments_object(#20183)
-#20184=*
-typeexprs(#20184,2,#20178,-4,"string")
-hasLocation(#20184,#20071)
-expr_containers(#20184,#20178)
-literals("string","string",#20184)
+literals("f","f",#20178)
+decl(#20178,#20160)
+#20179=*
+exprs(#20179,9,#20176,1,"functio ... ber) {}")
+#20180=@"loc,{#10000},3,9,3,44"
+locations_default(#20180,#10000,3,9,3,44)
+hasLocation(#20179,#20180)
+enclosing_stmt(#20179,#20175)
+expr_containers(#20179,#20001)
+#20181=*
+scopes(#20181,1)
+scopenodes(#20179,#20181)
+scopenesting(#20181,#20000)
+#20182=@"var;{x};{#20181}"
+variables(#20182,"x",#20181)
+#20183=*
+exprs(#20183,78,#20179,0,"x")
+hasLocation(#20183,#20075)
+expr_containers(#20183,#20179)
+literals("x","x",#20183)
+decl(#20183,#20182)
+#20184=@"var;{arguments};{#20181}"
+variables(#20184,"arguments",#20181)
+is_arguments_object(#20184)
 #20185=*
-typeexprs(#20185,2,#20178,-6,"number")
-hasLocation(#20185,#20079)
-expr_containers(#20185,#20178)
-literals("number","number",#20185)
+typeexprs(#20185,2,#20179,-4,"string")
+hasLocation(#20185,#20071)
+expr_containers(#20185,#20179)
+literals("string","string",#20185)
 #20186=*
-stmts(#20186,1,#20178,-2,"{}")
-#20187=@"loc,{#10000},3,43,3,44"
-locations_default(#20187,#10000,3,43,3,44)
-hasLocation(#20186,#20187)
-stmt_containers(#20186,#20178)
-#20188=*
-stmts(#20188,17,#20001,2,"declare ... umber);")
-hasLocation(#20188,#20011)
-stmt_containers(#20188,#20001)
-has_declare_keyword(#20188)
+typeexprs(#20186,2,#20179,-6,"number")
+hasLocation(#20186,#20079)
+expr_containers(#20186,#20179)
+literals("number","number",#20186)
+#20187=*
+stmts(#20187,1,#20179,-2,"{}")
+#20188=@"loc,{#10000},3,43,3,44"
+locations_default(#20188,#10000,3,43,3,44)
+hasLocation(#20187,#20188)
+stmt_containers(#20187,#20179)
 #20189=*
-exprs(#20189,78,#20188,-1,"ambient")
-hasLocation(#20189,#20091)
-expr_containers(#20189,#20188)
-literals("ambient","ambient",#20189)
-#20190=@"var;{ambient};{#20000}"
-variables(#20190,"ambient",#20000)
-decl(#20189,#20190)
+stmts(#20189,17,#20001,2,"declare ... umber);")
+hasLocation(#20189,#20011)
+stmt_containers(#20189,#20001)
+has_declare_keyword(#20189)
+#20190=*
+exprs(#20190,78,#20189,-1,"ambient")
+hasLocation(#20190,#20091)
+expr_containers(#20190,#20189)
+literals("ambient","ambient",#20190)
+decl(#20190,#20161)
 #20191=*
 scopes(#20191,1)
-scopenodes(#20188,#20191)
+scopenodes(#20189,#20191)
 scopenesting(#20191,#20000)
 #20192=@"var;{x};{#20191}"
 variables(#20192,"x",#20191)
 #20193=*
-exprs(#20193,78,#20188,0,"x")
+exprs(#20193,78,#20189,0,"x")
 hasLocation(#20193,#20103)
-expr_containers(#20193,#20188)
+expr_containers(#20193,#20189)
 literals("x","x",#20193)
 decl(#20193,#20192)
 #20194=@"var;{arguments};{#20191}"
 variables(#20194,"arguments",#20191)
 is_arguments_object(#20194)
 #20195=*
-typeexprs(#20195,2,#20188,-4,"string")
+typeexprs(#20195,2,#20189,-4,"string")
 hasLocation(#20195,#20099)
-expr_containers(#20195,#20188)
+expr_containers(#20195,#20189)
 literals("string","string",#20195)
 #20196=*
-typeexprs(#20196,2,#20188,-6,"number")
+typeexprs(#20196,2,#20189,-6,"number")
 hasLocation(#20196,#20107)
-expr_containers(#20196,#20188)
+expr_containers(#20196,#20189)
 literals("number","number",#20196)
 #20197=*
 stmts(#20197,26,#20001,3,"class C ... C) {}\n}")
@@ -578,8 +578,8 @@ hasLocation(#20199,#20115)
 enclosing_stmt(#20199,#20197)
 expr_containers(#20199,#20001)
 literals("C","C",#20199)
-decl(#20199,#20161)
-typedecl(#20199,#20162)
+decl(#20199,#20162)
+typedecl(#20199,#20163)
 #20200=*
 scopes(#20200,10)
 scopenodes(#20197,#20200)
@@ -612,7 +612,7 @@ typeexprs(#20207,0,#20204,-4,"C")
 hasLocation(#20207,#20127)
 expr_containers(#20207,#20204)
 literals("C","C",#20207)
-typebind(#20207,#20162)
+typebind(#20207,#20163)
 #20208=*
 stmts(#20208,1,#20204,-2,"{}")
 #20209=@"loc,{#10000},8,19,8,20"
@@ -660,7 +660,7 @@ hasLocation(#20219,#20138)
 enclosing_stmt(#20219,#20217)
 expr_containers(#20219,#20001)
 literals("I","I",#20219)
-typedecl(#20219,#20163)
+typedecl(#20219,#20164)
 #20220=*
 properties(#20220,#20217,2,0,"method(this: I);")
 #20221=@"loc,{#10000},12,3,12,18"
@@ -689,7 +689,7 @@ typeexprs(#20226,0,#20223,-4,"I")
 hasLocation(#20226,#20150)
 expr_containers(#20226,#20223)
 literals("I","I",#20226)
-typebind(#20226,#20163)
+typebind(#20226,#20164)
 is_method(#20220)
 is_abstract_member(#20220)
 #20227=*
@@ -729,37 +729,37 @@ successor(#20203,#20204)
 successor(#20201,#20212)
 successor(#20199,#20203)
 successor(#20197,#20217)
-successor(#20188,#20199)
-successor(#20174,#20177)
-successor(#20178,#20175)
+successor(#20189,#20199)
+successor(#20175,#20178)
+successor(#20179,#20176)
 #20236=*
-entry_cfg_node(#20236,#20178)
+entry_cfg_node(#20236,#20179)
 #20237=@"loc,{#10000},3,9,3,8"
 locations_default(#20237,#10000,3,9,3,8)
 hasLocation(#20236,#20237)
 #20238=*
-exit_cfg_node(#20238,#20178)
+exit_cfg_node(#20238,#20179)
 #20239=@"loc,{#10000},3,45,3,44"
 locations_default(#20239,#10000,3,45,3,44)
 hasLocation(#20238,#20239)
-successor(#20186,#20238)
-successor(#20182,#20186)
-successor(#20236,#20182)
-successor(#20177,#20178)
-successor(#20175,#20188)
-successor(#20164,#20174)
+successor(#20187,#20238)
+successor(#20183,#20187)
+successor(#20236,#20183)
+successor(#20178,#20179)
+successor(#20176,#20189)
+successor(#20165,#20175)
 #20240=*
-entry_cfg_node(#20240,#20164)
+entry_cfg_node(#20240,#20165)
 hasLocation(#20240,#20228)
 #20241=*
-exit_cfg_node(#20241,#20164)
+exit_cfg_node(#20241,#20165)
 #20242=@"loc,{#10000},1,47,1,46"
 locations_default(#20242,#10000,1,47,1,46)
 hasLocation(#20241,#20242)
-successor(#20172,#20241)
-successor(#20168,#20172)
-successor(#20240,#20168)
-successor(#20165,#20164)
-successor(#20227,#20165)
+successor(#20173,#20241)
+successor(#20169,#20173)
+successor(#20240,#20169)
+successor(#20166,#20165)
+successor(#20227,#20166)
 numlines(#10000,14,9,0)
 filetype(#10000,"typescript")
diff --git a/javascript/ql/integration-tests/query-suite/javascript-code-quality.qls.expected b/javascript/ql/integration-tests/query-suite/javascript-code-quality.qls.expected
index 876b5f25fa2..e5d496d5e9c 100644
--- a/javascript/ql/integration-tests/query-suite/javascript-code-quality.qls.expected
+++ b/javascript/ql/integration-tests/query-suite/javascript-code-quality.qls.expected
@@ -1,6 +1,8 @@
 ql/javascript/ql/src/Declarations/IneffectiveParameterType.ql
+ql/javascript/ql/src/Declarations/SuspiciousMethodNameDeclaration.ql
 ql/javascript/ql/src/Expressions/ExprHasNoEffect.ql
 ql/javascript/ql/src/Expressions/MissingAwait.ql
 ql/javascript/ql/src/LanguageFeatures/SpuriousArguments.ql
 ql/javascript/ql/src/Quality/UnhandledErrorInStreamPipeline.ql
+ql/javascript/ql/src/RegExp/DuplicateCharacterInCharacterClass.ql
 ql/javascript/ql/src/RegExp/RegExpAlwaysMatches.ql
diff --git a/javascript/ql/integration-tests/query-suite/not_included_in_qls.expected b/javascript/ql/integration-tests/query-suite/not_included_in_qls.expected
index 34c4df3d6fa..c80c3fc76da 100644
--- a/javascript/ql/integration-tests/query-suite/not_included_in_qls.expected
+++ b/javascript/ql/integration-tests/query-suite/not_included_in_qls.expected
@@ -147,4 +147,3 @@ ql/javascript/ql/src/meta/extraction-metrics/FileData.ql
 ql/javascript/ql/src/meta/extraction-metrics/MissingMetrics.ql
 ql/javascript/ql/src/meta/extraction-metrics/PhaseTimings.ql
 ql/javascript/ql/src/meta/types/TypedExprs.ql
-ql/javascript/ql/src/meta/types/TypesWithQualifiedName.ql
diff --git a/javascript/ql/lib/Expressions/ExprHasNoEffect.qll b/javascript/ql/lib/Expressions/ExprHasNoEffect.qll
index eff5fa7fc98..9813d9b32ed 100644
--- a/javascript/ql/lib/Expressions/ExprHasNoEffect.qll
+++ b/javascript/ql/lib/Expressions/ExprHasNoEffect.qll
@@ -22,6 +22,9 @@ predicate inVoidContext(Expr e) {
     )
   )
   or
+  // propagate void context through parenthesized expressions
+  inVoidContext(e.getParent().(ParExpr))
+  or
   exists(SeqExpr seq, int i, int n |
     e = seq.getOperand(i) and
     n = seq.getNumOperands()
@@ -129,6 +132,19 @@ predicate noSideEffects(Expr e) {
   )
 }
 
+/**
+ * Holds if `e` is a compound expression that may contain sub-expressions with side effects.
+ * We should not flag these directly as useless since we want to flag only the innermost
+ * expressions that actually have no effect.
+ */
+predicate isCompoundExpression(Expr e) {
+  e instanceof LogicalBinaryExpr
+  or
+  e instanceof SeqExpr
+  or
+  e instanceof ParExpr
+}
+
 /**
  * Holds if the expression `e` should be reported as having no effect.
  */
@@ -145,6 +161,7 @@ predicate hasNoEffect(Expr e) {
   not isDeclaration(e) and
   // exclude DOM properties, which sometimes have magical auto-update properties
   not isDomProperty(e.(PropAccess).getPropertyName()) and
+  not isCompoundExpression(e) and
   // exclude xUnit.js annotations
   not e instanceof XUnitAnnotation and
   // exclude common patterns that are most likely intentional
@@ -157,7 +174,17 @@ predicate hasNoEffect(Expr e) {
     not exists(fe.getName())
   ) and
   // exclude block-level flow type annotations. For example: `(name: empty)`.
-  not e.(ParExpr).getExpression().getLastToken().getNextToken().getValue() = ":" and
+  not exists(ParExpr parent |
+    e.getParent() = parent and
+    e.getLastToken().getNextToken().getValue() = ":"
+  ) and
+  // exclude expressions that are part of a conditional expression
+  not exists(ConditionalExpr cond | e = cond.getABranch() |
+    e instanceof NullLiteral or
+    e.(GlobalVarAccess).getName() = "undefined" or
+    e.(NumberLiteral).getIntValue() = 0 or
+    e instanceof VoidExpr
+  ) and
   // exclude the first statement of a try block
   not e = any(TryStmt stmt).getBody().getStmt(0).(ExprStmt).getExpr() and
   // exclude expressions that are alone in a file, and file doesn't contain a function.
diff --git a/javascript/ql/lib/definitions.qll b/javascript/ql/lib/definitions.qll
index 2cc9313d313..2f1c99b7c60 100644
--- a/javascript/ql/lib/definitions.qll
+++ b/javascript/ql/lib/definitions.qll
@@ -153,17 +153,7 @@ private predicate jsdocTypeLookup(JSDocNamedTypeExpr ref, AstNode decl, string k
   kind = "T"
 }
 
-/**
- * Gets an element, of kind `kind`, that element `e` uses, if any.
- *
- * The `kind` is a string representing what kind of use it is:
- *  - `"M"` for function and method calls
- *  - `"T"` for uses of types
- *  - `"V"` for variable accesses
- *  - `"I"` for imports
- */
-cached
-AstNode definitionOf(Locatable e, string kind) {
+private AstNode definitionOfRaw(Locatable e, string kind) {
   variableDefLookup(e, result, kind)
   or
   // prefer definitions over declarations
@@ -179,3 +169,46 @@ AstNode definitionOf(Locatable e, string kind) {
   or
   jsdocTypeLookup(e, result, kind)
 }
+
+/** Gets a more useful node to show for something that resolves to `node`. */
+private AstNode redirectOnce(AstNode node) {
+  exists(ConstructorDeclaration ctor |
+    ctor.isSynthetic() and
+    node = ctor.getBody() and
+    result = ctor.getDeclaringClass()
+  )
+  or
+  exists(ClassDefinition cls |
+    node = cls and
+    result = cls.getIdentifier()
+  )
+  or
+  exists(FunctionDeclStmt decl |
+    node = decl and
+    result = decl.getIdentifier()
+  )
+  or
+  exists(MethodDeclaration member |
+    not member instanceof ConstructorDeclaration and
+    node = member.getBody() and
+    result = member.getNameExpr()
+  )
+}
+
+private AstNode redirect(AstNode node) {
+  node = definitionOfRaw(_, _) and
+  result = redirectOnce*(node) and
+  not exists(redirectOnce(result))
+}
+
+/**
+ * Gets an element, of kind `kind`, that element `e` uses, if any.
+ *
+ * The `kind` is a string representing what kind of use it is:
+ *  - `"M"` for function and method calls
+ *  - `"T"` for uses of types
+ *  - `"V"` for variable accesses
+ *  - `"I"` for imports
+ */
+cached
+AstNode definitionOf(Locatable e, string kind) { result = redirect(definitionOfRaw(e, kind)) }
diff --git a/javascript/ql/lib/semmle/javascript/ApiGraphs.qll b/javascript/ql/lib/semmle/javascript/ApiGraphs.qll
index 3e882251cbf..3bb04f2686b 100644
--- a/javascript/ql/lib/semmle/javascript/ApiGraphs.qll
+++ b/javascript/ql/lib/semmle/javascript/ApiGraphs.qll
@@ -649,11 +649,13 @@ module API {
     /** Gets a node corresponding to an import of module `m` without taking into account types from models. */
     Node getAModuleImportRaw(string m) {
       result = Impl::MkModuleImport(m) or
-      result = Impl::MkModuleImport(m).(Node).getMember("default")
+      result = Impl::MkModuleImport(m).(Node).getMember("default") or
+      result = Impl::MkTypeUse(m, "")
     }
 
     /** Gets a node whose type has the given qualified name, not including types from models. */
     Node getANodeOfTypeRaw(string moduleName, string exportedName) {
+      exportedName != "" and
       result = Impl::MkTypeUse(moduleName, exportedName).(Node).getInstance()
       or
       exportedName = "" and
@@ -749,18 +751,14 @@ module API {
       MkModuleImport(string m) {
         imports(_, m)
         or
-        any(TypeAnnotation n).hasQualifiedName(m, _)
-        or
-        any(Type t).hasUnderlyingType(m, _)
+        any(TypeAnnotation n).hasUnderlyingType(m, _)
       } or
       MkClassInstance(DataFlow::ClassNode cls) { needsDefNode(cls) } or
       MkDef(DataFlow::Node nd) { rhs(_, _, nd) } or
       MkUse(DataFlow::Node nd) { use(_, _, nd) } or
       /** A use of a TypeScript type. */
       MkTypeUse(string moduleName, string exportName) {
-        any(TypeAnnotation n).hasQualifiedName(moduleName, exportName)
-        or
-        any(Type t).hasUnderlyingType(moduleName, exportName)
+        any(TypeAnnotation n).hasUnderlyingType(moduleName, exportName)
       } or
       MkSyntheticCallbackArg(DataFlow::Node src, int bound, DataFlow::InvokeNode nd) {
         trackUseNode(src, true, bound, "").flowsTo(nd.getCalleeNode())
diff --git a/javascript/ql/lib/semmle/javascript/Closure.qll b/javascript/ql/lib/semmle/javascript/Closure.qll
index 40aee266379..c3169833339 100644
--- a/javascript/ql/lib/semmle/javascript/Closure.qll
+++ b/javascript/ql/lib/semmle/javascript/Closure.qll
@@ -5,17 +5,49 @@
 import javascript
 
 module Closure {
+  /** A call to `goog.require` */
+  class RequireCallExpr extends CallExpr {
+    RequireCallExpr() { this.getCallee().(PropAccess).getQualifiedName() = "goog.require" }
+
+    /** Gets the imported namespace name. */
+    string getClosureNamespace() { result = this.getArgument(0).getStringValue() }
+  }
+
+  /** A call to `goog.provide` */
+  class ProvideCallExpr extends CallExpr {
+    ProvideCallExpr() { this.getCallee().(PropAccess).getQualifiedName() = "goog.provide" }
+
+    /** Gets the imported namespace name. */
+    string getClosureNamespace() { result = this.getArgument(0).getStringValue() }
+  }
+
+  /** A call to `goog.module` or `goog.declareModuleId`. */
+  private class ModuleDeclarationCall extends CallExpr {
+    private string kind;
+
+    ModuleDeclarationCall() {
+      this.getCallee().(PropAccess).getQualifiedName() = kind and
+      kind = ["goog.module", "goog.declareModuleId"]
+    }
+
+    /** Gets the declared namespace. */
+    string getClosureNamespace() { result = this.getArgument(0).getStringValue() }
+
+    /** Gets the string `goog.module` or `goog.declareModuleId` depending on which method is being called. */
+    string getModuleKind() { result = kind }
+  }
+
   /**
    * A reference to a Closure namespace.
    */
-  class ClosureNamespaceRef extends DataFlow::Node instanceof ClosureNamespaceRef::Range {
+  deprecated class ClosureNamespaceRef extends DataFlow::Node instanceof ClosureNamespaceRef::Range {
     /**
      * Gets the namespace being referenced.
      */
     string getClosureNamespace() { result = super.getClosureNamespace() }
   }
 
-  module ClosureNamespaceRef {
+  deprecated module ClosureNamespaceRef {
     /**
      * A reference to a Closure namespace.
      *
@@ -32,10 +64,10 @@ module Closure {
   /**
    * A data flow node that returns the value of a closure namespace.
    */
-  class ClosureNamespaceAccess extends ClosureNamespaceRef instanceof ClosureNamespaceAccess::Range {
-  }
+  deprecated class ClosureNamespaceAccess extends ClosureNamespaceRef instanceof ClosureNamespaceAccess::Range
+  { }
 
-  module ClosureNamespaceAccess {
+  deprecated module ClosureNamespaceAccess {
     /**
      * A data flow node that returns the value of a closure namespace.
      *
@@ -47,7 +79,7 @@ module Closure {
   /**
    * A call to a method on the `goog.` namespace, as a closure reference.
    */
-  abstract private class DefaultNamespaceRef extends DataFlow::MethodCallNode,
+  abstract deprecated private class DefaultNamespaceRef extends DataFlow::MethodCallNode,
     ClosureNamespaceRef::Range
   {
     DefaultNamespaceRef() { this = DataFlow::globalVarRef("goog").getAMethodCall() }
@@ -59,14 +91,14 @@ module Closure {
    * Holds if `node` is the data flow node corresponding to the expression in
    * a top-level expression statement.
    */
-  private predicate isTopLevelExpr(DataFlow::Node node) {
+  deprecated private predicate isTopLevelExpr(DataFlow::Node node) {
     any(TopLevel tl).getAChildStmt().(ExprStmt).getExpr().flow() = node
   }
 
   /**
    * A top-level call to `goog.provide`.
    */
-  private class DefaultClosureProvideCall extends DefaultNamespaceRef {
+  deprecated private class DefaultClosureProvideCall extends DefaultNamespaceRef {
     DefaultClosureProvideCall() {
       this.getMethodName() = "provide" and
       isTopLevelExpr(this)
@@ -76,13 +108,14 @@ module Closure {
   /**
    * A top-level call to `goog.provide`.
    */
-  class ClosureProvideCall extends ClosureNamespaceRef, DataFlow::MethodCallNode instanceof DefaultClosureProvideCall
+  deprecated class ClosureProvideCall extends ClosureNamespaceRef, DataFlow::MethodCallNode instanceof DefaultClosureProvideCall
   { }
 
   /**
    * A call to `goog.require`.
    */
-  private class DefaultClosureRequireCall extends DefaultNamespaceRef, ClosureNamespaceAccess::Range
+  deprecated private class DefaultClosureRequireCall extends DefaultNamespaceRef,
+    ClosureNamespaceAccess::Range
   {
     DefaultClosureRequireCall() { this.getMethodName() = "require" }
   }
@@ -90,13 +123,13 @@ module Closure {
   /**
    * A call to `goog.require`.
    */
-  class ClosureRequireCall extends ClosureNamespaceAccess, DataFlow::MethodCallNode instanceof DefaultClosureRequireCall
+  deprecated class ClosureRequireCall extends ClosureNamespaceAccess, DataFlow::MethodCallNode instanceof DefaultClosureRequireCall
   { }
 
   /**
    * A top-level call to `goog.module` or `goog.declareModuleId`.
    */
-  private class DefaultClosureModuleDeclaration extends DefaultNamespaceRef {
+  deprecated private class DefaultClosureModuleDeclaration extends DefaultNamespaceRef {
     DefaultClosureModuleDeclaration() {
       (this.getMethodName() = "module" or this.getMethodName() = "declareModuleId") and
       isTopLevelExpr(this)
@@ -106,41 +139,29 @@ module Closure {
   /**
    * A top-level call to `goog.module` or `goog.declareModuleId`.
    */
-  class ClosureModuleDeclaration extends ClosureNamespaceRef, DataFlow::MethodCallNode instanceof DefaultClosureModuleDeclaration
+  deprecated class ClosureModuleDeclaration extends ClosureNamespaceRef, DataFlow::MethodCallNode instanceof DefaultClosureModuleDeclaration
   { }
 
-  private GlobalVariable googVariable() { variables(result, "goog", any(GlobalScope sc)) }
-
-  pragma[nomagic]
-  private MethodCallExpr googModuleDeclExpr() {
-    result.getReceiver() = googVariable().getAnAccess() and
-    result.getMethodName() = ["module", "declareModuleId"]
-  }
-
-  pragma[nomagic]
-  private MethodCallExpr googModuleDeclExprInContainer(StmtContainer container) {
-    result = googModuleDeclExpr() and
-    container = result.getContainer()
-  }
-
   pragma[noinline]
-  private ClosureRequireCall getARequireInTopLevel(ClosureModule m) { result.getTopLevel() = m }
+  private RequireCallExpr getARequireInTopLevel(ClosureModule m) { result.getTopLevel() = m }
 
   /**
    * A module using the Closure module system, declared using `goog.module()` or `goog.declareModuleId()`.
    */
   class ClosureModule extends Module {
-    ClosureModule() { exists(googModuleDeclExprInContainer(this)) }
+    private ModuleDeclarationCall decl;
+
+    ClosureModule() { decl.getTopLevel() = this }
 
     /**
      * Gets the call to `goog.module` or `goog.declareModuleId` in this module.
      */
-    ClosureModuleDeclaration getModuleDeclaration() { result.getTopLevel() = this }
+    deprecated ClosureModuleDeclaration getModuleDeclaration() { result.getTopLevel() = this }
 
     /**
      * Gets the namespace of this module.
      */
-    string getClosureNamespace() { result = this.getModuleDeclaration().getClosureNamespace() }
+    string getClosureNamespace() { result = decl.getClosureNamespace() }
 
     override Module getAnImportedModule() {
       result.(ClosureModule).getClosureNamespace() =
@@ -156,7 +177,7 @@ module Closure {
      * Has no result for ES6 modules using `goog.declareModuleId`.
      */
     Variable getExportsVariable() {
-      this.getModuleDeclaration().getMethodName() = "module" and
+      decl.getModuleKind() = "goog.module" and
       result = this.getScope().getVariable("exports")
     }
 
@@ -185,15 +206,15 @@ module Closure {
     ClosureScript() {
       not this instanceof ClosureModule and
       (
-        any(ClosureProvideCall provide).getTopLevel() = this
+        any(ProvideCallExpr provide).getTopLevel() = this
         or
-        any(ClosureRequireCall require).getTopLevel() = this
+        any(RequireCallExpr require).getTopLevel() = this
       )
     }
 
     /** Gets the identifier of a namespace required by this module. */
     string getARequiredNamespace() {
-      exists(ClosureRequireCall require |
+      exists(RequireCallExpr require |
         require.getTopLevel() = this and
         result = require.getClosureNamespace()
       )
@@ -201,7 +222,7 @@ module Closure {
 
     /** Gets the identifer of a namespace provided by this module. */
     string getAProvidedNamespace() {
-      exists(ClosureProvideCall require |
+      exists(ProvideCallExpr require |
         require.getTopLevel() = this and
         result = require.getClosureNamespace()
       )
@@ -213,7 +234,13 @@ module Closure {
    */
   pragma[noinline]
   predicate isClosureNamespace(string name) {
-    exists(string namespace | namespace = any(ClosureNamespaceRef ref).getClosureNamespace() |
+    exists(string namespace |
+      namespace =
+        [
+          any(RequireCallExpr ref).getClosureNamespace(),
+          any(ModuleDeclarationCall c).getClosureNamespace()
+        ]
+    |
       name = namespace.substring(0, namespace.indexOf("."))
       or
       name = namespace
diff --git a/javascript/ql/lib/semmle/javascript/ES2015Modules.qll b/javascript/ql/lib/semmle/javascript/ES2015Modules.qll
index 379403eb0ee..e7534449f55 100644
--- a/javascript/ql/lib/semmle/javascript/ES2015Modules.qll
+++ b/javascript/ql/lib/semmle/javascript/ES2015Modules.qll
@@ -180,6 +180,9 @@ deprecated private class LiteralImportPath extends PathExpr, ConstantString {
  * ```
  */
 class ImportSpecifier extends Expr, @import_specifier {
+  /** Gets the import declaration in which this specifier appears. */
+  ImportDeclaration getImportDeclaration() { result.getASpecifier() = this }
+
   /** Gets the imported symbol; undefined for default and namespace import specifiers. */
   Identifier getImported() { result = this.getChildExpr(0) }
 
diff --git a/javascript/ql/lib/semmle/javascript/Expr.qll b/javascript/ql/lib/semmle/javascript/Expr.qll
index 8695c893f81..d7fe610b4f1 100644
--- a/javascript/ql/lib/semmle/javascript/Expr.qll
+++ b/javascript/ql/lib/semmle/javascript/Expr.qll
@@ -4,6 +4,7 @@
 
 import javascript
 private import semmle.javascript.internal.CachedStages
+private import semmle.javascript.internal.TypeResolution
 
 /**
  * A program element that is either an expression or a type annotation.
@@ -1017,7 +1018,11 @@ class InvokeExpr extends @invokeexpr, Expr {
    * Note that the resolved function may be overridden in a subclass and thus is not
    * necessarily the actual target of this invocation at runtime.
    */
-  Function getResolvedCallee() { result = this.getResolvedCalleeName().getImplementation() }
+  Function getResolvedCallee() {
+    TypeResolution::callTarget(this, result)
+    or
+    result = this.getResolvedCalleeName().getImplementation()
+  }
 }
 
 /**
diff --git a/javascript/ql/lib/semmle/javascript/GlobalAccessPaths.qll b/javascript/ql/lib/semmle/javascript/GlobalAccessPaths.qll
index 35ba8cfe601..4a461961f8a 100644
--- a/javascript/ql/lib/semmle/javascript/GlobalAccessPaths.qll
+++ b/javascript/ql/lib/semmle/javascript/GlobalAccessPaths.qll
@@ -34,7 +34,7 @@ module AccessPath {
       not this.accessesGlobal(_) and
       not this instanceof DataFlow::PropRead and
       not this instanceof PropertyProjection and
-      not this instanceof Closure::ClosureNamespaceAccess and
+      not this.asExpr() instanceof Closure::RequireCallExpr and
       not this = DataFlow::parameterNode(any(ImmediatelyInvokedFunctionExpr iife).getAParameter()) and
       not FlowSteps::identityFunctionStep(_, this)
     }
@@ -139,8 +139,8 @@ module AccessPath {
       result = join(fromReference(prop.getBase(), root), "[number]")
     )
     or
-    exists(Closure::ClosureNamespaceAccess acc | node = acc |
-      result = acc.getClosureNamespace() and
+    exists(Closure::RequireCallExpr req | node = req.flow() |
+      result = req.getClosureNamespace() and
       root.isGlobal()
     )
     or
diff --git a/javascript/ql/lib/semmle/javascript/JSDoc.qll b/javascript/ql/lib/semmle/javascript/JSDoc.qll
index 10970a2e8b0..85b7695cd70 100644
--- a/javascript/ql/lib/semmle/javascript/JSDoc.qll
+++ b/javascript/ql/lib/semmle/javascript/JSDoc.qll
@@ -33,6 +33,9 @@ class JSDoc extends @jsdoc, Locatable {
     result.getTitle() = title
   }
 
+  /** Gets the element to which this JSDoc comment is attached */
+  Documentable getDocumentedElement() { result.getDocumentation() = this }
+
   override string toString() { result = this.getComment().toString() }
 }
 
@@ -299,6 +302,41 @@ class JSDocIdentifierTypeExpr extends @jsdoc_identifier_type_expr, JSDocTypeExpr
   override predicate isRawFunction() { this.getName() = "Function" }
 }
 
+private AstNode getAncestorInScope(Documentable doc) {
+  any(JSDocLocalTypeAccess t).getJSDocComment() = doc.getDocumentation() and // restrict to cases where we need this
+  result = doc.getParent()
+  or
+  exists(AstNode mid |
+    mid = getAncestorInScope(doc) and
+    not mid = any(Scope s).getScopeElement() and
+    result = mid.getParent()
+  )
+}
+
+private Scope getScope(Documentable doc) { result.getScopeElement() = getAncestorInScope(doc) }
+
+pragma[nomagic]
+private predicate shouldResolveName(TopLevel top, string name) {
+  exists(JSDocLocalTypeAccess access |
+    access.getName() = name and
+    access.getTopLevel() = top
+  )
+}
+
+private LexicalName getOwnLocal(Scope scope, string name, DeclarationSpace space) {
+  scope = result.getScope() and
+  name = result.getName() and
+  space = result.getDeclarationSpace() and
+  shouldResolveName(scope.getScopeElement().getTopLevel(), name) // restrict size of predicate
+}
+
+private LexicalName resolveLocal(Scope scope, string name, DeclarationSpace space) {
+  result = getOwnLocal(scope, name, space)
+  or
+  result = resolveLocal(scope.getOuterScope(), name, space) and
+  not exists(getOwnLocal(scope, name, space))
+}
+
 /**
  * An unqualified identifier in a JSDoc type expression.
  *
@@ -311,6 +349,12 @@ class JSDocIdentifierTypeExpr extends @jsdoc_identifier_type_expr, JSDocTypeExpr
  */
 class JSDocLocalTypeAccess extends JSDocIdentifierTypeExpr {
   JSDocLocalTypeAccess() { not this = any(JSDocQualifiedTypeAccess a).getNameNode() }
+
+  /** Gets a variable, type-name, or namespace that this expression may resolve to. */
+  LexicalName getALexicalName() {
+    result =
+      resolveLocal(getScope(this.getJSDocComment().getDocumentedElement()), this.getName(), _)
+  }
 }
 
 /**
@@ -371,7 +415,7 @@ class JSDocNamedTypeExpr extends JSDocTypeExpr {
    * - `foo.bar.Baz` has prefix `foo` and suffix `.bar.Baz`.
    * - `Baz` has prefix `Baz` and an empty suffix.
    */
-  predicate hasNameParts(string prefix, string suffix) {
+  deprecated predicate hasNameParts(string prefix, string suffix) {
     not this = any(JSDocQualifiedTypeAccess a).getBase() and // restrict size of predicate
     exists(string regex, string name | regex = "([^.]+)(.*)" |
       name = this.getRawName() and
@@ -379,46 +423,6 @@ class JSDocNamedTypeExpr extends JSDocTypeExpr {
       suffix = name.regexpCapture(regex, 2)
     )
   }
-
-  pragma[noinline]
-  pragma[nomagic]
-  private predicate hasNamePartsAndEnv(string prefix, string suffix, JSDoc::Environment env) {
-    // Force join ordering
-    this.hasNameParts(prefix, suffix) and
-    env.isContainerInScope(this.getContainer())
-  }
-
-  /**
-   * Gets the qualified name of this name by resolving its prefix, if any.
-   */
-  cached
-  private string resolvedName() {
-    exists(string prefix, string suffix, JSDoc::Environment env |
-      this.hasNamePartsAndEnv(prefix, suffix, env) and
-      result = env.resolveAlias(prefix) + suffix
-    )
-  }
-
-  override predicate hasQualifiedName(string globalName) {
-    globalName = this.resolvedName()
-    or
-    not exists(this.resolvedName()) and
-    globalName = this.getRawName()
-  }
-
-  override DataFlow::ClassNode getClass() {
-    exists(string name |
-      this.hasQualifiedName(name) and
-      result.hasQualifiedName(name)
-    )
-    or
-    // Handle case where a local variable has a reference to the class,
-    // but the class doesn't have a globally qualified name.
-    exists(string alias, JSDoc::Environment env |
-      this.hasNamePartsAndEnv(alias, "", env) and
-      result.getAClassReference().flowsTo(env.getNodeFromAlias(alias))
-    )
-  }
 }
 
 /**
@@ -447,12 +451,6 @@ class JSDocAppliedTypeExpr extends @jsdoc_applied_type_expr, JSDocTypeExpr {
    * For example, in `Array<string>`, `string` is the only argument type.
    */
   JSDocTypeExpr getAnArgument() { result = this.getArgument(_) }
-
-  override predicate hasQualifiedName(string globalName) {
-    this.getHead().hasQualifiedName(globalName)
-  }
-
-  override DataFlow::ClassNode getClass() { result = this.getHead().getClass() }
 }
 
 /**
@@ -472,8 +470,6 @@ class JSDocNullableTypeExpr extends @jsdoc_nullable_type_expr, JSDocTypeExpr {
   predicate isPrefix() { jsdoc_prefix_qualifier(this) }
 
   override JSDocTypeExpr getAnUnderlyingType() { result = this.getTypeExpr().getAnUnderlyingType() }
-
-  override DataFlow::ClassNode getClass() { result = this.getTypeExpr().getClass() }
 }
 
 /**
@@ -493,8 +489,6 @@ class JSDocNonNullableTypeExpr extends @jsdoc_non_nullable_type_expr, JSDocTypeE
   predicate isPrefix() { jsdoc_prefix_qualifier(this) }
 
   override JSDocTypeExpr getAnUnderlyingType() { result = this.getTypeExpr().getAnUnderlyingType() }
-
-  override DataFlow::ClassNode getClass() { result = this.getTypeExpr().getClass() }
 }
 
 /**
@@ -599,8 +593,6 @@ class JSDocOptionalParameterTypeExpr extends @jsdoc_optional_type_expr, JSDocTyp
   override JSDocTypeExpr getAnUnderlyingType() {
     result = this.getUnderlyingType().getAnUnderlyingType()
   }
-
-  override DataFlow::ClassNode getClass() { result = this.getUnderlyingType().getClass() }
 }
 
 /**
@@ -635,7 +627,7 @@ module JSDoc {
   /**
    * A statement container which may declare JSDoc name aliases.
    */
-  class Environment extends StmtContainer {
+  deprecated class Environment extends StmtContainer {
     /**
      * Gets the fully qualified name aliased by the given unqualified name
      * within this container.
@@ -685,7 +677,7 @@ module JSDoc {
   }
 
   pragma[noinline]
-  private predicate isTypenamePrefix(string name) {
+  deprecated private predicate isTypenamePrefix(string name) {
     any(JSDocNamedTypeExpr expr).hasNameParts(name, _)
   }
 }
diff --git a/javascript/ql/lib/semmle/javascript/TypeAnnotations.qll b/javascript/ql/lib/semmle/javascript/TypeAnnotations.qll
index d10b60b92b5..318ad2f8873 100644
--- a/javascript/ql/lib/semmle/javascript/TypeAnnotations.qll
+++ b/javascript/ql/lib/semmle/javascript/TypeAnnotations.qll
@@ -4,6 +4,8 @@
 
 import javascript
 private import internal.StmtContainers
+private import internal.NameResolution
+private import internal.UnderlyingTypes
 
 /**
  * A type annotation, either in the form of a TypeScript type or a JSDoc comment.
@@ -75,14 +77,38 @@ class TypeAnnotation extends @type_annotation, NodeInStmtContainer {
   TypeAnnotation getAnUnderlyingType() { result = this }
 
   /**
+   * DEPRECATED. Use `hasUnderlyingType` instead.
+   *
    * Holds if this is a reference to the type with qualified name `globalName` relative to the global scope.
    */
-  predicate hasQualifiedName(string globalName) { none() }
+  deprecated predicate hasQualifiedName(string globalName) {
+    UnderlyingTypes::nodeHasUnderlyingType(this, globalName)
+  }
 
   /**
+   * DEPRECATED. Use `hasUnderlyingType` instead.
+   *
    * Holds if this is a reference to the type exported from `moduleName` under the name `exportedName`.
    */
-  predicate hasQualifiedName(string moduleName, string exportedName) { none() }
+  deprecated predicate hasQualifiedName(string moduleName, string exportedName) {
+    UnderlyingTypes::nodeHasUnderlyingType(this, moduleName, exportedName)
+  }
+
+  /**
+   * Holds if this is a reference to the type with qualified name `globalName` relative to the global scope,
+   * or is declared as a subtype thereof, or is a union or intersection containing such a type.
+   */
+  final predicate hasUnderlyingType(string globalName) {
+    UnderlyingTypes::nodeHasUnderlyingType(this, globalName)
+  }
+
+  /**
+   * Holds if this is a reference to the type exported from `moduleName` under the name `exportedName`,
+   * or is declared as a subtype thereof, or is a union or intersection containing such a type.
+   */
+  final predicate hasUnderlyingType(string moduleName, string exportedName) {
+    UnderlyingTypes::nodeHasUnderlyingType(this, moduleName, exportedName)
+  }
 
   /** Gets the statement in which this type appears. */
   Stmt getEnclosingStmt() { none() }
@@ -107,5 +133,5 @@ class TypeAnnotation extends @type_annotation, NodeInStmtContainer {
    *
    * This unfolds nullability modifiers and generic type applications.
    */
-  DataFlow::ClassNode getClass() { none() }
+  final DataFlow::ClassNode getClass() { UnderlyingTypes::nodeHasUnderlyingClassType(this, result) }
 }
diff --git a/javascript/ql/lib/semmle/javascript/TypeScript.qll b/javascript/ql/lib/semmle/javascript/TypeScript.qll
index 4be331ed6a5..ab670700c24 100644
--- a/javascript/ql/lib/semmle/javascript/TypeScript.qll
+++ b/javascript/ql/lib/semmle/javascript/TypeScript.qll
@@ -1,4 +1,5 @@
 import javascript
+private import semmle.javascript.internal.UnderlyingTypes
 
 /**
  * A statement that defines a namespace, that is, a namespace declaration or enum declaration.
@@ -575,10 +576,6 @@ class TypeExpr extends ExprOrType, @typeexpr, TypeAnnotation {
   override Function getEnclosingFunction() { result = ExprOrType.super.getEnclosingFunction() }
 
   override TopLevel getTopLevel() { result = ExprOrType.super.getTopLevel() }
-
-  override DataFlow::ClassNode getClass() {
-    result.getAstNode() = this.getType().(ClassType).getClass()
-  }
 }
 
 /**
@@ -698,58 +695,9 @@ class TypeAccess extends @typeaccess, TypeExpr, TypeRef {
    */
   TypeName getTypeName() { ast_node_symbol(this, result) }
 
-  override predicate hasQualifiedName(string globalName) {
-    this.getTypeName().hasQualifiedName(globalName)
-    or
-    exists(LocalTypeAccess local | local = this |
-      not exists(local.getLocalTypeName()) and // Without a local type name, the type is looked up in the global scope.
-      globalName = local.getName()
-    )
-  }
-
-  override predicate hasQualifiedName(string moduleName, string exportedName) {
-    this.getTypeName().hasQualifiedName(moduleName, exportedName)
-    or
-    exists(ImportDeclaration imprt, ImportSpecifier spec |
-      moduleName = getImportName(imprt) and
-      spec = imprt.getASpecifier()
-    |
-      spec.getImportedName() = exportedName and
-      this = spec.getLocal().(TypeDecl).getLocalTypeName().getAnAccess()
-      or
-      (spec instanceof ImportNamespaceSpecifier or spec instanceof ImportDefaultSpecifier) and
-      this =
-        spec.getLocal().(LocalNamespaceDecl).getLocalNamespaceName().getAMemberAccess(exportedName)
-    )
-    or
-    exists(ImportEqualsDeclaration imprt |
-      moduleName = getImportName(imprt.getImportedEntity()) and
-      this =
-        imprt
-            .getIdentifier()
-            .(LocalNamespaceDecl)
-            .getLocalNamespaceName()
-            .getAMemberAccess(exportedName)
-    )
-  }
-
   override string getAPrimaryQlClass() { result = "TypeAccess" }
 }
 
-/**
- * Gets a suitable name for the library imported by `imprt`.
- *
- * For relative imports, this is the snapshot-relative path to the imported module.
- * For non-relative imports, it is the import path itself.
- */
-private string getImportName(Import imprt) {
-  exists(string path | path = imprt.getImportedPathString() |
-    if path.regexpMatch("[./].*")
-    then result = imprt.getImportedModule().getFile().getRelativePath()
-    else result = path
-  )
-}
-
 /** An identifier that is used as part of a type, such as `Date`. */
 class LocalTypeAccess extends @local_type_access, TypeAccess, Identifier, LexicalAccess {
   override predicate isStringy() { this.getName() = "String" }
@@ -822,14 +770,6 @@ class GenericTypeExpr extends @generic_typeexpr, TypeExpr {
   /** Gets the number of type arguments. This is always at least one. */
   int getNumTypeArgument() { result = count(this.getATypeArgument()) }
 
-  override predicate hasQualifiedName(string globalName) {
-    this.getTypeAccess().hasQualifiedName(globalName)
-  }
-
-  override predicate hasQualifiedName(string moduleName, string exportedName) {
-    this.getTypeAccess().hasQualifiedName(moduleName, exportedName)
-  }
-
   override string getAPrimaryQlClass() { result = "GenericTypeExpr" }
 }
 
diff --git a/javascript/ql/lib/semmle/javascript/Variables.qll b/javascript/ql/lib/semmle/javascript/Variables.qll
index 1eeb735124b..2f9905f86e1 100644
--- a/javascript/ql/lib/semmle/javascript/Variables.qll
+++ b/javascript/ql/lib/semmle/javascript/Variables.qll
@@ -27,6 +27,12 @@ class Scope extends @scope {
     result = this.getAVariable() and
     result.getName() = name
   }
+
+  /** Gets the local type name with the given name declared in this scope. */
+  LocalTypeName getLocalTypeName(string name) {
+    result.getScope() = this and
+    result.getName() = name
+  }
 }
 
 /**
@@ -128,8 +134,26 @@ class Variable extends @variable, LexicalName {
   /** Gets the scope this variable is declared in. */
   override Scope getScope() { variables(this, _, result) }
 
+  /**
+   * Holds if this variable is declared in the top-level of a module using a `declare` statement.
+   *
+   * For example:
+   * ```js
+   * declare var $: any;
+   * ```
+   *
+   * Such variables are generally treated as a global variables, except for type-checking related purposes.
+   */
+  pragma[nomagic]
+  predicate isTopLevelWithAmbientDeclaration() {
+    this.getScope() instanceof ModuleScope and
+    forex(VarDecl decl | decl = this.getADeclaration() | decl.isAmbient())
+  }
+
   /** Holds if this is a global variable. */
-  predicate isGlobal() { this.getScope() instanceof GlobalScope }
+  predicate isGlobal() {
+    this.getScope() instanceof GlobalScope or this.isTopLevelWithAmbientDeclaration()
+  }
 
   /**
    * Holds if this is a variable exported from a TypeScript namespace.
diff --git a/javascript/ql/lib/semmle/javascript/ViewComponentInput.qll b/javascript/ql/lib/semmle/javascript/ViewComponentInput.qll
index bc80826de5c..7ab04ad5bd2 100644
--- a/javascript/ql/lib/semmle/javascript/ViewComponentInput.qll
+++ b/javascript/ql/lib/semmle/javascript/ViewComponentInput.qll
@@ -3,6 +3,7 @@
  */
 
 private import javascript
+private import semmle.javascript.internal.TypeResolution
 
 /**
  * An input to a view component, such as React props.
@@ -14,34 +15,11 @@ abstract class ViewComponentInput extends DataFlow::Node {
 
 private class ViewComponentInputAsThreatModelSource extends ThreatModelSource::Range instanceof ViewComponentInput
 {
-  ViewComponentInputAsThreatModelSource() { not isSafeType(this.asExpr().getType()) }
+  ViewComponentInputAsThreatModelSource() {
+    not TypeResolution::valueHasSanitizingPrimitiveType(this.asExpr())
+  }
 
   final override string getThreatModel() { result = "view-component-input" }
 
   final override string getSourceType() { result = ViewComponentInput.super.getSourceType() }
 }
-
-private predicate isSafeType(Type t) {
-  t instanceof NumberLikeType
-  or
-  t instanceof BooleanLikeType
-  or
-  t instanceof UndefinedType
-  or
-  t instanceof NullType
-  or
-  t instanceof VoidType
-  or
-  hasSafeTypes(t, t.(UnionType).getNumElementType())
-  or
-  isSafeType(t.(IntersectionType).getAnElementType())
-}
-
-/** Hold if the first `n` components of `t` are safe types. */
-private predicate hasSafeTypes(UnionType t, int n) {
-  isSafeType(t.getElementType(0)) and
-  n = 1
-  or
-  isSafeType(t.getElementType(n - 1)) and
-  hasSafeTypes(t, n - 1)
-}
diff --git a/javascript/ql/lib/semmle/javascript/dataflow/DataFlow.qll b/javascript/ql/lib/semmle/javascript/dataflow/DataFlow.qll
index 46801bd1ad7..df3d0d5ff8b 100644
--- a/javascript/ql/lib/semmle/javascript/dataflow/DataFlow.qll
+++ b/javascript/ql/lib/semmle/javascript/dataflow/DataFlow.qll
@@ -27,6 +27,9 @@ private import internal.PreCallGraphStep
 private import semmle.javascript.internal.CachedStages
 private import semmle.javascript.dataflow.internal.DataFlowPrivate as Private
 private import semmle.javascript.dataflow.internal.VariableOrThis
+private import semmle.javascript.internal.NameResolution
+private import semmle.javascript.internal.UnderlyingTypes
+private import semmle.javascript.internal.TypeResolution
 
 module DataFlow {
   /**
@@ -189,26 +192,6 @@ module DataFlow {
       FlowSteps::identityFunctionStep(result, this)
     }
 
-    /**
-     * Gets the static type of this node as determined by the TypeScript type system.
-     */
-    private Type getType() {
-      exists(AST::ValueNode node |
-        this = TValueNode(node) and
-        ast_node_type(node, result)
-      )
-      or
-      exists(BindingPattern pattern |
-        this = lvalueNode(pattern) and
-        ast_node_type(pattern, result)
-      )
-      or
-      exists(MethodDefinition def |
-        this = TThisNode(def.getInit()) and
-        ast_node_type(def.getDeclaringClass(), result)
-      )
-    }
-
     /**
      * Gets the type annotation describing the type of this node,
      * provided that a static type could not be found.
@@ -229,6 +212,15 @@ module DataFlow {
       )
     }
 
+    private NameResolution::Node getNameResolutionNode() {
+      this = valueNode(result)
+      or
+      exists(PropertyPattern pattern |
+        result = pattern.getValuePattern() and
+        this = TPropNode(pattern)
+      )
+    }
+
     /**
      * Holds if this node is annotated with the given named type,
      * or is declared as a subtype thereof, or is a union or intersection containing such a type.
@@ -236,9 +228,10 @@ module DataFlow {
     cached
     predicate hasUnderlyingType(string globalName) {
       Stages::TypeTracking::ref() and
-      this.getType().hasUnderlyingType(globalName)
-      or
-      this.getFallbackTypeAnnotation().getAnUnderlyingType().hasQualifiedName(globalName)
+      exists(NameResolution::Node type |
+        TypeResolution::valueHasType(this.getNameResolutionNode(), type) and
+        UnderlyingTypes::nodeHasUnderlyingType(type, globalName)
+      )
     }
 
     /**
@@ -248,9 +241,11 @@ module DataFlow {
     cached
     predicate hasUnderlyingType(string moduleName, string typeName) {
       Stages::TypeTracking::ref() and
-      this.getType().hasUnderlyingType(moduleName, typeName)
-      or
-      this.getFallbackTypeAnnotation().getAnUnderlyingType().hasQualifiedName(moduleName, typeName)
+      moduleName != "global" and
+      exists(NameResolution::Node type |
+        TypeResolution::valueHasType(this.getNameResolutionNode(), type) and
+        UnderlyingTypes::nodeHasUnderlyingType(type, moduleName, typeName)
+      )
     }
 
     /**
diff --git a/javascript/ql/lib/semmle/javascript/dataflow/Sources.qll b/javascript/ql/lib/semmle/javascript/dataflow/Sources.qll
index 06729815e9a..f861488a046 100644
--- a/javascript/ql/lib/semmle/javascript/dataflow/Sources.qll
+++ b/javascript/ql/lib/semmle/javascript/dataflow/Sources.qll
@@ -333,7 +333,14 @@ module SourceNode {
         astNode instanceof TaggedTemplateExpr or
         astNode instanceof Templating::PipeRefExpr or
         astNode instanceof Templating::TemplateVarRefExpr or
-        astNode instanceof StringLiteral
+        astNode instanceof StringLiteral or
+        astNode instanceof TypeAssertion or
+        astNode instanceof SatisfiesExpr
+      )
+      or
+      exists(VariableDeclarator decl |
+        exists(decl.getTypeAnnotation()) and
+        this = DataFlow::valueNode(decl.getBindingPattern())
       )
       or
       DataFlow::parameterNode(this, _)
diff --git a/javascript/ql/lib/semmle/javascript/dataflow/internal/Contents.qll b/javascript/ql/lib/semmle/javascript/dataflow/internal/Contents.qll
index 5cf5bf1e48e..a5af2737c18 100644
--- a/javascript/ql/lib/semmle/javascript/dataflow/internal/Contents.qll
+++ b/javascript/ql/lib/semmle/javascript/dataflow/internal/Contents.qll
@@ -179,6 +179,9 @@ module Public {
     /** Holds if this represents values stored at an unknown array index. */
     predicate isUnknownArrayElement() { this = MkArrayElementUnknown() }
 
+    /** Holds if this represents the value of a resolved promise. */
+    predicate isPromiseValue() { this = MkPromiseValue() }
+
     /** Holds if this represents values stored in a `Map` at an unknown key. */
     predicate isMapValueWithUnknownKey() { this = MkMapValueWithUnknownKey() }
 
@@ -266,6 +269,11 @@ module Public {
       or
       this = ContentSet::anyCapturedContent() and
       result instanceof Private::MkCapturedContent
+      or
+      // Although data flow will never use the special `Awaited` ContentSet in a read or store step,
+      // it may appear in type-tracking and type resolution, and here it helps to treat is as `Awaited[value]`.
+      this = MkAwaited() and
+      result = MkPromiseValue()
     }
 
     /** Gets the singleton content to be accessed. */
diff --git a/javascript/ql/lib/semmle/javascript/frameworks/Nest.qll b/javascript/ql/lib/semmle/javascript/frameworks/Nest.qll
index dd6e1a7d915..d6bcb9ddd40 100644
--- a/javascript/ql/lib/semmle/javascript/frameworks/Nest.qll
+++ b/javascript/ql/lib/semmle/javascript/frameworks/Nest.qll
@@ -5,6 +5,8 @@
 import javascript
 private import semmle.javascript.security.dataflow.ServerSideUrlRedirectCustomizations
 private import semmle.javascript.dataflow.internal.PreCallGraphStep
+private import semmle.javascript.internal.NameResolution
+private import semmle.javascript.internal.TypeResolution
 
 /**
  * Provides classes and predicates for reasoning about [Nest](https://nestjs.com/).
@@ -133,7 +135,9 @@ module NestJS {
       hasSanitizingPipe(this, false)
       or
       hasSanitizingPipe(this, true) and
-      isSanitizingType(this.getParameter().getType().unfold())
+      // Note: we could consider types with class-validator decorators to be sanitized here, but instead we consider the root
+      // object to be tainted, but omit taint steps for the individual properties names that have sanitizing decorators. See ClassValidator.qll.
+      TypeResolution::isSanitizingPrimitiveType(this.getParameter().getTypeAnnotation())
     }
   }
 
@@ -209,19 +213,6 @@ module NestJS {
     dependsOnType = true
   }
 
-  /**
-   * Holds if a parameter of type `t` is considered sanitized, provided it has been checked by `ValidationPipe`
-   * (which relies on metadata emitted by the TypeScript compiler).
-   */
-  private predicate isSanitizingType(Type t) {
-    t instanceof NumberType
-    or
-    t instanceof BooleanType
-    //
-    // Note: we could consider types with class-validator decorators to be sanitized here, but instead we consider the root
-    // object to be tainted, but omit taint steps for the individual properties names that have sanitizing decorators. See ClassValidator.qll.
-  }
-
   /**
    * A user-defined pipe class, for example:
    * ```js
@@ -237,7 +228,7 @@ module NestJS {
     CustomPipeClass() {
       exists(ClassDefinition cls |
         this = cls.flow() and
-        cls.getASuperInterface().hasQualifiedName("@nestjs/common", "PipeTransform")
+        cls.getASuperInterface().hasUnderlyingType("@nestjs/common", "PipeTransform")
       )
     }
 
@@ -327,14 +318,6 @@ module NestJS {
     }
   }
 
-  private predicate isStringType(Type type) {
-    type instanceof StringType
-    or
-    type instanceof AnyType
-    or
-    isStringType(type.(PromiseType).getElementType().unfold())
-  }
-
   /**
    * A return value from a route handler, seen as an argument to `res.send()`.
    *
@@ -353,10 +336,10 @@ module NestJS {
     ReturnValueAsResponseSend() {
       handler.isReturnValueReflected() and
       this = handler.getAReturn() and
-      // Only returned strings are sinks
-      not exists(Type type |
-        type = this.asExpr().getType() and
-        not isStringType(type.unfold())
+      // Only returned strings are sinks. If we can find a type for the return value, it must be string-like.
+      not exists(NameResolution::Node type |
+        TypeResolution::valueHasType(this.asExpr(), type) and
+        not TypeResolution::hasUnderlyingStringOrAnyType(type)
       )
     }
 
diff --git a/javascript/ql/lib/semmle/javascript/frameworks/data/internal/ApiGraphModelsSpecific.qll b/javascript/ql/lib/semmle/javascript/frameworks/data/internal/ApiGraphModelsSpecific.qll
index c06490b8436..5e9846e9ad5 100644
--- a/javascript/ql/lib/semmle/javascript/frameworks/data/internal/ApiGraphModelsSpecific.qll
+++ b/javascript/ql/lib/semmle/javascript/frameworks/data/internal/ApiGraphModelsSpecific.qll
@@ -60,9 +60,7 @@ predicate isPackageUsed(string package) {
   or
   package = any(JS::Import imp).getImportedPathString()
   or
-  any(JS::TypeName t).hasQualifiedName(package, _)
-  or
-  any(JS::TypeAnnotation t).hasQualifiedName(package, _)
+  any(JS::TypeAnnotation t).hasUnderlyingType(package, _)
   or
   exists(JS::PackageJson json | json.getPackageName() = package)
 }
@@ -138,7 +136,7 @@ API::Node getExtraNodeFromType(string type) {
     parseRelevantTypeString(type, package, qualifiedName)
   |
     qualifiedName = "" and
-    result = [API::moduleImport(package), API::moduleExport(package)]
+    result = [API::Internal::getAModuleImportRaw(package), API::moduleExport(package)]
     or
     // Access instance of a type based on type annotations
     result = API::Internal::getANodeOfTypeRaw(package, qualifiedName)
diff --git a/javascript/ql/lib/semmle/javascript/frameworks/jQuery.qll b/javascript/ql/lib/semmle/javascript/frameworks/jQuery.qll
index 4fad4ae1b05..70beadbfa57 100644
--- a/javascript/ql/lib/semmle/javascript/frameworks/jQuery.qll
+++ b/javascript/ql/lib/semmle/javascript/frameworks/jQuery.qll
@@ -60,11 +60,7 @@ private predicate neverReturnsJQuery(string name) {
     decl.getBaseName() = "jQuery" and
     decl.getName() = name
   |
-    not decl.getDocumentation()
-        .getATagByTitle("return")
-        .getType()
-        .getAnUnderlyingType()
-        .hasQualifiedName("jQuery")
+    not decl.getDocumentation().getATagByTitle("return").getType().hasUnderlyingType("jQuery")
   )
 }
 
@@ -414,6 +410,8 @@ module JQuery {
         this = DataFlow::moduleImport(["jquery", "zepto", "cash-dom"])
         or
         this.hasUnderlyingType("JQueryStatic")
+        or
+        this.hasUnderlyingType("jquery", "")
       }
     }
   }
diff --git a/javascript/ql/lib/semmle/javascript/internal/NameResolution.qll b/javascript/ql/lib/semmle/javascript/internal/NameResolution.qll
new file mode 100644
index 00000000000..96e72108e2e
--- /dev/null
+++ b/javascript/ql/lib/semmle/javascript/internal/NameResolution.qll
@@ -0,0 +1,512 @@
+/**
+ * Provides name resolution and propagates type information.
+ */
+
+private import javascript
+
+/**
+ * Provides name resolution and propagates type information.
+ */
+module NameResolution {
+  private class NodeBase =
+    @expr or @typeexpr or @lexical_name or @toplevel or @function_decl_stmt or @class_decl_stmt or
+        @namespace_declaration or @enum_declaration or @interface_declaration or
+        @type_alias_declaration or @jsdoc_type_expr;
+
+  /**
+   * A node in a graph which we use to perform name and type resolution.
+   */
+  class Node extends NodeBase {
+    string toString() {
+      result = this.(AstNode).toString()
+      or
+      result = this.(LexicalName).toString()
+      or
+      result = this.(JSDocTypeExpr).toString()
+    }
+
+    Location getLocation() {
+      result = this.(AstNode).getLocation()
+      or
+      result = this.(LocalVariableLike).getLocation()
+      or
+      result = this.(JSDocTypeExpr).getLocation()
+    }
+  }
+
+  private signature predicate nodeSig(Node node);
+
+  /**
+   * A module top-level, or a `module {}` or `enum {}` statement.
+   */
+  private class ModuleLike extends AstNode {
+    ModuleLike() {
+      this instanceof Module
+      or
+      this instanceof NamespaceDefinition // `module {}` or `enum {}` statement
+    }
+  }
+
+  /**
+   * A local variable, or a top-level variable that acts as a global variable due to an ambient declaration.
+   */
+  class LocalVariableLike extends Variable {
+    LocalVariableLike() { this.isLocal() or this.isTopLevelWithAmbientDeclaration() }
+
+    Location getLocation() {
+      result =
+        min(Location loc |
+          loc = this.getADeclaration().getLocation()
+        |
+          loc order by loc.getStartLine(), loc.getStartColumn()
+        )
+    }
+  }
+
+  /**
+   * Holds if values/namespaces/types in `node1` can flow to values/namespaces/types in `node2`.
+   *
+   * May also include some type-specific steps in cases where this is harmless when tracking values.
+   */
+  private predicate commonStep(Node node1, Node node2) {
+    // Import paths are part of the graph and has an incoming edge from the imported module, if found.
+    // This ensures we can also use the PathExpr as a source when working with external (unresolved) modules.
+    exists(Import imprt |
+      node1 = imprt.getImportedModule() and
+      node2 = imprt.getImportedPathExpr()
+    )
+    or
+    exists(ImportNamespaceSpecifier spec |
+      node1 = spec.getImportDeclaration().getImportedPathExpr() and
+      node2 = spec.getLocal()
+    )
+    or
+    exists(ExportNamespaceSpecifier spec |
+      node1 = spec.getExportDeclaration().(ReExportDeclaration).getImportedPath() and
+      node2 = spec
+    )
+    or
+    exists(ExportAssignDeclaration assign |
+      node1 = assign.getExpression() and
+      node2 = assign.getContainer()
+    )
+    or
+    exists(ImportEqualsDeclaration imprt |
+      node1 = imprt.getImportedEntity() and
+      node2 = imprt.getIdentifier()
+    )
+    or
+    exists(ExternalModuleReference ref |
+      node1 = ref.getImportedPathExpr() and
+      node2 = ref
+    )
+    or
+    exists(ImportTypeExpr imprt |
+      node1 = imprt.getPathExpr() and // TODO: ImportTypeExpr does not seem to be resolved to a Module
+      node2 = imprt
+    )
+    or
+    exists(ClassOrInterface cls |
+      node1 = cls and
+      node2 = cls.getIdentifier()
+    )
+    or
+    exists(NamespaceDefinition def |
+      node1 = def and
+      node2 = def.getIdentifier()
+    )
+    or
+    exists(Function fun |
+      node1 = fun and
+      node2 = fun.getIdentifier()
+    )
+    or
+    exists(EnumMember def |
+      node1 = def.getInitializer() and
+      node2 = def.getIdentifier()
+    )
+    or
+    exists(TypeAliasDeclaration alias |
+      node1 = alias.getDefinition() and
+      node2 = alias.getIdentifier()
+    )
+    or
+    exists(VariableDeclarator decl |
+      node1 = decl.getInit() and
+      node2 = decl.getBindingPattern()
+    )
+    or
+    exists(ParenthesizedTypeExpr type |
+      node1 = type.getElementType() and
+      node2 = type
+    )
+    or
+    exists(ParenthesisExpr expr |
+      node1 = expr.getExpression() and
+      node2 = expr
+    )
+    or
+    exists(NonNullAssertion assertion |
+      // For the time being we don't use this for nullness analysis, so just
+      // propagate through these assertions.
+      node1 = assertion.getExpression() and
+      node2 = assertion
+    )
+    or
+    exists(FunctionTypeExpr fun |
+      node1 = fun.getFunction() and
+      node2 = fun
+    )
+    or
+    exists(TypeofTypeExpr type |
+      node1 = type.getExpressionName() and
+      node2 = type
+    )
+    or
+    exists(Closure::RequireCallExpr req |
+      node1.(Closure::ClosureModule).getClosureNamespace() = req.getClosureNamespace() and
+      node2 = req
+    )
+    or
+    exists(Closure::ClosureModule mod |
+      node1 = mod.getExportsVariable() and
+      node2 = mod
+    )
+    or
+    exists(ImmediatelyInvokedFunctionExpr fun, int i |
+      node1 = fun.getArgument(i) and
+      node2 = fun.getParameter(i)
+    )
+  }
+
+  /**
+   * Holds if there is a read from `node1` to `node2` that accesses the member `name`.
+   */
+  predicate readStep(Node node1, string name, Node node2) {
+    exists(QualifiedTypeAccess access |
+      node1 = access.getQualifier() and
+      name = access.getIdentifier().getName() and
+      node2 = access
+    )
+    or
+    exists(QualifiedNamespaceAccess access |
+      node1 = access.getQualifier() and
+      name = access.getIdentifier().getName() and
+      node2 = access
+    )
+    or
+    exists(QualifiedVarTypeAccess access |
+      node1 = access.getQualifier() and
+      name = access.getIdentifier().getName() and
+      node2 = access
+    )
+    or
+    exists(PropAccess access |
+      node1 = access.getBase() and
+      name = access.getPropertyName() and
+      node2 = access
+    )
+    or
+    exists(ObjectPattern pattern |
+      node1 = pattern and
+      node2 = pattern.getPropertyPatternByName(name).getValuePattern()
+    )
+    or
+    exists(ImportSpecifier spec |
+      node1 = spec.getImportDeclaration().getImportedPathExpr() and
+      name = spec.getImportedName() and
+      node2 = spec.getLocal()
+    )
+    or
+    exists(SelectiveReExportDeclaration exprt, ExportSpecifier spec |
+      spec = exprt.getASpecifier() and
+      node1 = exprt.getImportedPath() and
+      name = spec.getLocalName() and
+      node2 = spec.getLocal()
+    )
+    or
+    exists(JSDocQualifiedTypeAccess expr |
+      node1 = expr.getBase() and
+      name = expr.getName() and
+      node2 = expr
+    )
+  }
+
+  private signature module TypeResolutionInputSig {
+    /**
+     * Holds if flow is permitted through the given variable.
+     */
+    predicate isRelevantVariable(LexicalName var);
+  }
+
+  /**
+   * A local variable with exactly one definition, not counting implicit initialization.
+   */
+  private class EffectivelyConstantVariable extends LocalVariableLike {
+    EffectivelyConstantVariable() {
+      count(SsaExplicitDefinition ssa | ssa.getSourceVariable() = this) <= 1 // count may be zero if ambient
+    }
+  }
+
+  /** Configuration for propagating values and namespaces */
+  private module ValueConfig implements TypeResolutionInputSig {
+    predicate isRelevantVariable(LexicalName var) {
+      var instanceof EffectivelyConstantVariable
+      or
+      // We merge the namespace and value declaration spaces as it seems there is
+      // no need to distinguish them in practice.
+      var instanceof LocalNamespaceName
+    }
+  }
+
+  /**
+   * Associates information about values, such as references to a class, module, or namespace.
+   */
+  module ValueFlow = FlowImpl<ValueConfig>;
+
+  private module TypeConfig implements TypeResolutionInputSig {
+    predicate isRelevantVariable(LexicalName var) { var instanceof LocalTypeName }
+  }
+
+  /**
+   * Associates nodes with information about types.
+   */
+  module TypeFlow = FlowImpl<TypeConfig>;
+
+  /**
+   * Generates a directed graph for tracking type names or value names back toward their definition.
+   * The ultimate definition might not be in the database, but the graph lets us track as far as we can.
+   *
+   * The module parameter determines whether types or values should be tracked.
+   *
+   * The example below illustrates the need for two separate instantiations of this module.
+   * When tracking through the nodes corresponding to `X`, we need to remember whether a type or value was tracked.
+   *
+   * ```ts
+   * // lib.ts
+   * class C1 {}
+   * class C2 {}
+   *
+   * const X = C1;
+   * type X = C2;
+   *
+   * export { X }
+   *
+   * // use.ts
+   * import { X } from "./lib"
+   *
+   * var x1 = X // should refer to C1
+   * var x2: X; // should refer to C2
+   * ```
+   */
+  private module FlowImpl<TypeResolutionInputSig S> {
+    /**
+     * Gets the exported member of `mod` named `name`.
+     */
+    Node getModuleExport(ModuleLike mod, string name) {
+      exists(ExportDeclaration exprt |
+        mod = exprt.getContainer() and
+        exprt.exportsAs(result, name) and
+        S::isRelevantVariable(result)
+      )
+      or
+      exists(ExportNamespaceSpecifier spec |
+        result = spec and
+        mod = spec.getContainer() and
+        name = spec.getExportedName()
+      )
+      or
+      exists(SelectiveReExportDeclaration exprt, ExportSpecifier spec |
+        // `export { A as B } from 'blah'`
+        // This is not covered by `exportsAs` above because neither A or B is a LexicalName
+        // (both are property names) so it doesn't fit the interface of `exportsAs`.
+        spec = exprt.getASpecifier() and
+        mod = exprt.getContainer() and
+        name = spec.getExportedName() and
+        result = spec.getLocal()
+      )
+      or
+      exists(EnumDeclaration enum |
+        mod = enum and
+        result = enum.getMemberByName(name).getIdentifier()
+      )
+      or
+      storeToVariable(result, name, mod.(Closure::ClosureModule).getExportsVariable())
+    }
+
+    /**
+     * Holds if `value` is stored in `target.prop`. Only needs to recognise assignments
+     * that are also recognised by JSDoc tooling such as the Closure compiler.
+     */
+    private predicate storeToVariable(Expr value, string prop, LocalVariableLike target) {
+      exists(AssignExpr assign |
+        // target.name = value
+        assign.getLhs().(PropAccess).accesses(target.getAnAccess(), prop) and
+        value = assign.getRhs()
+      )
+      or
+      // target = { name: value }
+      value = target.getAnAssignedExpr().(ObjectExpr).getPropertyByName(prop).getInit()
+    }
+
+    /** Steps that only apply for this configuration. */
+    private predicate specificStep(Node node1, Node node2) {
+      exists(LexicalName var | S::isRelevantVariable(var) |
+        node1.(LexicalDecl).getALexicalName() = var and
+        node2 = var
+        or
+        node1 = var and
+        node2.(LexicalAccess).getALexicalName() = var
+        or
+        node1 = var and
+        node2.(JSDocLocalTypeAccess).getALexicalName() = var
+      )
+      or
+      exists(Node base, string name, ModuleLike mod |
+        readStep(base, name, node2) and
+        base = trackModule(mod) and
+        node1 = getModuleExport(mod, name)
+      )
+    }
+
+    /**
+     * Holds if data should propagate from `node1` to `node2`.
+     */
+    pragma[inline]
+    predicate step(Node node1, Node node2) {
+      commonStep(node1, node2)
+      or
+      specificStep(node1, node2)
+    }
+
+    /** Helps track flow from a particular set of source nodes. */
+    module Track<nodeSig/1 isSource> {
+      /** Gets the set of nodes reachable from `source`. */
+      Node track(Node source) {
+        isSource(source) and
+        result = source
+        or
+        step(track(source), result)
+      }
+    }
+
+    signature class AstNodeSig extends AstNode;
+
+    /** Helps track flow from a particular set of source nodes. */
+    module TrackNode<AstNodeSig Source> {
+      /** Gets the set of nodes reachable from `source`. */
+      Node track(Source source) {
+        result = source
+        or
+        step(track(source), result)
+      }
+    }
+  }
+
+  /**
+   * Gets a node to which the given module flows.
+   */
+  predicate trackModule = ValueFlow::TrackNode<ModuleLike>::track/1;
+
+  /**
+   * Holds if `moduleName` appears to start with a package name, as opposed to a relative file import.
+   */
+  bindingset[moduleName]
+  private predicate isExternalModuleName(string moduleName) {
+    not moduleName.regexpMatch("^(\\.|/).*")
+  }
+
+  bindingset[name]
+  private string normalizeModuleName(string name) {
+    result =
+      name.regexpReplaceAll("^node:", "")
+          .regexpReplaceAll("\\.[cm]?[jt]sx?$", "")
+          .regexpReplaceAll("/(index)?$", "")
+  }
+
+  /** Appends a name onto a qualified name */
+  bindingset[a, b]
+  string append(string a, string b) {
+    if b = "default"
+    then result = a
+    else (
+      (if a = "" or b = "" then result = a + b else result = a + "." + b) and
+      result.length() < 100
+    )
+  }
+
+  private predicate needsQualifiedName(Node node) {
+    node = any(JSDocLocalTypeAccess t).getALexicalName().(Variable)
+    or
+    exists(Node prev | needsQualifiedName(prev) |
+      ValueFlow::step(node, prev)
+      or
+      readStep(node, _, prev)
+    )
+  }
+
+  /**
+   * Holds if `node` is a reference to the given module, or a qualified name rooted in that module.
+   *
+   * If `qualifiedName` is empty, `node` refers to the module itself.
+   *
+   * If `mod` is the string `"global"`, `node` refers to a global access path.
+   *
+   * Unlike `trackModule`, this is intended to track uses of external packages.
+   */
+  predicate nodeRefersToModule(Node node, string mod, string qualifiedName) {
+    exists(Expr path |
+      path = any(Import imprt).getImportedPathExpr() or
+      path = any(ReExportDeclaration e).getImportedPath()
+    |
+      node = path and
+      mod = normalizeModuleName(path.getStringValue()) and
+      isExternalModuleName(mod) and
+      qualifiedName = ""
+    )
+    or
+    mod = "global" and
+    exists(LocalNamespaceAccess access |
+      node = access and
+      not exists(access.getLocalNamespaceName()) and
+      access.getName() = qualifiedName
+    )
+    or
+    mod = "global" and
+    exists(JSDocLocalTypeAccess access |
+      node = access and
+      not exists(access.getALexicalName()) and
+      access.getName() = qualifiedName
+    )
+    or
+    mod = "global" and
+    exists(GlobalVarAccess access |
+      node = access and
+      needsQualifiedName(access) and // restrict number of qualified names we generate
+      access.getName() = qualifiedName
+    )
+    or
+    mod = "global" and
+    qualifiedName = node.(Closure::RequireCallExpr).getClosureNamespace()
+    or
+    // Additionally track through bulk re-exports (`export * from 'mod`).
+    // These are normally handled by 'exportAs' which supports various shadowing rules,
+    // but has no effect when the ultimate re-exported module is not resolved to a Module.
+    // We propagate external module refs through bulk re-exports and ignore shadowing rules.
+    exists(BulkReExportDeclaration reExport |
+      nodeRefersToModule(reExport.getImportedPath(), mod, qualifiedName) and
+      node = reExport.getContainer()
+    )
+    or
+    exists(Node mid |
+      nodeRefersToModule(mid, mod, qualifiedName) and
+      ValueFlow::step(mid, node)
+    )
+    or
+    exists(Node mid, string prefix, string step |
+      nodeRefersToModule(mid, mod, prefix) and
+      readStep(mid, step, node) and
+      qualifiedName = append(prefix, step)
+    )
+  }
+}
diff --git a/javascript/ql/lib/semmle/javascript/internal/TypeResolution.qll b/javascript/ql/lib/semmle/javascript/internal/TypeResolution.qll
new file mode 100644
index 00000000000..ddf5757a38c
--- /dev/null
+++ b/javascript/ql/lib/semmle/javascript/internal/TypeResolution.qll
@@ -0,0 +1,422 @@
+private import javascript
+private import semmle.javascript.internal.NameResolution::NameResolution
+private import semmle.javascript.internal.UnderlyingTypes
+private import semmle.javascript.dataflow.internal.sharedlib.SummaryTypeTracker as SummaryTypeTracker
+
+module TypeResolution {
+  predicate trackClassValue = ValueFlow::TrackNode<ClassDefinition>::track/1;
+
+  predicate trackType = TypeFlow::TrackNode<TypeDefinition>::track/1;
+
+  /**
+   * Gets a node that has `fun` as an underlying type.
+   *
+   * We track through underlying types as an approximate way to handle calls to a type
+   * that is a union/intersection involving functions.
+   */
+  Node trackUnderlyingFunctionType(Function fun) {
+    result = fun
+    or
+    exists(Node mid | mid = trackUnderlyingFunctionType(fun) |
+      TypeFlow::step(mid, result)
+      or
+      UnderlyingTypes::underlyingTypeStep(mid, result)
+    )
+  }
+
+  predicate trackFunctionValue = ValueFlow::TrackNode<Function>::track/1;
+
+  /**
+   * Gets the representative for the type containing the given member.
+   *
+   * For non-static members this is simply the enclosing type declaration.
+   *
+   * For static members we use the class's `Variable` as representative for the type of the class object.
+   */
+  private Node getMemberBase(MemberDeclaration member) {
+    if member.isStatic()
+    then result = member.getDeclaringClass().getVariable()
+    else result = member.getDeclaringType()
+  }
+
+  /**
+   * Holds if `host` is a type with a `content` of type `memberType`, not counting inherited members.
+   */
+  private predicate typeOwnMember(Node host, DataFlow::Content content, Node memberType) {
+    exists(MemberDeclaration decl | host = getMemberBase(decl) |
+      exists(FieldDeclaration field |
+        decl = field and
+        content.asPropertyName() = field.getName() and
+        memberType = field.getTypeAnnotation()
+      )
+      or
+      exists(MethodDeclaration method |
+        decl = method and
+        content.asPropertyName() = method.getName()
+      |
+        not method instanceof AccessorMethodDeclaration and
+        memberType = method.getBody() // use the Function as representative for the function type
+        or
+        method instanceof GetterMethodDeclaration and
+        memberType = method.getBody().getReturnTypeAnnotation()
+      )
+      or
+      decl instanceof IndexSignature and
+      memberType = decl.(IndexSignature).getBody().getReturnTypeAnnotation() and
+      content.isUnknownArrayElement()
+    )
+    or
+    // Ad-hoc support for array types. We don't support generics in general currently, we just special-case arrays and promises.
+    content.isUnknownArrayElement() and
+    (
+      memberType = host.(ArrayTypeExpr).getElementType()
+      or
+      exists(GenericTypeExpr type |
+        host = type and
+        type.getTypeAccess().(LocalTypeAccess).getName() = ["Array", "ReadonlyArray"] and
+        memberType = type.getTypeArgument(0)
+      )
+      or
+      exists(JSDocAppliedTypeExpr type |
+        host = type and
+        type.getHead().(JSDocLocalTypeAccess).getName() = "Array" and
+        memberType = type.getArgument(0)
+      )
+    )
+    or
+    content.isPromiseValue() and
+    memberType = unwrapPromiseType(host)
+  }
+
+  /**
+   * Holds if `host` is a type with a `content` of type `memberType`, possible due to inheritance.
+   */
+  private predicate typeMember(Node host, DataFlow::Content content, Node memberType) {
+    typeOwnMember(host, content, memberType)
+    or
+    // Inherit members from base types
+    not typeOwnMember(host, content, _) and
+    exists(ClassOrInterface baseType | typeMember(baseType, content, memberType) |
+      host.(ClassDefinition).getSuperClass() = trackClassValue(baseType)
+      or
+      host.(ClassOrInterface).getASuperInterface() = trackType(baseType)
+    )
+  }
+
+  /**
+   * Holds `use` refers to `host`, and `host` has type members.
+   *
+   * Currently steps through unions and intersections, which acts as a basic
+   * approximation to the unions/intersection of objects.
+   */
+  private predicate typeMemberHostReaches(Node host, Node use) {
+    typeMember(host, _, _) and
+    use = host
+    or
+    exists(Node mid | typeMemberHostReaches(host, mid) |
+      TypeFlow::step(mid, use)
+      or
+      UnderlyingTypes::underlyingTypeStep(mid, use)
+    )
+  }
+
+  /**
+   * Holds if there is a read from from `object` to `member` that reads `contents`.
+   */
+  private predicate valueReadStep(Node object, DataFlow::ContentSet contents, Node member) {
+    member.(PropAccess).accesses(object, contents.asPropertyName())
+    or
+    object.(ObjectPattern).getPropertyPatternByName(contents.asPropertyName()).getValuePattern() =
+      member
+    or
+    member.(AwaitExpr).getOperand() = object and
+    contents = DataFlow::ContentSet::promiseValue()
+    or
+    SummaryTypeTracker::basicLoadStep(object.(AST::ValueNode).flow(),
+      member.(AST::ValueNode).flow(), contents)
+  }
+
+  predicate callTarget(InvokeExpr call, Function target) {
+    exists(ClassDefinition cls |
+      valueHasType(call.(NewExpr).getCallee(), trackClassValue(cls)) and
+      target = cls.getConstructor().getBody()
+    )
+    or
+    valueHasType(call.getCallee(), trackFunctionValue(target))
+    or
+    valueHasType(call.getCallee(), trackUnderlyingFunctionType(target)) and
+    (
+      call instanceof NewExpr and
+      target = any(ConstructorTypeExpr t).getFunction()
+      or
+      call instanceof CallExpr and
+      target = any(PlainFunctionTypeExpr t).getFunction()
+    )
+    or
+    exists(InterfaceDefinition interface, CallSignature sig |
+      valueHasType(call.getCallee(), trackType(interface)) and
+      sig = interface.getACallSignature() and
+      target = sig.getBody()
+    |
+      call instanceof NewExpr and
+      sig instanceof ConstructorCallSignature
+      or
+      call instanceof CallExpr and
+      sig instanceof FunctionCallSignature
+    )
+  }
+
+  private predicate functionReturnType(Function func, Node returnType) {
+    returnType = func.getReturnTypeAnnotation()
+    or
+    not exists(func.getReturnTypeAnnotation()) and
+    exists(Function functionType |
+      contextualType(func, trackUnderlyingFunctionType(functionType)) and
+      returnType = functionType.getReturnTypeAnnotation()
+    )
+  }
+
+  bindingset[name]
+  private predicate isPromiseTypeName(string name) {
+    name.regexpMatch(".?(Promise|Thenable)(Like)?")
+  }
+
+  private Node unwrapPromiseType(Node promiseType) {
+    exists(GenericTypeExpr type |
+      promiseType = type and
+      isPromiseTypeName(type.getTypeAccess().(LocalTypeAccess).getName()) and
+      result = type.getTypeArgument(0)
+    )
+    or
+    exists(JSDocAppliedTypeExpr type |
+      promiseType = type and
+      isPromiseTypeName(type.getHead().(JSDocLocalTypeAccess).getName()) and
+      result = type.getArgument(0)
+    )
+  }
+
+  predicate contextualType(Node value, Node type) {
+    exists(LocalVariableLike v |
+      type = v.getADeclaration().getTypeAnnotation() and
+      value = v.getAnAssignedExpr()
+    )
+    or
+    exists(InvokeExpr call, Function target, int i |
+      callTarget(call, target) and
+      value = call.getArgument(i) and
+      type = target.getParameter(i).getTypeAnnotation()
+    )
+    or
+    exists(Function lambda, Node returnType |
+      value = lambda.getAReturnedExpr() and
+      functionReturnType(lambda, returnType)
+    |
+      not lambda.isAsyncOrGenerator() and
+      type = returnType
+      or
+      lambda.isAsync() and
+      type = unwrapPromiseType(returnType)
+    )
+    or
+    exists(ObjectExpr object, Node objectType, Node host, string name |
+      contextualType(object, objectType) and
+      typeMemberHostReaches(host, objectType) and
+      typeMember(host, any(DataFlow::Content c | c.asPropertyName() = name), type) and
+      value = object.getPropertyByName(name).getInit()
+    )
+    or
+    exists(ArrayExpr array, Node arrayType, Node host |
+      contextualType(array, arrayType) and
+      typeMemberHostReaches(host, arrayType) and
+      typeMember(host, any(DataFlow::Content c | c.isUnknownArrayElement()), type) and
+      value = array.getAnElement()
+    )
+  }
+
+  /**
+   * Holds if `value` has the given `type`.
+   */
+  predicate valueHasType(Node value, Node type) {
+    value.(BindingPattern).getTypeAnnotation() = type
+    or
+    value.(TypeAssertion).getTypeAnnotation() = type
+    or
+    value.(SatisfiesExpr).getTypeAnnotation() = type
+    or
+    exists(VarDecl decl |
+      // ValueFlow::step is restricted to variables with at most one assignment. Allow the type annotation
+      // of a variable to propagate to its uses, even if the variable has multiple assignments.
+      type = decl.getTypeAnnotation() and
+      value = decl.getVariable().(LocalVariableLike).getAnAccess()
+    )
+    or
+    exists(MemberDeclaration member |
+      value.(ThisExpr).getBindingContainer() = member.getInit() and
+      type = getMemberBase(member)
+    )
+    or
+    exists(ClassDefinition cls |
+      value = cls and
+      type = cls.getVariable()
+    )
+    or
+    exists(FunctionDeclStmt fun |
+      value = fun and
+      type = fun.getVariable()
+    )
+    or
+    exists(Function target | callTarget(value, target) |
+      type = target.getReturnTypeAnnotation()
+      or
+      exists(ClassDefinition cls |
+        target = cls.getConstructor().getBody() and
+        type = cls
+      )
+    )
+    or
+    // Contextual typing for parameters
+    exists(Function lambda, Function functionType, int i |
+      contextualType(lambda, trackUnderlyingFunctionType(functionType))
+      or
+      exists(InterfaceDefinition interface |
+        contextualType(lambda, trackType(interface)) and
+        functionType = interface.getACallSignature().getBody()
+      )
+    |
+      value = lambda.getParameter(i) and
+      not exists(value.(Parameter).getTypeAnnotation()) and
+      type = functionType.getParameter(i).getTypeAnnotation()
+    )
+    or
+    exists(Node mid | valueHasType(mid, type) | ValueFlow::step(mid, value))
+    or
+    exists(Node mid, Node midType, DataFlow::ContentSet contents, Node host |
+      valueReadStep(mid, contents, value) and
+      valueHasType(mid, midType) and
+      typeMemberHostReaches(host, midType) and
+      typeMember(host, contents.getAReadContent(), type)
+    )
+  }
+
+  signature predicate nodeSig(Node node);
+
+  /**
+   * Tracks types that have a certain property, in the sense that:
+   * - an intersection type has the property if any member has the property
+   * - a union type has the property if all its members have the property
+   */
+  module TrackMustProp<nodeSig/1 directlyHasProperty> {
+    predicate hasProperty(Node node) {
+      directlyHasProperty(node)
+      or
+      exists(Node mid |
+        hasProperty(mid) and
+        TypeFlow::step(mid, node)
+      )
+      or
+      unionHasProp(node)
+      or
+      hasProperty(node.(IntersectionTypeExpr).getAnElementType())
+      or
+      exists(ConditionalTypeExpr cond |
+        node = cond and
+        hasProperty(cond.getTrueType()) and
+        hasProperty(cond.getFalseType())
+      )
+    }
+
+    private predicate unionHasProp(UnionTypeExpr node, int n) {
+      hasProperty(node.getElementType(0)) and n = 1
+      or
+      unionHasProp(node, n - 1) and
+      hasProperty(node.getElementType(n - 1))
+    }
+
+    private predicate unionHasProp(UnionTypeExpr node) {
+      unionHasProp(node, node.getNumElementType())
+    }
+  }
+
+  module ValueHasProperty<nodeSig/1 typeHasProperty> {
+    predicate valueHasProperty(Node value) {
+      exists(Node type |
+        valueHasType(value, type) and
+        typeHasProperty(type)
+      )
+    }
+  }
+
+  private predicate isSanitizingPrimitiveTypeBase(Node node) {
+    node.(TypeExpr).isNumbery()
+    or
+    node.(TypeExpr).isBooleany()
+    or
+    node.(TypeExpr).isNull()
+    or
+    node.(TypeExpr).isUndefined()
+    or
+    node.(TypeExpr).isVoid()
+    or
+    node.(TypeExpr).isNever()
+    or
+    node.(TypeExpr).isBigInt()
+    or
+    node.(TypeExpr).isSymbol()
+    or
+    node instanceof LiteralTypeExpr
+    or
+    node = any(EnumMember m).getIdentifier() // enum members are constant
+    or
+    node instanceof EnumDeclaration // enums are unions of constants
+  }
+
+  /**
+   * Holds if `node` refers to a type that is considered untaintable (if actually enforced at runtime).
+   *
+   * Specifically, the types `number`, `boolean`, `null`, `undefined`, `void`, `never`, as well as literal types (`"foo"`)
+   * and enums and enum members have this property.
+   */
+  predicate isSanitizingPrimitiveType =
+    TrackMustProp<isSanitizingPrimitiveTypeBase/1>::hasProperty/1;
+
+  /**
+   * Holds if `value` has a type that is considered untaintable (if actually enforced at runtime).
+   *
+   * See `isSanitizingPrimitiveType`.
+   */
+  predicate valueHasSanitizingPrimitiveType =
+    ValueHasProperty<isSanitizingPrimitiveType/1>::valueHasProperty/1;
+
+  private predicate isPromiseBase(Node node) { exists(unwrapPromiseType(node)) }
+
+  /**
+   * Holds if the given type is a Promise object. Does not hold for unions unless all parts of the union are promises.
+   */
+  predicate isPromiseType = TrackMustProp<isPromiseBase/1>::hasProperty/1;
+
+  /**
+   * Holds if the given value has a type that implied it is a Promise object. Does not hold for unions unless all parts of the union are promises.
+   */
+  predicate valueHasPromiseType = ValueHasProperty<isPromiseType/1>::valueHasProperty/1;
+
+  /**
+   * Holds if `type` contains `string` or `any`, possibly wrapped in a promise.
+   */
+  predicate hasUnderlyingStringOrAnyType(Node type) {
+    type.(TypeAnnotation).isStringy()
+    or
+    type.(TypeAnnotation).isAny()
+    or
+    type instanceof StringLiteralTypeExpr
+    or
+    type instanceof TemplateLiteralTypeExpr
+    or
+    exists(Node mid | hasUnderlyingStringOrAnyType(mid) |
+      TypeFlow::step(mid, type)
+      or
+      UnderlyingTypes::underlyingTypeStep(mid, type)
+      or
+      type = unwrapPromiseType(mid)
+    )
+  }
+}
diff --git a/javascript/ql/lib/semmle/javascript/internal/UnderlyingTypes.qll b/javascript/ql/lib/semmle/javascript/internal/UnderlyingTypes.qll
new file mode 100644
index 00000000000..8f6628278c4
--- /dev/null
+++ b/javascript/ql/lib/semmle/javascript/internal/UnderlyingTypes.qll
@@ -0,0 +1,128 @@
+/**
+ * Provides name resolution and propagates type information.
+ */
+
+private import javascript
+private import semmle.javascript.internal.NameResolution::NameResolution
+
+/**
+ * Provides name resolution and propagates type information.
+ */
+module UnderlyingTypes {
+  private predicate subtypeStep(Node node1, Node node2) {
+    exists(ClassOrInterface cls |
+      (
+        node1 = cls.getSuperClass() or
+        node1 = cls.getASuperInterface()
+      ) and
+      node2 = cls
+    )
+  }
+
+  predicate underlyingTypeStep(Node node1, Node node2) {
+    exists(UnionOrIntersectionTypeExpr type |
+      node1 = type.getAnElementType() and
+      node2 = type
+    )
+    or
+    exists(ReadonlyTypeExpr type |
+      node1 = type.getElementType() and
+      node2 = type
+    )
+    or
+    exists(OptionalTypeExpr type |
+      node1 = type.getElementType() and
+      node2 = type
+    )
+    or
+    exists(GenericTypeExpr type |
+      node1 = type.getTypeAccess() and
+      node2 = type
+    )
+    or
+    exists(ExpressionWithTypeArguments e |
+      node1 = e.getExpression() and
+      node2 = e
+    )
+    or
+    exists(JSDocUnionTypeExpr type |
+      node1 = type.getAnAlternative() and
+      node2 = type
+    )
+    or
+    exists(JSDocNonNullableTypeExpr type |
+      node1 = type.getTypeExpr() and
+      node2 = type
+    )
+    or
+    exists(JSDocNullableTypeExpr type |
+      node1 = type.getTypeExpr() and
+      node2 = type
+    )
+    or
+    exists(JSDocAppliedTypeExpr type |
+      node1 = type.getHead() and
+      node2 = type
+    )
+    or
+    exists(JSDocOptionalParameterTypeExpr type |
+      node1 = type.getUnderlyingType() and
+      node2 = type
+    )
+  }
+
+  predicate nodeHasUnderlyingType(Node node, string mod, string name) {
+    nodeRefersToModule(node, mod, name)
+    or
+    exists(JSDocLocalTypeAccess type |
+      node = type and
+      not exists(type.getALexicalName()) and
+      not type = any(JSDocQualifiedTypeAccess t).getBase() and
+      name = type.getName() and
+      mod = "global"
+    )
+    or
+    exists(LocalTypeAccess type |
+      node = type and
+      not exists(type.getLocalTypeName()) and
+      name = type.getName() and
+      mod = "global"
+    )
+    or
+    exists(Node mid | nodeHasUnderlyingType(mid, mod, name) |
+      TypeFlow::step(mid, node)
+      or
+      underlyingTypeStep(mid, node)
+      or
+      subtypeStep(mid, node)
+    )
+  }
+
+  pragma[nomagic]
+  predicate nodeHasUnderlyingType(Node node, string name) {
+    nodeHasUnderlyingType(node, "global", name)
+  }
+
+  predicate nodeHasUnderlyingClassType(Node node, DataFlow::ClassNode cls) {
+    node = cls.getAstNode()
+    or
+    exists(string name |
+      classHasGlobalName(cls, name) and
+      nodeHasUnderlyingType(node, name)
+    )
+    or
+    exists(Node mid | nodeHasUnderlyingClassType(mid, cls) |
+      TypeFlow::step(mid, node)
+      or
+      underlyingTypeStep(mid, node)
+      // Note: unlike for external types, we do not use subtype steps here.
+      // The caller is responsible for handling the class hierarchy.
+    )
+  }
+
+  pragma[nomagic]
+  private predicate classHasGlobalName(DataFlow::ClassNode cls, string name) {
+    cls.flowsTo(AccessPath::getAnAssignmentTo(name)) and
+    not cls.getTopLevel().isExterns() // don't propagate externs classes
+  }
+}
diff --git a/javascript/ql/src/Declarations/SuspiciousMethodNameDeclaration.qhelp b/javascript/ql/src/Declarations/SuspiciousMethodNameDeclaration.qhelp
index e59f290ae6d..652d8b544d0 100644
--- a/javascript/ql/src/Declarations/SuspiciousMethodNameDeclaration.qhelp
+++ b/javascript/ql/src/Declarations/SuspiciousMethodNameDeclaration.qhelp
@@ -4,50 +4,73 @@
 <qhelp>
 <overview>
 <p>
-In TypeScript the keywords <code>constructor</code> and <code>new</code> for 
-member declarations are used to declare constructors in classes and interfaces 
-respectively. 
-However, a member declaration with the name <code>new</code> in an interface 
-or <code>constructor</code> in a class, will declare an ordinary method named 
-<code>new</code> or <code>constructor</code> rather than a constructor.
-Similarly, the keyword <code>function</code> is used to declare functions in 
-some contexts. However, using the name <code>function</code> for a class 
-or interface member declaration declares a method named <code>function</code>.    
+In TypeScript, certain keywords have special meanings for member declarations, and misusing them can create confusion:
+</p>
+
+<ul>
+<li>In classes, use <code>constructor</code> rather than <code>new</code> to declare constructors. Using <code>new</code> within a class creates a method named "new" and not a constructor signature.</li>
+<li>In interfaces, use <code>new</code> rather than <code>constructor</code> to declare constructor signatures. Using <code>constructor</code> within an interface creates a method named "constructor" and not a constructor signature.</li>
+<li>Similarly, the keyword <code>function</code> is used to declare functions in some contexts. However, using the name <code>function</code> for a class or interface member declaration declares a method named "function".</li>
+</ul>
+
+<p>
+When these keywords are misused, TypeScript will interpret them as regular method names rather than their intended special syntax, leading to code that may not work as expected.
 </p>
 
 </overview>
 <recommendation>
 
 <p>
-Declare classes as classes and not as interfaces.
-Use the keyword <code>constructor</code> to declare constructors in a class,
-use the keyword <code>new</code> to declare constructors inside interfaces, 
-and don't use <code>function</code> when declaring a call signature in an 
-interface.
+Consider following these guidelines for clearer code:
 </p>
 
+<ul>
+<li>For classes, use <code>constructor</code> to declare constructors.</li>
+<li>For interfaces, use <code>new</code> to declare constructor signatures (call signatures that create new instances).</li>
+<li>Avoid accidentally creating methods named <code>function</code> by misusing the <code>function</code> keyword within class or interface declarations.</li>
+</ul>
+
 </recommendation>
 <example>
 
 <p>
-The below example declares an interface <code>Point</code> with 2 fields 
-and a method called <code>constructor</code>. The interface does not declare
-a class <code>Point</code> with a constructor, which was likely what the 
-developer meant to create.
+The following examples show common mistakes when using these keywords:
+</p>
+
+<p>
+This interface mistakenly uses <code>constructor</code>, which creates a method named "constructor" instead of a constructor signature:
 </p>
 <sample src="examples/SuspiciousMethodNameDeclaration.ts" />
 
 <p>
-The below example is a fixed version of the above, where the interface is 
-instead declared as a class, thereby describing the type the developer meant 
-in the first place.
+Use <code>new</code> for constructor signatures in interfaces:
 </p>
-
 <sample src="examples/SuspiciousMethodNameDeclarationFixed.ts" />
 
+<p>
+This class mistakenly uses <code>new</code>, which creates a method named "new" instead of a constructor:
+</p>
+<sample src="examples/SuspiciousMethodNameDeclarationClass.ts" />
+
+<p>
+Use <code>constructor</code> for constructors in classes:
+</p>
+<sample src="examples/SuspiciousMethodNameDeclarationClassFixed.ts" />
+
+<p>
+This interface uses <code>function</code> as a method name, which declares a method named "function" rather than declaring a function:
+</p>
+<sample src="examples/SuspiciousMethodNameDeclarationFunction.ts" />
+
+<p>
+Use a descriptive method name instead:
+</p>
+<sample src="examples/SuspiciousMethodNameDeclarationFunctionFixed.ts" />
+
 </example>
 <references>
 
+<li>TypeScript Handbook: <a href="https://www.typescriptlang.org/docs/handbook/2/classes.html#constructors">Classes - Constructors</a>.</li>
 <li>TypeScript specification: <a href="https://github.com/microsoft/TypeScript/blob/30cb20434a6b117e007a4959b2a7c16489f86069/doc/spec-ARCHIVED.md#3.8.9">Constructor Type Literals</a>.</li>
 <li>TypeScript specification: <a href="https://github.com/microsoft/TypeScript/blob/30cb20434a6b117e007a4959b2a7c16489f86069/doc/spec-ARCHIVED.md#8.3.1">Constructor Parameters</a>.</li>
 
diff --git a/javascript/ql/src/Declarations/SuspiciousMethodNameDeclaration.ql b/javascript/ql/src/Declarations/SuspiciousMethodNameDeclaration.ql
index c185e5c4d04..fafa234f5f7 100644
--- a/javascript/ql/src/Declarations/SuspiciousMethodNameDeclaration.ql
+++ b/javascript/ql/src/Declarations/SuspiciousMethodNameDeclaration.ql
@@ -6,7 +6,9 @@
  * @problem.severity warning
  * @id js/suspicious-method-name-declaration
  * @precision high
- * @tags correctness
+ * @tags quality
+ *       reliability
+ *       correctness
  *       typescript
  *       methods
  */
diff --git a/javascript/ql/src/Declarations/examples/SuspiciousMethodNameDeclaration.ts b/javascript/ql/src/Declarations/examples/SuspiciousMethodNameDeclaration.ts
index b7b925aa15a..6558267cef4 100644
--- a/javascript/ql/src/Declarations/examples/SuspiciousMethodNameDeclaration.ts
+++ b/javascript/ql/src/Declarations/examples/SuspiciousMethodNameDeclaration.ts
@@ -1,6 +1,6 @@
-declare class Point {
+// BAD: Using 'constructor' in an interface creates a method, not a constructor signature
+interface Point {
    x: number;
    y: number;
-   constructor(x : number, y: number);
+   constructor(x: number, y: number); // This is just a method named "constructor"
 }
-
diff --git a/javascript/ql/src/Declarations/examples/SuspiciousMethodNameDeclarationClass.ts b/javascript/ql/src/Declarations/examples/SuspiciousMethodNameDeclarationClass.ts
new file mode 100644
index 00000000000..2a078c8b468
--- /dev/null
+++ b/javascript/ql/src/Declarations/examples/SuspiciousMethodNameDeclarationClass.ts
@@ -0,0 +1,6 @@
+// BAD: Using 'new' in a class creates a method, not a constructor
+class Point {
+   x: number;
+   y: number;
+   new(x: number, y: number) {}; // This is just a method named "new"
+}
diff --git a/javascript/ql/src/Declarations/examples/SuspiciousMethodNameDeclarationClassFixed.ts b/javascript/ql/src/Declarations/examples/SuspiciousMethodNameDeclarationClassFixed.ts
new file mode 100644
index 00000000000..0e072a4e031
--- /dev/null
+++ b/javascript/ql/src/Declarations/examples/SuspiciousMethodNameDeclarationClassFixed.ts
@@ -0,0 +1,9 @@
+// GOOD: Using 'constructor' for constructors in classes
+class Point {
+   x: number;
+   y: number;
+   constructor(x: number, y: number) { // This is a proper constructor
+      this.x = x;
+      this.y = y;
+   }
+}
diff --git a/javascript/ql/src/Declarations/examples/SuspiciousMethodNameDeclarationFixed.ts b/javascript/ql/src/Declarations/examples/SuspiciousMethodNameDeclarationFixed.ts
index 850038f4dbf..d5dacdbb951 100644
--- a/javascript/ql/src/Declarations/examples/SuspiciousMethodNameDeclarationFixed.ts
+++ b/javascript/ql/src/Declarations/examples/SuspiciousMethodNameDeclarationFixed.ts
@@ -1,4 +1,6 @@
+// GOOD: Using 'new' for constructor signatures in interfaces
 interface Point {
    x: number;
    y: number;
+   new(x: number, y: number): Point; // This is a proper constructor signature
 }
diff --git a/javascript/ql/src/Declarations/examples/SuspiciousMethodNameDeclarationFunction.ts b/javascript/ql/src/Declarations/examples/SuspiciousMethodNameDeclarationFunction.ts
new file mode 100644
index 00000000000..37749d4ff85
--- /dev/null
+++ b/javascript/ql/src/Declarations/examples/SuspiciousMethodNameDeclarationFunction.ts
@@ -0,0 +1,4 @@
+// BAD: Using 'function' as a method name is confusing
+interface Calculator {
+   function(a: number, b: number): number; // This is just a method named "function"
+}
diff --git a/javascript/ql/src/Declarations/examples/SuspiciousMethodNameDeclarationFunctionFixed.ts b/javascript/ql/src/Declarations/examples/SuspiciousMethodNameDeclarationFunctionFixed.ts
new file mode 100644
index 00000000000..a5b3b747faa
--- /dev/null
+++ b/javascript/ql/src/Declarations/examples/SuspiciousMethodNameDeclarationFunctionFixed.ts
@@ -0,0 +1,4 @@
+// GOOD: Using descriptive method names instead of 'function'
+interface Calculator {
+   calculate(a: number, b: number): number; // Clear, descriptive method name
+}
diff --git a/javascript/ql/src/Expressions/MissingAwait.ql b/javascript/ql/src/Expressions/MissingAwait.ql
index d97c006a7bd..a16d31ee2a5 100644
--- a/javascript/ql/src/Expressions/MissingAwait.ql
+++ b/javascript/ql/src/Expressions/MissingAwait.ql
@@ -10,6 +10,7 @@
  */
 
 import javascript
+private import semmle.javascript.internal.TypeResolution
 
 /**
  * Holds if `call` is a call to an `async` function.
@@ -28,7 +29,7 @@ predicate isPromise(DataFlow::SourceNode node, boolean nullable) {
   isAsyncCall(node, nullable)
   or
   not isAsyncCall(node, _) and
-  node.asExpr().getType() instanceof PromiseType and
+  TypeResolution::valueHasPromiseType(node.asExpr()) and
   nullable = true
 }
 
diff --git a/javascript/ql/src/RegExp/DuplicateCharacterInCharacterClass.qhelp b/javascript/ql/src/RegExp/DuplicateCharacterInCharacterClass.qhelp
index 30ef990ec0c..f94cced3d09 100644
--- a/javascript/ql/src/RegExp/DuplicateCharacterInCharacterClass.qhelp
+++ b/javascript/ql/src/RegExp/DuplicateCharacterInCharacterClass.qhelp
@@ -5,26 +5,42 @@
 
 <overview>
 <p>
-Character classes in regular expressions represent sets of characters, so there is no need to specify
-the same character twice in one character class. Duplicate characters in character classes are at best
-useless, and may even indicate a latent bug.
+Character classes in regular expressions (denoted by square brackets <code>[]</code>) represent sets of characters where the pattern matches any single character from that set. Since character classes are sets, specifying the same character multiple times is redundant and often indicates a programming error.
 </p>
 
+<p>
+Common mistakes include:
+</p>
+<ul>
+<li>Using square brackets <code>[]</code> instead of parentheses <code>()</code> for grouping alternatives</li>
+<li>Misunderstanding that special regex characters like <code>|</code>, <code>*</code>, <code>+</code>, <code>()</code>, and <code>-</code> work differently when appearing inside a character class</li>
+<li>Accidentally duplicating characters or escape sequences that represent the same character</li>
+</ul>
+
 </overview>
 <recommendation>
 
-<p>If the character was accidentally duplicated, remove it. If the character class was meant to be a
-group, replace the brackets with parentheses.</p>
+<p>
+Examine each duplicate character to determine the intended behavior:
+</p>
+<ul>
+<li>If you see <code>|</code> inside square brackets (e.g., <code>[a|b|c]</code>): This is usually a mistake. The author likely intended alternation. Replace the character class with a group: <code>(a|b|c)</code></li>
+<li>If trying to match alternative strings, use parentheses <code>()</code> for grouping instead of square brackets</li>
+<li>If the duplicate was truly accidental, remove the redundant characters</li>
+<li>If trying to use special regex operators inside square brackets, note that most operators (like <code>|</code>) are treated as literal characters</li>
+</ul>
 
+<p>
+Note that simply removing <code>|</code> characters from character classes is rarely the correct fix. Instead, analyze the pattern to understand what the author intended to match.
+</p>
 
 </recommendation>
 <example>
 <p>
-In the following example, the character class <code>[password|pwd]</code> contains two instances each
-of the characters <code>d</code>, <code>p</code>, <code>s</code>, and <code>w</code>. The programmer
-most likely meant to write <code>(password|pwd)</code> (a pattern that matches either the string
-<code>"password"</code> or the string <code>"pwd"</code>), and accidentally mistyped the enclosing
-brackets.
+<strong>Example 1: Confusing character classes with groups</strong>
+</p>
+<p>
+The pattern <code>[password|pwd]</code> does not match "password" or "pwd" as intended. Instead, it matches any single character from the set <code>{p, a, s, w, o, r, d, |}</code>. Note that <code>|</code> has no special meaning inside character classes.
 </p>
 
 <sample src="examples/DuplicateCharacterInCharacterClass.js" />
@@ -33,10 +49,23 @@ brackets.
 To fix this problem, the regular expression should be rewritten to <code>/(password|pwd) =/</code>.
 </p>
 
+<p>
+<strong>Example 2: CSS unit matching</strong>
+</p>
+<p>
+The pattern <code>r?e[m|x]</code> appears to be trying to match "rem" or "rex", but actually matches "re" followed by any of the characters <code>{m, |, x}</code>. The correct pattern should be <code>r?e(m|x)</code> or <code>r?e[mx]</code>.
+</p>
+
+<p>
+Similarly, <code>v[h|w|min|max]</code> should be <code>v(h|w|min|max)</code> to properly match "vh", "vw", "vmin", or "vmax".
+</p>
+
 </example>
 <references>
 
 <li>Mozilla Developer Network: <a href="https://developer.mozilla.org/en-US/docs/Web/JavaScript/Guide/Regular_Expressions">JavaScript Regular Expressions</a>.</li>
+<li>MDN: <a href="https://developer.mozilla.org/en-US/docs/Web/JavaScript/Guide/Regular_Expressions/Character_Classes">Character Classes</a> - Details on how character classes work.</li>
+<li>MDN: <a href="https://developer.mozilla.org/en-US/docs/Web/JavaScript/Guide/Regular_Expressions/Groups_and_Ranges">Groups and Ranges</a> - Proper use of grouping with parentheses.</li>
 
 </references>
 </qhelp>
diff --git a/javascript/ql/src/RegExp/DuplicateCharacterInCharacterClass.ql b/javascript/ql/src/RegExp/DuplicateCharacterInCharacterClass.ql
index 06b6d218aca..00366590fcb 100644
--- a/javascript/ql/src/RegExp/DuplicateCharacterInCharacterClass.ql
+++ b/javascript/ql/src/RegExp/DuplicateCharacterInCharacterClass.ql
@@ -5,7 +5,8 @@
  * @kind problem
  * @problem.severity warning
  * @id js/regex/duplicate-in-character-class
- * @tags reliability
+ * @tags quality
+ *       reliability
  *       correctness
  *       regular-expressions
  * @precision very-high
diff --git a/javascript/ql/src/change-notes/2025-05-30-dom-property-access.md b/javascript/ql/src/change-notes/2025-05-30-dom-property-access.md
new file mode 100644
index 00000000000..2dcb16a8327
--- /dev/null
+++ b/javascript/ql/src/change-notes/2025-05-30-dom-property-access.md
@@ -0,0 +1,4 @@
+---
+category: minorAnalysis
+---
+* The `js/useless-expression` query now correctly flags only the innermost expressions with no effect, avoiding duplicate alerts on compound expressions.
diff --git a/javascript/ql/src/change-notes/2025-06-12-suspicious-method-name.md b/javascript/ql/src/change-notes/2025-06-12-suspicious-method-name.md
new file mode 100644
index 00000000000..dfee27ffdd3
--- /dev/null
+++ b/javascript/ql/src/change-notes/2025-06-12-suspicious-method-name.md
@@ -0,0 +1,4 @@
+---
+category: queryMetadata
+---
+* Added `reliability` tag to the `js/suspicious-method-name-declaration` query.
diff --git a/javascript/ql/src/meta/alerts/CallGraph.ql b/javascript/ql/src/meta/alerts/CallGraph.ql
index 364d81e32c9..c721e72f640 100644
--- a/javascript/ql/src/meta/alerts/CallGraph.ql
+++ b/javascript/ql/src/meta/alerts/CallGraph.ql
@@ -12,7 +12,10 @@ import javascript
 
 from DataFlow::Node invoke, Function f, string kind
 where
-  invoke.(DataFlow::InvokeNode).getACallee() = f and kind = "Call"
-  or
-  invoke.(DataFlow::PropRef).getAnAccessorCallee().getFunction() = f and kind = "Accessor call"
+  (
+    invoke.(DataFlow::InvokeNode).getACallee() = f and kind = "Call"
+    or
+    invoke.(DataFlow::PropRef).getAnAccessorCallee().getFunction() = f and kind = "Accessor call"
+  ) and
+  not f.getTopLevel().isExterns()
 select invoke, kind + " to $@", f, f.describe()
diff --git a/javascript/ql/src/meta/types/TypesWithQualifiedName.ql b/javascript/ql/src/meta/types/TypesWithQualifiedName.ql
deleted file mode 100644
index db23d2a807e..00000000000
--- a/javascript/ql/src/meta/types/TypesWithQualifiedName.ql
+++ /dev/null
@@ -1,14 +0,0 @@
-/**
- * @name Types with qualified name
- * @description The number of type annotations with a qualified name
- * @kind metric
- * @metricType project
- * @metricAggregate sum
- * @tags meta
- * @id js/meta/types-with-qualified-name
- */
-
-import javascript
-import meta.MetaMetrics
-
-select projectRoot(), count(TypeAnnotation t | t.hasQualifiedName(_) or t.hasQualifiedName(_, _))
diff --git a/javascript/ql/test/library-tests/CallGraphs/AnnotatedTest/types.ts b/javascript/ql/test/library-tests/CallGraphs/AnnotatedTest/types.ts
new file mode 100644
index 00000000000..6dd94bcf195
--- /dev/null
+++ b/javascript/ql/test/library-tests/CallGraphs/AnnotatedTest/types.ts
@@ -0,0 +1,27 @@
+namespace NS {
+  export class C {
+    /** name:NS.C.m */
+    m() { }
+  }
+
+  export class D extends C { }
+}
+
+function t1(c: NS.C, d: NS.D) {
+  /** calls:NS.C.m */
+  c.m();
+
+  /** calls:NS.C.m */
+  d.m();
+}
+
+async function t2(cp: Promise<NS.C>) {
+  const c = await cp;
+  /** calls:NS.C.m */
+  c.m();
+
+  cp.then(c2 => {
+    /** calls:NS.C.m */
+    c2.m();
+  })
+}
diff --git a/javascript/ql/test/library-tests/DataFlow/tests.expected b/javascript/ql/test/library-tests/DataFlow/tests.expected
index 55c6771eef0..26ba8c46a99 100644
--- a/javascript/ql/test/library-tests/DataFlow/tests.expected
+++ b/javascript/ql/test/library-tests/DataFlow/tests.expected
@@ -1514,6 +1514,7 @@ sources
 | tst2.ts:7:1:9:1 | return of function setX |
 | tst2.ts:8:3:8:5 | A.x |
 | tst2.ts:11:11:11:13 | A.x |
+| tst2.ts:11:11:11:23 | A.x as number |
 | tst2.ts:13:1:13:40 | class S ... ing> {} |
 | tst2.ts:13:26:13:29 | List |
 | tst2.ts:13:39:13:38 | (...arg ... rgs); } |
@@ -1522,6 +1523,7 @@ sources
 | tst2.ts:13:39:13:38 | super(...args) |
 | tst2.ts:13:39:13:38 | this |
 | tst2.ts:15:11:15:13 | A.x |
+| tst2.ts:15:11:15:30 | A.x satisfies number |
 | tst.js:1:1:1:0 | this |
 | tst.js:1:1:1:24 | import  ... m 'fs'; |
 | tst.js:1:10:1:11 | fs |
diff --git a/javascript/ql/test/library-tests/JSDoc/NameResolution/test.expected b/javascript/ql/test/library-tests/JSDoc/NameResolution/test.expected
index 97730513195..7c015994aaf 100644
--- a/javascript/ql/test/library-tests/JSDoc/NameResolution/test.expected
+++ b/javascript/ql/test/library-tests/JSDoc/NameResolution/test.expected
@@ -1,10 +1,10 @@
-| bar.js:5:14:5:14 | x | x |
+| bar.js:5:14:5:14 | x | ns.very.long.namespace |
 | bar.js:5:14:5:18 | x.Foo | ns.very.long.namespace.Foo |
-| bar.js:12:14:12:17 | iife | iife |
+| bar.js:12:14:12:17 | iife | IIFE |
 | bar.js:12:14:12:21 | iife.Foo | IIFE.Foo |
 | closure.js:8:12:8:15 | goog | goog |
 | closure.js:8:12:8:19 | goog.net | goog.net |
 | closure.js:8:12:8:28 | goog.net.SomeType | goog.net.SomeType |
-| closure.js:9:12:9:14 | net | net |
+| closure.js:9:12:9:14 | net | goog.net |
 | closure.js:9:12:9:23 | net.SomeType | goog.net.SomeType |
 | closure.js:10:12:10:19 | SomeType | goog.net.SomeType |
diff --git a/javascript/ql/test/library-tests/JSDoc/NameResolution/test.ql b/javascript/ql/test/library-tests/JSDoc/NameResolution/test.ql
index 1b7ebfdd501..bb1de953169 100644
--- a/javascript/ql/test/library-tests/JSDoc/NameResolution/test.ql
+++ b/javascript/ql/test/library-tests/JSDoc/NameResolution/test.ql
@@ -1,3 +1,3 @@
 import javascript
 
-query string test_hasQualifiedName(JSDocNamedTypeExpr expr) { expr.hasQualifiedName(result) }
+query string test_hasUnderlyingType(JSDocNamedTypeExpr expr) { expr.hasUnderlyingType(result) }
diff --git a/javascript/ql/test/library-tests/TypeAnnotations/JSDoc/JSDocTypeAnnotations.expected b/javascript/ql/test/library-tests/TypeAnnotations/JSDoc/JSDocTypeAnnotations.expected
index 8ac3eea2be5..06afe15ee18 100644
--- a/javascript/ql/test/library-tests/TypeAnnotations/JSDoc/JSDocTypeAnnotations.expected
+++ b/javascript/ql/test/library-tests/TypeAnnotations/JSDoc/JSDocTypeAnnotations.expected
@@ -2,13 +2,14 @@ test_isString
 | tst.js:2:12:2:17 | string |
 test_isNumber
 | tst.js:3:12:3:17 | number |
-test_QualifiedName
+test_hasUnderlyingType
 | VarType | tst.js:9:13:9:19 | VarType |
 | boolean | tst.js:5:14:5:20 | boolean |
 | foo | tst.js:4:12:4:14 | foo |
 | foo.bar | tst.js:4:12:4:18 | foo.bar |
 | foo.bar.baz | tst.js:4:12:4:22 | foo.bar.baz |
 | number | tst.js:3:12:3:17 | number |
+| number | tst.js:3:12:3:18 | number? |
 | string | tst.js:2:12:2:17 | string |
 test_ParameterType
 | tst.js:7:12:7:12 | x | tst.js:2:12:2:17 | string |
diff --git a/javascript/ql/test/library-tests/TypeAnnotations/JSDoc/JSDocTypeAnnotations.ql b/javascript/ql/test/library-tests/TypeAnnotations/JSDoc/JSDocTypeAnnotations.ql
index 829435e3220..fd223ee5a53 100644
--- a/javascript/ql/test/library-tests/TypeAnnotations/JSDoc/JSDocTypeAnnotations.ql
+++ b/javascript/ql/test/library-tests/TypeAnnotations/JSDoc/JSDocTypeAnnotations.ql
@@ -4,7 +4,7 @@ query TypeAnnotation test_isString() { result.isString() }
 
 query TypeAnnotation test_isNumber() { result.isNumber() }
 
-query TypeAnnotation test_QualifiedName(string name) { result.hasQualifiedName(name) }
+query TypeAnnotation test_hasUnderlyingType(string name) { result.hasUnderlyingType(name) }
 
 query TypeAnnotation test_ParameterType(Parameter p) { result = p.getTypeAnnotation() }
 
diff --git a/javascript/ql/test/library-tests/TypeAnnotations/TSUnresolvedQualifiedName/QualifiedNames.ql b/javascript/ql/test/library-tests/TypeAnnotations/TSUnresolvedQualifiedName/QualifiedNames.ql
index e9d66a4afe0..b4d324377be 100644
--- a/javascript/ql/test/library-tests/TypeAnnotations/TSUnresolvedQualifiedName/QualifiedNames.ql
+++ b/javascript/ql/test/library-tests/TypeAnnotations/TSUnresolvedQualifiedName/QualifiedNames.ql
@@ -1,5 +1,5 @@
 import javascript
 
 from TypeAnnotation type, string mod, string name
-where type.hasQualifiedName(mod, name)
+where type.hasUnderlyingType(mod, name)
 select type, mod, name
diff --git a/javascript/ql/test/library-tests/TypeScript/Ambients/Ambients.expected b/javascript/ql/test/library-tests/TypeScript/Ambients/Ambients.expected
index 7a60484a5f7..63e749e97be 100644
--- a/javascript/ql/test/library-tests/TypeScript/Ambients/Ambients.expected
+++ b/javascript/ql/test/library-tests/TypeScript/Ambients/Ambients.expected
@@ -1 +1,7 @@
-| tst.ts:38:3:38:19 | resolveAmbient(x) | x should not resolve to a global |
+| tst.ts:22:3:22:18 | resolveGlobal(x) | x should resolve to a global variable |
+| tst.ts:23:3:23:18 | resolveGlobal(y) | y should resolve to a global variable |
+| tst.ts:24:3:24:18 | resolveGlobal(z) | z should resolve to a global variable |
+| tst.ts:25:3:25:18 | resolveGlobal(w) | w should resolve to a global variable |
+| tst.ts:39:3:39:18 | resolveGlobal(y) | y should resolve to a global variable |
+| tst.ts:40:3:40:18 | resolveGlobal(z) | z should resolve to a global variable |
+| tst.ts:41:3:41:18 | resolveGlobal(w) | w should resolve to a global variable |
diff --git a/javascript/ql/test/library-tests/TypeScript/CallResolution/CallTarget.expected b/javascript/ql/test/library-tests/TypeScript/CallResolution/CallTarget.expected
index a91505e3f03..69374cbf4bf 100644
--- a/javascript/ql/test/library-tests/TypeScript/CallResolution/CallTarget.expected
+++ b/javascript/ql/test/library-tests/TypeScript/CallResolution/CallTarget.expected
@@ -1,16 +1,36 @@
-| tst.ts:52:3:52:23 | obj.sim ... od(str) | TestInterface.simpleMethod in global scope | no concrete target |
-| tst.ts:53:3:53:24 | obj.gen ... od(str) | TestInterface.genericMethod in global scope | no concrete target |
-| tst.ts:54:3:54:24 | obj.gen ... od(num) | TestInterface.genericMethod in global scope | no concrete target |
-| tst.ts:55:3:55:27 | obj.ove ... od(num) | TestInterface.overloadedMethod in global scope | no concrete target |
-| tst.ts:56:3:56:27 | obj.ove ... od(str) | TestInterface.overloadedMethod in global scope | no concrete target |
-| tst.ts:57:3:57:26 | obj.ove ... hod([]) | TestInterface.overloadedMethod in global scope | no concrete target |
-| tst.ts:58:3:58:36 | obj.gen ... ([num]) | TestInterface.genericOverloadedMethod in global scope | no concrete target |
-| tst.ts:59:3:59:39 | obj.gen ... : str}) | TestInterface.genericOverloadedMethod in global scope | no concrete target |
-| tst.ts:60:3:60:34 | obj.gen ... od(num) | TestInterface.genericOverloadedMethod in global scope | no concrete target |
+| tst.ts:52:3:52:23 | obj.sim ... od(str) | TestInterface.simpleMethod in global scope | simpleM ... number; |
+| tst.ts:53:3:53:24 | obj.gen ... od(str) | TestInterface.genericMethod in global scope | generic ...  T): T; |
+| tst.ts:54:3:54:24 | obj.gen ... od(num) | TestInterface.genericMethod in global scope | generic ...  T): T; |
+| tst.ts:55:3:55:27 | obj.ove ... od(num) | TestInterface.overloadedMethod in global scope | overloa ... ): any; |
+| tst.ts:55:3:55:27 | obj.ove ... od(num) | TestInterface.overloadedMethod in global scope | overloa ... number; |
+| tst.ts:55:3:55:27 | obj.ove ... od(num) | TestInterface.overloadedMethod in global scope | overloa ... string; |
+| tst.ts:56:3:56:27 | obj.ove ... od(str) | TestInterface.overloadedMethod in global scope | overloa ... ): any; |
+| tst.ts:56:3:56:27 | obj.ove ... od(str) | TestInterface.overloadedMethod in global scope | overloa ... number; |
+| tst.ts:56:3:56:27 | obj.ove ... od(str) | TestInterface.overloadedMethod in global scope | overloa ... string; |
+| tst.ts:57:3:57:26 | obj.ove ... hod([]) | TestInterface.overloadedMethod in global scope | overloa ... ): any; |
+| tst.ts:57:3:57:26 | obj.ove ... hod([]) | TestInterface.overloadedMethod in global scope | overloa ... number; |
+| tst.ts:57:3:57:26 | obj.ove ... hod([]) | TestInterface.overloadedMethod in global scope | overloa ... string; |
+| tst.ts:58:3:58:36 | obj.gen ... ([num]) | TestInterface.genericOverloadedMethod in global scope | generic ... ): any; |
+| tst.ts:58:3:58:36 | obj.gen ... ([num]) | TestInterface.genericOverloadedMethod in global scope | generic ... T>): T; |
+| tst.ts:58:3:58:36 | obj.gen ... ([num]) | TestInterface.genericOverloadedMethod in global scope | generic ... []): T; |
+| tst.ts:59:3:59:39 | obj.gen ... : str}) | TestInterface.genericOverloadedMethod in global scope | generic ... ): any; |
+| tst.ts:59:3:59:39 | obj.gen ... : str}) | TestInterface.genericOverloadedMethod in global scope | generic ... T>): T; |
+| tst.ts:59:3:59:39 | obj.gen ... : str}) | TestInterface.genericOverloadedMethod in global scope | generic ... []): T; |
+| tst.ts:60:3:60:34 | obj.gen ... od(num) | TestInterface.genericOverloadedMethod in global scope | generic ... ): any; |
+| tst.ts:60:3:60:34 | obj.gen ... od(num) | TestInterface.genericOverloadedMethod in global scope | generic ... T>): T; |
+| tst.ts:60:3:60:34 | obj.gen ... od(num) | TestInterface.genericOverloadedMethod in global scope | generic ... []): T; |
 | tst.ts:64:3:64:23 | obj.sim ... od(str) | TestClass.simpleMethod in global scope | simpleM ... ength } |
 | tst.ts:65:3:65:24 | obj.gen ... od(str) | TestClass.genericMethod in global scope | generic ... rn x; } |
 | tst.ts:66:3:66:24 | obj.gen ... od(num) | TestClass.genericMethod in global scope | generic ... rn x; } |
+| tst.ts:67:3:67:27 | obj.ove ... od(num) | TestClass.overloadedMethod in global scope | overloa ... number; |
 | tst.ts:67:3:67:27 | obj.ove ... od(num) | TestClass.overloadedMethod in global scope | overloa ... rn x; } |
+| tst.ts:67:3:67:27 | obj.ove ... od(num) | TestClass.overloadedMethod in global scope | overloa ... string; |
+| tst.ts:68:3:68:27 | obj.ove ... od(str) | TestClass.overloadedMethod in global scope | overloa ... number; |
 | tst.ts:68:3:68:27 | obj.ove ... od(str) | TestClass.overloadedMethod in global scope | overloa ... rn x; } |
+| tst.ts:68:3:68:27 | obj.ove ... od(str) | TestClass.overloadedMethod in global scope | overloa ... string; |
+| tst.ts:69:3:69:36 | obj.gen ... ([num]) | TestClass.genericOverloadedMethod in global scope | generic ... T>): T; |
+| tst.ts:69:3:69:36 | obj.gen ... ([num]) | TestClass.genericOverloadedMethod in global scope | generic ... []): T; |
 | tst.ts:69:3:69:36 | obj.gen ... ([num]) | TestClass.genericOverloadedMethod in global scope | generic ... null; } |
+| tst.ts:70:3:70:39 | obj.gen ... : str}) | TestClass.genericOverloadedMethod in global scope | generic ... T>): T; |
+| tst.ts:70:3:70:39 | obj.gen ... : str}) | TestClass.genericOverloadedMethod in global scope | generic ... []): T; |
 | tst.ts:70:3:70:39 | obj.gen ... : str}) | TestClass.genericOverloadedMethod in global scope | generic ... null; } |
diff --git a/javascript/ql/test/library-tests/TypeScript/HasQualifiedNameFallback/Test.expected b/javascript/ql/test/library-tests/TypeScript/HasQualifiedNameFallback/Test.expected
index 5ee97e2dfb5..3781aea96e2 100644
--- a/javascript/ql/test/library-tests/TypeScript/HasQualifiedNameFallback/Test.expected
+++ b/javascript/ql/test/library-tests/TypeScript/HasQualifiedNameFallback/Test.expected
@@ -1,13 +1,15 @@
-hasQualifiedNameModule
-| default-import | default | tst.ts:11:9:11:21 | DefaultImport |
+hasUnderlyingTypeModule
+| default-import |  | tst.ts:11:9:11:21 | DefaultImport |
+| global | UnresolvedName | tst.ts:12:9:12:22 | UnresolvedName |
+| import-assign |  | tst.ts:10:9:10:11 | asn |
 | import-assign | Foo | tst.ts:10:9:10:15 | asn.Foo |
 | named-import | Name1 | tst.ts:7:9:7:13 | Name1 |
 | named-import | Name1 | tst.ts:13:9:13:13 | Name1 |
 | named-import | Name1 | tst.ts:13:9:13:21 | Name1<number> |
 | named-import | Name2 | tst.ts:8:9:8:13 | Name2 |
+| namespace-import |  | tst.ts:9:9:9:17 | namespace |
 | namespace-import | Foo | tst.ts:9:9:9:21 | namespace.Foo |
-| tst.ts | ExportedClass | relative.ts:4:8:4:20 | ExportedClass |
-hasQualifiedNameGlobal
+hasUnderlyingTypeGlobal
 | UnresolvedName | tst.ts:12:9:12:22 | UnresolvedName |
 paramExample
 | tst.ts:7:5:7:6 | x1 |
diff --git a/javascript/ql/test/library-tests/TypeScript/HasQualifiedNameFallback/Test.ql b/javascript/ql/test/library-tests/TypeScript/HasQualifiedNameFallback/Test.ql
index 2b63e171f1e..199749ed3f6 100644
--- a/javascript/ql/test/library-tests/TypeScript/HasQualifiedNameFallback/Test.ql
+++ b/javascript/ql/test/library-tests/TypeScript/HasQualifiedNameFallback/Test.ql
@@ -1,13 +1,13 @@
 import javascript
 
-query TypeAnnotation hasQualifiedNameModule(string moduleName, string member) {
-  result.hasQualifiedName(moduleName, member)
+query TypeAnnotation hasUnderlyingTypeModule(string moduleName, string member) {
+  result.hasUnderlyingType(moduleName, member)
 }
 
-query TypeAnnotation hasQualifiedNameGlobal(string globalName) {
-  result.hasQualifiedName(globalName)
+query TypeAnnotation hasUnderlyingTypeGlobal(string globalName) {
+  result.hasUnderlyingType(globalName)
 }
 
 query Parameter paramExample() {
-  result.getTypeAnnotation().hasQualifiedName("named-import", "Name1")
+  result.getTypeAnnotation().hasUnderlyingType("named-import", "Name1")
 }
diff --git a/javascript/ql/test/library-tests/TypeScript/HasUnderlyingType/HasUnderlyingType.expected b/javascript/ql/test/library-tests/TypeScript/HasUnderlyingType/HasUnderlyingType.expected
index a9123b1ef55..91eb164f394 100644
--- a/javascript/ql/test/library-tests/TypeScript/HasUnderlyingType/HasUnderlyingType.expected
+++ b/javascript/ql/test/library-tests/TypeScript/HasUnderlyingType/HasUnderlyingType.expected
@@ -5,6 +5,6 @@
 | tst.ts:8:14:8:16 | arg | Sub in global scope |
 underlyingTypeNode
 | foo |  | file://:0:0:0:0 | use moduleImport("foo").getMember("exports") |
+| foo |  | file://:0:0:0:0 | use moduleImport("foo").getMember("exports").getMember("") |
 | foo |  | foo.ts:1:8:1:10 | use moduleImport("foo").getMember("exports").getMember("default") |
-| foo | Bar | foo.ts:3:1:5:1 | use moduleImport("foo").getMember("exports").getMember("Bar").getInstance() |
 | foo | Bar | foo.ts:3:12:3:12 | use moduleImport("foo").getMember("exports").getMember("Bar").getInstance() |
diff --git a/javascript/ql/test/library-tests/UnderlyingTypes/calls.ts b/javascript/ql/test/library-tests/UnderlyingTypes/calls.ts
new file mode 100644
index 00000000000..68509e4a1c6
--- /dev/null
+++ b/javascript/ql/test/library-tests/UnderlyingTypes/calls.ts
@@ -0,0 +1,32 @@
+import * as express from 'express';
+
+function getRequest(): express.Request { }
+
+function t1() {
+    getRequest(); // $ hasUnderlyingType='express'.Request
+}
+
+declare function getRequestAmbient(): express.Request;
+
+function t2() {
+    getRequestAmbient(); // $ hasUnderlyingType='express'.Request
+}
+
+class C {
+    method(): express.Request { }
+}
+
+function t3(c: C) {
+    c.method(); // $ hasUnderlyingType='express'.Request
+    new C().method(); // $ hasUnderlyingType='express'.Request
+}
+
+function callback(fn: (req: express.Request) => void) { // $ SPURIOUS: hasUnderlyingType='express'.Request // req seems to be a SourceNode
+}
+
+function t4() {
+    callback(function (
+        req // $ hasUnderlyingType='express'.Request
+    ) { }
+    );
+}
diff --git a/javascript/ql/test/library-tests/UnderlyingTypes/closure.es.js b/javascript/ql/test/library-tests/UnderlyingTypes/closure.es.js
new file mode 100644
index 00000000000..cb140ec63c9
--- /dev/null
+++ b/javascript/ql/test/library-tests/UnderlyingTypes/closure.es.js
@@ -0,0 +1,5 @@
+goog.declareModuleId("closure.es")
+
+const Bar = goog.require('closure.reexported.Bar');
+
+export { Bar }
diff --git a/javascript/ql/test/library-tests/UnderlyingTypes/closure.lib.js b/javascript/ql/test/library-tests/UnderlyingTypes/closure.lib.js
new file mode 100644
index 00000000000..ffd67593202
--- /dev/null
+++ b/javascript/ql/test/library-tests/UnderlyingTypes/closure.lib.js
@@ -0,0 +1,3 @@
+goog.module("closure.lib")
+
+exports.Foo = goog.require('closure.reexported.Foo');
diff --git a/javascript/ql/test/library-tests/UnderlyingTypes/closure.use.js b/javascript/ql/test/library-tests/UnderlyingTypes/closure.use.js
new file mode 100644
index 00000000000..22fc397cf3d
--- /dev/null
+++ b/javascript/ql/test/library-tests/UnderlyingTypes/closure.use.js
@@ -0,0 +1,16 @@
+goog.module("closure.use")
+
+const lib = goog.require("closure.lib");
+const es = goog.require("closure.es");
+
+/**
+ * @param {lib.Foo} x
+ */
+function t1(x) { // $ hasUnderlyingType=closure.reexported.Foo hasUnderlyingType=closure.lib.Foo
+}
+
+/**
+ * @param {es.Bar} x
+ */
+function t2(x) { // $ hasUnderlyingType=closure.reexported.Bar hasUnderlyingType=closure.es.Bar
+}
diff --git a/javascript/ql/test/library-tests/UnderlyingTypes/contextualTypes.ts b/javascript/ql/test/library-tests/UnderlyingTypes/contextualTypes.ts
new file mode 100644
index 00000000000..cc461c5c7dd
--- /dev/null
+++ b/javascript/ql/test/library-tests/UnderlyingTypes/contextualTypes.ts
@@ -0,0 +1,45 @@
+import * as express from 'express';
+
+interface Options {
+    handle(req: express.Request): void; // $ hasUnderlyingType='express'.Request
+}
+
+declare function doSomething(options: Options);
+
+function t1() {
+    doSomething({
+        handle(req) { // $ hasUnderlyingType='express'.Request
+        }
+    });
+}
+
+function t2(callback: ((opts: Options) => void) | undefined) {
+    callback({
+        handle(req) { } // $ hasUnderlyingType='express'.Request
+    })
+    callback!({
+        handle(req) { } // $ hasUnderlyingType='express'.Request
+    })
+}
+
+function t3(): Options {
+    return {
+        handle(req) { } // $ hasUnderlyingType='express'.Request
+    }
+}
+
+function t4(): Options[] {
+    return [
+        {
+            handle(req) { } // $ hasUnderlyingType='express'.Request
+        }
+    ]
+}
+
+async function t5(): Promise<Options> {
+    return {
+        handle(req) { // $ hasUnderlyingType='express'.Request
+
+        }
+    }
+}
diff --git a/javascript/ql/test/library-tests/UnderlyingTypes/expressBulkExport.ts b/javascript/ql/test/library-tests/UnderlyingTypes/expressBulkExport.ts
new file mode 100644
index 00000000000..47ef09acc6e
--- /dev/null
+++ b/javascript/ql/test/library-tests/UnderlyingTypes/expressBulkExport.ts
@@ -0,0 +1 @@
+export * from 'express';
diff --git a/javascript/ql/test/library-tests/UnderlyingTypes/expressBulkExport.use.ts b/javascript/ql/test/library-tests/UnderlyingTypes/expressBulkExport.use.ts
new file mode 100644
index 00000000000..bb94da47faf
--- /dev/null
+++ b/javascript/ql/test/library-tests/UnderlyingTypes/expressBulkExport.use.ts
@@ -0,0 +1,7 @@
+import { Request, Response } from './expressBulkExport';
+
+function t1(req: Request) { // $ hasUnderlyingType='express'.Request
+}
+
+function t2(res: Response) { // $ hasUnderlyingType='express'.Response
+}
diff --git a/javascript/ql/test/library-tests/UnderlyingTypes/expressExportAssign.ts b/javascript/ql/test/library-tests/UnderlyingTypes/expressExportAssign.ts
new file mode 100644
index 00000000000..8aa013bcde0
--- /dev/null
+++ b/javascript/ql/test/library-tests/UnderlyingTypes/expressExportAssign.ts
@@ -0,0 +1,2 @@
+import E = require('express');
+export = E;
diff --git a/javascript/ql/test/library-tests/UnderlyingTypes/expressExportAssign.use.ts b/javascript/ql/test/library-tests/UnderlyingTypes/expressExportAssign.use.ts
new file mode 100644
index 00000000000..da65575a443
--- /dev/null
+++ b/javascript/ql/test/library-tests/UnderlyingTypes/expressExportAssign.use.ts
@@ -0,0 +1,4 @@
+import { Request } from "./expressExportAssign";
+
+function t1(req: Request) { // $ hasUnderlyingType='express'.Request
+}
diff --git a/javascript/ql/test/library-tests/UnderlyingTypes/expressExportAssignWrapper.ts b/javascript/ql/test/library-tests/UnderlyingTypes/expressExportAssignWrapper.ts
new file mode 100644
index 00000000000..23c22e44591
--- /dev/null
+++ b/javascript/ql/test/library-tests/UnderlyingTypes/expressExportAssignWrapper.ts
@@ -0,0 +1,5 @@
+import Express = require('express');
+namespace Wrapper {
+    export import E = Express;
+}
+export = Wrapper;
diff --git a/javascript/ql/test/library-tests/UnderlyingTypes/expressExportAssignWrapper.use.ts b/javascript/ql/test/library-tests/UnderlyingTypes/expressExportAssignWrapper.use.ts
new file mode 100644
index 00000000000..7bcf4b419e9
--- /dev/null
+++ b/javascript/ql/test/library-tests/UnderlyingTypes/expressExportAssignWrapper.use.ts
@@ -0,0 +1,4 @@
+import { E } from "./expressExportAssignWrapper";
+
+function t1(req: E.Request) { // $ hasUnderlyingType='express'.Request
+}
diff --git a/javascript/ql/test/library-tests/UnderlyingTypes/expressSelectiveExport.ts b/javascript/ql/test/library-tests/UnderlyingTypes/expressSelectiveExport.ts
new file mode 100644
index 00000000000..c8aaf3bb995
--- /dev/null
+++ b/javascript/ql/test/library-tests/UnderlyingTypes/expressSelectiveExport.ts
@@ -0,0 +1,2 @@
+export { Request } from 'express';
+export { Response as R } from 'express';
diff --git a/javascript/ql/test/library-tests/UnderlyingTypes/expressSelectiveExport.use.ts b/javascript/ql/test/library-tests/UnderlyingTypes/expressSelectiveExport.use.ts
new file mode 100644
index 00000000000..41ce42e3b1f
--- /dev/null
+++ b/javascript/ql/test/library-tests/UnderlyingTypes/expressSelectiveExport.use.ts
@@ -0,0 +1,10 @@
+import { Request, Response, R } from './expressSelectiveExport';
+
+function t1(req: Request) { // $ hasUnderlyingType='express'.Request
+}
+
+function t2(res: Response) { // none, not exported
+}
+
+function t3(res: R) { // $ hasUnderlyingType='express'.Response
+}
diff --git a/javascript/ql/test/library-tests/UnderlyingTypes/expressWrapperExport.ts b/javascript/ql/test/library-tests/UnderlyingTypes/expressWrapperExport.ts
new file mode 100644
index 00000000000..6fae12f0684
--- /dev/null
+++ b/javascript/ql/test/library-tests/UnderlyingTypes/expressWrapperExport.ts
@@ -0,0 +1 @@
+export * as wrapper from 'express';
diff --git a/javascript/ql/test/library-tests/UnderlyingTypes/expressWrapperExport.use.ts b/javascript/ql/test/library-tests/UnderlyingTypes/expressWrapperExport.use.ts
new file mode 100644
index 00000000000..62f7e519ff0
--- /dev/null
+++ b/javascript/ql/test/library-tests/UnderlyingTypes/expressWrapperExport.use.ts
@@ -0,0 +1,29 @@
+import { Request, Response, wrapper } from './expressWrapperExport';
+import * as w from './expressWrapperExport';
+
+function t1(req: Request) { // none
+}
+
+function t2(res: Response) { // none
+}
+
+function t3(req: wrapper.Request) { // $ hasUnderlyingType='express'.Request
+}
+
+function t4(res: wrapper.Response) { // $ hasUnderlyingType='express'.Response
+}
+
+function t5(req: w.wrapper.Request) { // $ hasUnderlyingType='express'.Request
+}
+
+function t6(res: w.wrapper.Response) { // $ hasUnderlyingType='express'.Response
+}
+
+function t7(req: w.Request) { // none
+}
+
+function t8(res: w.Response) { // none
+}
+
+function t9(e: typeof w.wrapper) { // $ hasUnderlyingType='express'
+}
diff --git a/javascript/ql/test/library-tests/UnderlyingTypes/generics.ts b/javascript/ql/test/library-tests/UnderlyingTypes/generics.ts
new file mode 100644
index 00000000000..26e4499f4da
--- /dev/null
+++ b/javascript/ql/test/library-tests/UnderlyingTypes/generics.ts
@@ -0,0 +1,46 @@
+import * as express from 'express';
+
+type Box1<T> = {
+    value: T;
+    other: string;
+};
+function t1(b: Box1<express.Request>) {
+    b.value; // $ MISSING: hasUnderlyingType='express'.Request
+    b.other;
+}
+
+interface Box2<T> {
+    value: T;
+    other: string;
+}
+function t2(b: Box2<express.Request>) {
+    b.value; // $ MISSING: hasUnderlyingType='express'.Request
+    b.other;
+}
+
+class Box3<T> {
+    value: T;
+    other: string;
+}
+function t3(b: Box3<express.Request>) {
+    b.value; // $ MISSING: hasUnderlyingType='express'.Request
+    b.other;
+}
+
+abstract class Box4<T> {
+    abstract getValue(): T;
+    abstract getOther(): string;
+}
+function t4(b: Box4<express.Request>) {
+    b.getValue(); // $ MISSING: hasUnderlyingType='express'.Request
+    b.getOther();
+}
+
+type Box5<T> = {
+    value: T & { blah: string };
+    other: string;
+};
+function t5(b: Box5<express.Request>) {
+    b.value; // $ MISSING: hasUnderlyingType='express'.Request
+    b.other;
+}
diff --git a/javascript/ql/test/library-tests/UnderlyingTypes/globals.ts b/javascript/ql/test/library-tests/UnderlyingTypes/globals.ts
new file mode 100644
index 00000000000..8fc6546c70f
--- /dev/null
+++ b/javascript/ql/test/library-tests/UnderlyingTypes/globals.ts
@@ -0,0 +1,10 @@
+function t1(el: HTMLElement) { } // $ hasUnderlyingType=HTMLElement
+
+/**
+ * @param {HTMLInputElement} el
+ */
+function t2(el) { // $ hasUnderlyingType=HTMLInputElement
+}
+
+function t3(req: Express.Request) { // $ hasUnderlyingType=Express.Request
+}
diff --git a/javascript/ql/test/library-tests/UnderlyingTypes/jsdoc.js b/javascript/ql/test/library-tests/UnderlyingTypes/jsdoc.js
new file mode 100644
index 00000000000..662faeb52c9
--- /dev/null
+++ b/javascript/ql/test/library-tests/UnderlyingTypes/jsdoc.js
@@ -0,0 +1,14 @@
+import * as e from 'express';
+import { Response } from 'express';
+
+/**
+ * @param {e.Request} req
+ */
+function t1(req) { // $ hasUnderlyingType='express'.Request
+}
+
+/**
+ * @param {Response} res
+ */
+function t2(res) { // $ hasUnderlyingType='express'.Response
+}
diff --git a/javascript/ql/test/library-tests/UnderlyingTypes/namedImport.ts b/javascript/ql/test/library-tests/UnderlyingTypes/namedImport.ts
new file mode 100644
index 00000000000..56b1d43d399
--- /dev/null
+++ b/javascript/ql/test/library-tests/UnderlyingTypes/namedImport.ts
@@ -0,0 +1,4 @@
+import { Request } from 'express';
+
+function t1(req: Request) { // $ hasUnderlyingType='express'.Request
+}
diff --git a/javascript/ql/test/library-tests/UnderlyingTypes/namespaceDecls.ts b/javascript/ql/test/library-tests/UnderlyingTypes/namespaceDecls.ts
new file mode 100644
index 00000000000..bd8811dfe7a
--- /dev/null
+++ b/javascript/ql/test/library-tests/UnderlyingTypes/namespaceDecls.ts
@@ -0,0 +1,27 @@
+import Express = require('express');
+
+namespace A {
+    export import E = Express;
+}
+namespace B {
+    export import Q = A
+}
+namespace C {
+    import E = Express;
+    export const A = E;
+}
+
+function t1(x: A.E.Request) { // $ hasUnderlyingType='express'.Request
+}
+
+function t2(x: B.Q.E.Request) { // $ hasUnderlyingType='express'.Request
+}
+
+function t3(x: typeof Express) { // $ hasUnderlyingType='express'
+}
+
+function t4(x: typeof A.E) { // $ hasUnderlyingType='express'
+}
+
+function t5(x: typeof C.A) { // $ hasUnderlyingType='express'
+}
diff --git a/javascript/ql/test/library-tests/UnderlyingTypes/namespaceImport.ts b/javascript/ql/test/library-tests/UnderlyingTypes/namespaceImport.ts
new file mode 100644
index 00000000000..f2f96865f39
--- /dev/null
+++ b/javascript/ql/test/library-tests/UnderlyingTypes/namespaceImport.ts
@@ -0,0 +1,15 @@
+import * as express from 'express';
+
+function t1(e: typeof express) { // $ hasUnderlyingType='express'
+}
+
+function t2(req: express.Request) { // $ hasUnderlyingType='express'.Request
+}
+
+function t3(req: Request) { // $ hasUnderlyingType=Request // not in scope, refers to a global
+}
+
+type E = typeof express;
+
+function t4(e: E) { // $ hasUnderlyingType='express'
+}
diff --git a/javascript/ql/test/library-tests/UnderlyingTypes/props.ts b/javascript/ql/test/library-tests/UnderlyingTypes/props.ts
new file mode 100644
index 00000000000..1aded75ae95
--- /dev/null
+++ b/javascript/ql/test/library-tests/UnderlyingTypes/props.ts
@@ -0,0 +1,16 @@
+import * as express from 'express';
+
+interface Foo {
+    req: express.Request;
+    e: typeof express;
+}
+
+function t1(f: Foo) {
+    f.req; // $ hasUnderlyingType='express'.Request
+    f.e; // $ hasUnderlyingType='express'
+
+    const {
+        req, // $ hasUnderlyingType='express'.Request
+        e // $ hasUnderlyingType='express'
+    } = f;
+}
diff --git a/javascript/ql/test/library-tests/UnderlyingTypes/subtype.ts b/javascript/ql/test/library-tests/UnderlyingTypes/subtype.ts
new file mode 100644
index 00000000000..a23b85e3b81
--- /dev/null
+++ b/javascript/ql/test/library-tests/UnderlyingTypes/subtype.ts
@@ -0,0 +1,20 @@
+import * as express from 'express';
+
+interface MyRequest extends express.Request {
+
+}
+
+function t1(req: MyRequest) { // $ hasUnderlyingType='express'.Request
+}
+
+class MyRequestClass extends express.Request {
+}
+
+function t2(req: MyRequestClass) { // $ hasUnderlyingType='express'.Request
+}
+
+class MyRequestClass2 implements express.Request {
+}
+
+function t3(req: MyRequestClass2) { // $ hasUnderlyingType='express'.Request
+}
diff --git a/javascript/ql/test/library-tests/UnderlyingTypes/test.expected b/javascript/ql/test/library-tests/UnderlyingTypes/test.expected
new file mode 100644
index 00000000000..9525a32706b
--- /dev/null
+++ b/javascript/ql/test/library-tests/UnderlyingTypes/test.expected
@@ -0,0 +1,54 @@
+| calls.ts:6:5:6:16 | getRequest() | 'express'.Request |
+| calls.ts:12:5:12:23 | getRequestAmbient() | 'express'.Request |
+| calls.ts:20:5:20:14 | c.method() | 'express'.Request |
+| calls.ts:21:5:21:20 | new C().method() | 'express'.Request |
+| calls.ts:24:24:24:26 | req | 'express'.Request |
+| calls.ts:29:9:29:11 | req | 'express'.Request |
+| closure.use.js:9:13:9:13 | x | closure.lib.Foo |
+| closure.use.js:9:13:9:13 | x | closure.reexported.Foo |
+| closure.use.js:15:13:15:13 | x | closure.es.Bar |
+| closure.use.js:15:13:15:13 | x | closure.reexported.Bar |
+| contextualTypes.ts:4:12:4:14 | req | 'express'.Request |
+| contextualTypes.ts:11:16:11:18 | req | 'express'.Request |
+| contextualTypes.ts:18:16:18:18 | req | 'express'.Request |
+| contextualTypes.ts:21:16:21:18 | req | 'express'.Request |
+| contextualTypes.ts:27:16:27:18 | req | 'express'.Request |
+| contextualTypes.ts:34:20:34:22 | req | 'express'.Request |
+| contextualTypes.ts:41:16:41:18 | req | 'express'.Request |
+| expressBulkExport.use.ts:3:13:3:15 | req | 'express'.Request |
+| expressBulkExport.use.ts:6:13:6:15 | res | 'express'.Response |
+| expressExportAssign.use.ts:3:13:3:15 | req | 'express'.Request |
+| expressExportAssignWrapper.use.ts:3:13:3:15 | req | 'express'.Request |
+| expressSelectiveExport.use.ts:3:13:3:15 | req | 'express'.Request |
+| expressSelectiveExport.use.ts:9:13:9:15 | res | 'express'.Response |
+| expressWrapperExport.use.ts:10:13:10:15 | req | 'express'.Request |
+| expressWrapperExport.use.ts:13:13:13:15 | res | 'express'.Response |
+| expressWrapperExport.use.ts:16:13:16:15 | req | 'express'.Request |
+| expressWrapperExport.use.ts:19:13:19:15 | res | 'express'.Response |
+| expressWrapperExport.use.ts:28:13:28:13 | e | 'express' |
+| globals.ts:1:13:1:14 | el | HTMLElement |
+| globals.ts:6:13:6:14 | el | HTMLInputElement |
+| globals.ts:9:13:9:15 | req | Express.Request |
+| jsdoc.js:7:13:7:15 | req | 'express'.Request |
+| jsdoc.js:13:13:13:15 | res | 'express'.Response |
+| namedImport.ts:3:13:3:15 | req | 'express'.Request |
+| namespaceDecls.ts:14:13:14:13 | x | 'express'.Request |
+| namespaceDecls.ts:17:13:17:13 | x | 'express'.Request |
+| namespaceDecls.ts:20:13:20:13 | x | 'express' |
+| namespaceDecls.ts:23:13:23:13 | x | 'express' |
+| namespaceDecls.ts:26:13:26:13 | x | 'express' |
+| namespaceImport.ts:3:13:3:13 | e | 'express' |
+| namespaceImport.ts:6:13:6:15 | req | 'express'.Request |
+| namespaceImport.ts:9:13:9:15 | req | Request |
+| namespaceImport.ts:14:13:14:13 | e | 'express' |
+| props.ts:9:5:9:9 | f.req | 'express'.Request |
+| props.ts:10:5:10:7 | f.e | 'express' |
+| props.ts:13:9:13:11 | req | 'express'.Request |
+| props.ts:14:9:14:9 | e | 'express' |
+| subtype.ts:7:13:7:15 | req | 'express'.Request |
+| subtype.ts:13:13:13:15 | req | 'express'.Request |
+| subtype.ts:19:13:19:15 | req | 'express'.Request |
+| typeCast.ts:4:16:4:35 | e as express.Request | 'express'.Request |
+| typeCast.ts:5:16:5:33 | <express.Request>e | 'express'.Request |
+| typeCast.ts:6:16:6:42 | e satis ... Request | 'express'.Request |
+| varAssignment.ts:4:9:4:11 | req | 'express'.Request |
diff --git a/javascript/ql/test/library-tests/UnderlyingTypes/test.ql b/javascript/ql/test/library-tests/UnderlyingTypes/test.ql
new file mode 100644
index 00000000000..d3074111f91
--- /dev/null
+++ b/javascript/ql/test/library-tests/UnderlyingTypes/test.ql
@@ -0,0 +1,15 @@
+import javascript
+
+bindingset[x, y]
+private string join(string x, string y) {
+  if x = "" or y = "" then result = x + y else result = x + "." + y
+}
+
+query predicate hasUnderlyingType(DataFlow::SourceNode node, string value) {
+  node.hasUnderlyingType(value)
+  or
+  exists(string mod, string name |
+    node.hasUnderlyingType(mod, name) and
+    value = join("'" + mod + "'", name)
+  )
+}
diff --git a/javascript/ql/test/library-tests/UnderlyingTypes/test.qlref b/javascript/ql/test/library-tests/UnderlyingTypes/test.qlref
new file mode 100644
index 00000000000..ab6773f15f9
--- /dev/null
+++ b/javascript/ql/test/library-tests/UnderlyingTypes/test.qlref
@@ -0,0 +1,2 @@
+query: test.ql
+postprocess: utils/test/InlineExpectationsTestQuery.ql
diff --git a/javascript/ql/test/library-tests/UnderlyingTypes/tsconfig.json b/javascript/ql/test/library-tests/UnderlyingTypes/tsconfig.json
new file mode 100644
index 00000000000..82194fc7ab0
--- /dev/null
+++ b/javascript/ql/test/library-tests/UnderlyingTypes/tsconfig.json
@@ -0,0 +1,3 @@
+{
+    "include": ["."]
+}
diff --git a/javascript/ql/test/library-tests/UnderlyingTypes/typeCast.ts b/javascript/ql/test/library-tests/UnderlyingTypes/typeCast.ts
new file mode 100644
index 00000000000..09b6105d012
--- /dev/null
+++ b/javascript/ql/test/library-tests/UnderlyingTypes/typeCast.ts
@@ -0,0 +1,7 @@
+import * as express from 'express';
+
+function t1(e) {
+    var req1 = e as express.Request; // $ hasUnderlyingType='express'.Request
+    var req2 = <express.Request>e; // $ hasUnderlyingType='express'.Request
+    var req3 = e satisfies express.Request; // $ hasUnderlyingType='express'.Request
+}
diff --git a/javascript/ql/test/library-tests/UnderlyingTypes/varAssignment.ts b/javascript/ql/test/library-tests/UnderlyingTypes/varAssignment.ts
new file mode 100644
index 00000000000..c7160e16561
--- /dev/null
+++ b/javascript/ql/test/library-tests/UnderlyingTypes/varAssignment.ts
@@ -0,0 +1,5 @@
+import * as express from 'express';
+
+function t1(e) {
+    var req: express.Request = e; // $ hasUnderlyingType='express'.Request
+}
diff --git a/javascript/ql/test/library-tests/frameworks/Nest/test.expected b/javascript/ql/test/library-tests/frameworks/Nest/test.expected
index ff12967bec6..db49fc95eba 100644
--- a/javascript/ql/test/library-tests/frameworks/Nest/test.expected
+++ b/javascript/ql/test/library-tests/frameworks/Nest/test.expected
@@ -71,6 +71,9 @@ responseSendArgument
 | local/customPipe.ts:37:16:37:31 | '' + unsanitized |
 | local/customPipe.ts:42:16:42:31 | '' + unsanitized |
 | local/customPipe.ts:48:16:48:31 | '' + unsanitized |
+| local/routes.ts:7:12:7:16 | 'foo' |
+| local/routes.ts:12:12:12:16 | 'foo' |
+| local/routes.ts:17:12:17:16 | 'foo' |
 | local/routes.ts:32:31:32:31 | x |
 | local/routes.ts:33:31:33:38 | queryObj |
 | local/routes.ts:34:31:34:34 | name |
diff --git a/javascript/ql/test/query-tests/Declarations/SuspiciousMethodNameDeclaration/SuspiciousMethodNameDeclaration.expected b/javascript/ql/test/query-tests/Declarations/SuspiciousMethodNameDeclaration/SuspiciousMethodNameDeclaration.expected
index 3c827d16fce..ee80f65d1ad 100644
--- a/javascript/ql/test/query-tests/Declarations/SuspiciousMethodNameDeclaration/SuspiciousMethodNameDeclaration.expected
+++ b/javascript/ql/test/query-tests/Declarations/SuspiciousMethodNameDeclaration/SuspiciousMethodNameDeclaration.expected
@@ -2,3 +2,14 @@
 | tst.ts:16:3:16:21 | function(): number; | The member name 'function' does not declare a function, it declares a method named 'function'. |
 | tst.ts:37:3:37:21 | function(): number; | The member name 'function' does not declare a function, it declares a method named 'function'. |
 | tst.ts:48:3:48:13 | new(): Quz; | The member name 'new' does not declare a constructor, but 'constructor' does in class declarations. |
+| tst.ts:60:3:60:21 | function(): number; | The member name 'function' does not declare a function, it declares a method named 'function'. |
+| tst.ts:64:3:64:24 | constru ... number; | The member name 'constructor' does not declare a constructor in interfaces, but it does in classes. |
+| tst.ts:74:3:74:30 | functio ... string; | The member name 'function' does not declare a function, it declares a method named 'function'. |
+| tst.ts:75:3:75:30 | functio ... number; | The member name 'function' does not declare a function, it declares a method named 'function'. |
+| tst.ts:76:3:76:24 | functio ... ): any; | The member name 'function' does not declare a function, it declares a method named 'function'. |
+| tst.ts:80:3:80:23 | abstrac ... : void; | The member name 'new' does not declare a constructor, but 'constructor' does in class declarations. |
+| tst.ts:84:3:84:30 | abstrac ... number; | The member name 'function' does not declare a function, it declares a method named 'function'. |
+| tst.ts:93:5:93:21 | function(): void; | The member name 'function' does not declare a function, it declares a method named 'function'. |
+| tst.ts:98:3:98:21 | function(): number; | The member name 'function' does not declare a function, it declares a method named 'function'. |
+| tst.ts:110:3:110:24 | constru ... number; | The member name 'constructor' does not declare a constructor in interfaces, but it does in classes. |
+| tst.ts:116:3:116:24 | constru ... number; | The member name 'constructor' does not declare a constructor in interfaces, but it does in classes. |
diff --git a/javascript/ql/test/query-tests/Declarations/SuspiciousMethodNameDeclaration/tst.ts b/javascript/ql/test/query-tests/Declarations/SuspiciousMethodNameDeclaration/tst.ts
index e958681f935..12a6087b3a3 100644
--- a/javascript/ql/test/query-tests/Declarations/SuspiciousMethodNameDeclaration/tst.ts
+++ b/javascript/ql/test/query-tests/Declarations/SuspiciousMethodNameDeclaration/tst.ts
@@ -50,3 +50,70 @@ declare class Quz {
 
 var bla = new Foo();
 var blab = new Baz();
+
+
+interface X {
+  constructor: () => string; // Just a property, not a method.
+}
+
+type A = {
+  function(): number; // $ Alert
+};
+
+type B = {
+  constructor(): number; // $ Alert
+  new(): number;
+};
+
+class StaticMethods {
+  static function(): void {}
+  static new(): void {}
+}
+
+interface Overloaded {
+  function(x: string): string; // $Alert
+  function(x: number): number; // $Alert
+  function(x: any): any; // $Alert
+}
+
+abstract class AbstractFoo {
+  abstract new(): void; // $Alert
+}
+
+abstract class AbstractFooFunction {
+  abstract function(): number; // $Alert
+}
+
+abstract class AbstractFooConstructor {
+  constructor(){}
+}
+
+declare module "some-module" {
+  interface ModuleInterface {
+    function(): void;  // $Alert
+  }
+}
+
+type Intersection = {
+  function(): number; // $Alert
+} & {
+  other(): string;
+};
+
+type Union = {
+  new(): number;
+} | {
+  valid(): string;
+};
+
+type Union2 = {
+  constructor(): number; // $Alert
+} | {
+  valid(): string;
+};
+
+type Intersection2 = {
+  constructor(): number; // $Alert
+} & {
+  other(): string;
+};
diff --git a/javascript/ql/test/query-tests/Expressions/ExprHasNoEffect/ExprHasNoEffect.expected b/javascript/ql/test/query-tests/Expressions/ExprHasNoEffect/ExprHasNoEffect.expected
index 853e781c88e..f1beafe0037 100644
--- a/javascript/ql/test/query-tests/Expressions/ExprHasNoEffect/ExprHasNoEffect.expected
+++ b/javascript/ql/test/query-tests/Expressions/ExprHasNoEffect/ExprHasNoEffect.expected
@@ -1,3 +1,4 @@
+| dom.js:2:33:2:50 | a.clientTop === !0 | This expression has no effect. |
 | try.js:22:9:22:26 | x.ordinaryProperty | This expression has no effect. |
 | tst2.js:2:4:2:4 | 0 | This expression has no effect. |
 | tst.js:3:1:3:2 | 23 | This expression has no effect. |
@@ -11,4 +12,4 @@
 | tst.js:50:3:50:36 | new Err ... age(e)) | This expression has no effect. |
 | tst.js:61:2:61:20 | o.trivialNonGetter1 | This expression has no effect. |
 | tst.js:77:24:77:24 | o | This expression has no effect. |
-| uselessfn.js:1:1:1:26 | (functi ... .");\\n}) | This expression has no effect. |
+| uselessfn.js:1:2:1:26 | functio ... d.");\\n} | This expression has no effect. |
diff --git a/javascript/ql/test/query-tests/Expressions/ExprHasNoEffect/dom.js b/javascript/ql/test/query-tests/Expressions/ExprHasNoEffect/dom.js
new file mode 100644
index 00000000000..5d22e4a0bed
--- /dev/null
+++ b/javascript/ql/test/query-tests/Expressions/ExprHasNoEffect/dom.js
@@ -0,0 +1,7 @@
+function f(){
+    a.clientTop && a.clientTop, a.clientTop === !0; //$Alert
+    a && a.clientTop;
+    a.clientTop, a.clientTop;
+    if(a) return a.clientTop && a.clientTop, a.clientTop === !0;
+    if(b) return b && (b.clientTop, b.clientTop && b.clientTop), null;
+}
diff --git a/javascript/ql/test/query-tests/Expressions/ExprHasNoEffect/tst.js b/javascript/ql/test/query-tests/Expressions/ExprHasNoEffect/tst.js
index a91759e553f..6de5ac9a236 100644
--- a/javascript/ql/test/query-tests/Expressions/ExprHasNoEffect/tst.js
+++ b/javascript/ql/test/query-tests/Expressions/ExprHasNoEffect/tst.js
@@ -79,4 +79,9 @@ function g() {
 
 	consume(testSomeCondition() ? o :
 		doSomethingDangerous());
+
+	("release" === isRelease() ? warning() : null);
+	"release" === isRelease() ? warning() : null;
+	"release" === isRelease() ? warning() : 0;
+	"release" === isRelease() ? warning() : undefined;
 };
diff --git a/javascript/ql/test/query-tests/Expressions/ExprHasNoEffect/uselessfn.js b/javascript/ql/test/query-tests/Expressions/ExprHasNoEffect/uselessfn.js
index 341644bf649..e47a25458d4 100644
--- a/javascript/ql/test/query-tests/Expressions/ExprHasNoEffect/uselessfn.js
+++ b/javascript/ql/test/query-tests/Expressions/ExprHasNoEffect/uselessfn.js
@@ -1,3 +1,3 @@
 (function f() { // $ Alert
   console.log("I'm never called.");
-})
\ No newline at end of file
+})
diff --git a/javascript/ql/test/query-tests/RegExp/DuplicateCharacterInCharacterClass/DuplicateCharacterInCharacterClass.expected b/javascript/ql/test/query-tests/RegExp/DuplicateCharacterInCharacterClass/DuplicateCharacterInCharacterClass.expected
index 1857b9cc4df..96f2cf20fd9 100644
--- a/javascript/ql/test/query-tests/RegExp/DuplicateCharacterInCharacterClass/DuplicateCharacterInCharacterClass.expected
+++ b/javascript/ql/test/query-tests/RegExp/DuplicateCharacterInCharacterClass/DuplicateCharacterInCharacterClass.expected
@@ -7,3 +7,39 @@
 | tst.js:8:3:8:3 | a | Character 'a' is $@. | tst.js:8:5:8:5 | a | repeated in the same character class |
 | tst.js:9:3:9:6 | \\x0a | Character '\\x0a' is $@. | tst.js:9:7:9:10 | \\x0a | repeated in the same character class |
 | tst.js:10:3:10:8 | \\u000a | Character '\\u000a' is $@. | tst.js:10:9:10:10 | \\n | repeated in the same character class |
+| tst.js:15:4:15:4 | \| | Character '\|' is $@. | tst.js:15:6:15:6 | \| | repeated in the same character class |
+| tst.js:16:3:16:3 | : | Character ':' is $@. | tst.js:16:9:16:9 | : | repeated in the same character class |
+| tst.js:17:4:17:4 | ^ | Character '^' is $@. | tst.js:17:11:17:11 | ^ | repeated in the same character class |
+| tst.js:17:5:17:5 | s | Character 's' is $@. | tst.js:17:12:17:12 | s | repeated in the same character class |
+| tst.js:17:6:17:6 | t | Character 't' is $@. | tst.js:17:13:17:13 | t | repeated in the same character class |
+| tst.js:17:6:17:6 | t | Character 't' is $@. | tst.js:17:15:17:15 | t | repeated in the same character class |
+| tst.js:17:6:17:6 | t | Character 't' is $@. | tst.js:17:19:17:19 | t | repeated in the same character class |
+| tst.js:17:7:17:7 | y | Character 'y' is $@. | tst.js:17:20:17:20 | y | repeated in the same character class |
+| tst.js:17:8:17:8 | l | Character 'l' is $@. | tst.js:17:21:17:21 | l | repeated in the same character class |
+| tst.js:17:9:17:9 | e | Character 'e' is $@. | tst.js:17:22:17:22 | e | repeated in the same character class |
+| tst.js:18:3:18:3 | . | Character '.' is $@. | tst.js:18:5:18:5 | . | repeated in the same character class |
+| tst.js:19:6:19:6 | \u0645 | Character '\u0645' is $@. | tst.js:19:8:19:8 | \u0645 | repeated in the same character class |
+| tst.js:22:3:22:4 | \\p | Character '\\p' is $@. | tst.js:22:15:22:16 | \\p | repeated in the same character class |
+| tst.js:22:5:22:5 | { | Character '{' is $@. | tst.js:22:17:22:17 | { | repeated in the same character class |
+| tst.js:22:7:22:7 | e | Character 'e' is $@. | tst.js:22:10:22:10 | e | repeated in the same character class |
+| tst.js:22:8:22:8 | t | Character 't' is $@. | tst.js:22:9:22:9 | t | repeated in the same character class |
+| tst.js:22:12:22:12 | } | Character '}' is $@. | tst.js:22:23:22:23 | } | repeated in the same character class |
+| tst.js:22:13:22:13 | & | Character '&' is $@. | tst.js:22:14:22:14 | & | repeated in the same character class |
+| tst.js:22:21:22:21 | I | Character 'I' is $@. | tst.js:22:22:22:22 | I | repeated in the same character class |
+| tst.js:26:3:26:4 | \\p | Character '\\p' is $@. | tst.js:26:13:26:14 | \\p | repeated in the same character class |
+| tst.js:26:5:26:5 | { | Character '{' is $@. | tst.js:26:15:26:15 | { | repeated in the same character class |
+| tst.js:26:7:26:7 | e | Character 'e' is $@. | tst.js:26:10:26:10 | e | repeated in the same character class |
+| tst.js:26:7:26:7 | e | Character 'e' is $@. | tst.js:26:17:26:17 | e | repeated in the same character class |
+| tst.js:26:7:26:7 | e | Character 'e' is $@. | tst.js:26:28:26:28 | e | repeated in the same character class |
+| tst.js:26:8:26:8 | t | Character 't' is $@. | tst.js:26:9:26:9 | t | repeated in the same character class |
+| tst.js:26:11:26:11 | r | Character 'r' is $@. | tst.js:26:29:26:29 | r | repeated in the same character class |
+| tst.js:26:12:26:12 | } | Character '}' is $@. | tst.js:26:30:26:30 | } | repeated in the same character class |
+| tst.js:26:20:26:20 | m | Character 'm' is $@. | tst.js:26:26:26:26 | m | repeated in the same character class |
+| tst.js:28:3:28:3 | / | Character '/' is $@. | tst.js:28:5:28:5 | / | repeated in the same character class |
+| tst.js:30:4:30:4 | ^ | Character '^' is $@. | tst.js:30:5:30:5 | ^ | repeated in the same character class |
+| tst.js:31:4:31:4 | * | Character '*' is $@. | tst.js:31:5:31:5 | * | repeated in the same character class |
+| tst.js:33:5:33:5 | \| | Character '\|' is $@. | tst.js:33:6:33:7 | \\\| | repeated in the same character class |
+| tst_replace.js:3:26:3:26 | n | Character 'n' is $@. | tst_replace.js:3:28:3:28 | n | repeated in the same character class |
+| tst_replace.js:11:18:11:18 | n | Character 'n' is $@. | tst_replace.js:11:20:11:20 | n | repeated in the same character class |
+| tst_replace.js:25:18:25:18 | n | Character 'n' is $@. | tst_replace.js:25:20:25:20 | n | repeated in the same character class |
+| tst_replace.js:42:18:42:18 | n | Character 'n' is $@. | tst_replace.js:42:20:42:20 | n | repeated in the same character class |
diff --git a/javascript/ql/test/query-tests/RegExp/DuplicateCharacterInCharacterClass/tst.js b/javascript/ql/test/query-tests/RegExp/DuplicateCharacterInCharacterClass/tst.js
index c87c7140a16..fe291137c8a 100644
--- a/javascript/ql/test/query-tests/RegExp/DuplicateCharacterInCharacterClass/tst.js
+++ b/javascript/ql/test/query-tests/RegExp/DuplicateCharacterInCharacterClass/tst.js
@@ -3,12 +3,31 @@
 /[\uDC3A\uDC3C]/;
 /[??]/; // $ Alert
 /[\u003F\u003f]/; // $ Alert
-/[\u003F?]/; // $ Alert
+/[\u003F?]/; // $ Alert -- \u003F evaluates to ?, which is the same as ? in the character class
 /[\x3f\u003f]/; // $ Alert
 /[aaa]/; // $ Alert
 /[\x0a\x0a]/; // $ Alert
-/[\u000a\n]/; // $ Alert
+/[\u000a\n]/; // $ Alert -- \u000a evaluates to \n, which is the same as \n in the character class
 /[\u{ff}]/;
 /[\u{12340}-\u{12345}]/u;
 new RegExp("[\u{12340}-\u{12345}]", "u");
 const regex = /\b(?:https?:\/\/|mailto:|www\.)(?:[\S--[\p{P}<>]]|\/|[\S--[\[\]]]+[\S--[\p{P}<>]])+|\b[\S--[@\p{Ps}\p{Pe}<>]]+@([\S--[\p{P}<>]]+(?:\.[\S--[\p{P}<>]]+)+)/gmv;
+/[a|b|c]/; // $ Alert -- Repeated | character in character class, which has no special meaning in this context
+/[:alnum:]/; // $ Alert -- JavaScript does not support POSIX character classes like `[:alnum:]` in regular expressions, thus characters in the class are treated as literals
+/[(^style|^staticStyle)]/; // $ Alert
+/[.x.]/i; // $ Alert -- Repeated . character in character class
+/^[يفمأمسند]/i; // $ Alert -- م duplicate
+/[\u{1F600}-\u{1F64F}]/u;
+/[\p{Letter}&&\p{ASCII}]/v; // && is an intersection operator while /v flag is present
+/[\p{Letter}&&\p{ASCII}]/; // $ Alert -- without /v flag, && is not a valid operator and treated as member of character class thus duplicate
+/[\p{Decimal_Number}&&[0-9A-F]]/v;
+/[\p{Letter}--[aeiouAEIOU]]/v;
+/[\p{Letter}\p{Decimal_Number}]/v; // Union operation between two character classes only with /v flag
+/[\p{Letter}\p{Decimal_Number}]/; // $ Alert -- without /v flag, this is not a valid operation and treated as member of character class thus duplicate
+/[\[\]]/;
+/[/[/]]/; // $ Alert
+/[^^abc]/; // First `^` is a negation operator, second treated as literal `^` is a member of character class
+/[^^^abc]/; // $ Alert -- Second and third `^` are treated as literals thus duplicates
+/[^**]/; // $ Alert
+/[-a-z]/; // Matches `-` and range `a-z` no duplicate
+/^[:|\|]/ // $ Alert -- `|` is treated as a literal character in the character class, thus duplicate even with escape character
diff --git a/javascript/ql/test/query-tests/RegExp/DuplicateCharacterInCharacterClass/tst_replace.js b/javascript/ql/test/query-tests/RegExp/DuplicateCharacterInCharacterClass/tst_replace.js
new file mode 100644
index 00000000000..afd526007b0
--- /dev/null
+++ b/javascript/ql/test/query-tests/RegExp/DuplicateCharacterInCharacterClass/tst_replace.js
@@ -0,0 +1,44 @@
+function reg(){
+  const nonIdPattern = 'a-z';
+  const basePattern = /[<nonId>]/.source; // $ SPURIOUS:Alert
+  const finalPattern = basePattern.replace(/<nonId>/g, nonIdPattern);
+  console.log(finalPattern);
+  const regex2 = new RegExp(finalPattern);
+}
+
+function reg1(){
+  const nonIdPattern = 'a-z';
+  const reg = /[<nonId>]/; // $ SPURIOUS:Alert
+  const basePattern = reg.source;
+  const finalPattern = basePattern.replace(/<nonId>/g, nonIdPattern);
+  console.log(finalPattern);
+  const regex2 = new RegExp(finalPattern);
+}
+
+function replacer(reg1, reg2){
+  const basePattern = reg1.source;
+  const finalPattern = basePattern.replace(/<nonId>/g, reg2);
+  return new RegExp(finalPattern);
+}
+function reg2(){
+  const nonIdPattern = 'a-z';
+  const reg = /[<nonId>]/; // $ SPURIOUS:Alert
+  replacer(reg, nonIdPattern);
+}
+
+
+function replacer3(str, reg2){
+  const finalPattern = str.replace(/<nonId>/g, reg2);
+  return new RegExp(finalPattern);
+}
+
+function replacer2(reg1, reg2){
+  const basePattern = reg1.source;
+  return replacer3(basePattern, reg2);
+}
+
+function reg3(){
+  const nonIdPattern = 'a-z';
+  const reg = /[<nonId>]/; // $ SPURIOUS:Alert
+  replacer2(reg, nonIdPattern);
+}
diff --git a/javascript/ql/test/query-tests/Security/CWE-079/DomBasedXss/Xss.expected b/javascript/ql/test/query-tests/Security/CWE-079/DomBasedXss/Xss.expected
index 6ba8ab703bf..0f565949211 100644
--- a/javascript/ql/test/query-tests/Security/CWE-079/DomBasedXss/Xss.expected
+++ b/javascript/ql/test/query-tests/Security/CWE-079/DomBasedXss/Xss.expected
@@ -62,6 +62,8 @@
 | dragAndDrop.ts:73:29:73:39 | droppedHtml | dragAndDrop.ts:71:27:71:61 | e.dataT ... /html') | dragAndDrop.ts:73:29:73:39 | droppedHtml | Cross-site scripting vulnerability due to $@. | dragAndDrop.ts:71:27:71:61 | e.dataT ... /html') | user-provided value |
 | event-handler-receiver.js:2:31:2:83 | '<h2><a ... ></h2>' | event-handler-receiver.js:2:49:2:61 | location.href | event-handler-receiver.js:2:31:2:83 | '<h2><a ... ></h2>' | Cross-site scripting vulnerability due to $@. | event-handler-receiver.js:2:49:2:61 | location.href | user-provided value |
 | express.js:6:15:6:33 | req.param("wobble") | express.js:6:15:6:33 | req.param("wobble") | express.js:6:15:6:33 | req.param("wobble") | Cross-site scripting vulnerability due to $@. | express.js:6:15:6:33 | req.param("wobble") | user-provided value |
+| jquery-declare-any.ts:6:7:6:17 | window.name | jquery-declare-any.ts:6:7:6:17 | window.name | jquery-declare-any.ts:6:7:6:17 | window.name | Cross-site scripting vulnerability due to $@. | jquery-declare-any.ts:6:7:6:17 | window.name | user-provided value |
+| jquery-declare-type.ts:6:7:6:17 | window.name | jquery-declare-type.ts:6:7:6:17 | window.name | jquery-declare-type.ts:6:7:6:17 | window.name | Cross-site scripting vulnerability due to $@. | jquery-declare-type.ts:6:7:6:17 | window.name | user-provided value |
 | jquery.js:7:5:7:34 | "<div i ... + "\\">" | jquery.js:2:17:2:40 | documen ... .search | jquery.js:7:5:7:34 | "<div i ... + "\\">" | Cross-site scripting vulnerability due to $@. | jquery.js:2:17:2:40 | documen ... .search | user-provided value |
 | jquery.js:8:18:8:34 | "XSS: " + tainted | jquery.js:2:17:2:40 | documen ... .search | jquery.js:8:18:8:34 | "XSS: " + tainted | Cross-site scripting vulnerability due to $@. | jquery.js:2:17:2:40 | documen ... .search | user-provided value |
 | jquery.js:10:5:10:40 | "<b>" + ...  "</b>" | jquery.js:10:13:10:20 | location | jquery.js:10:5:10:40 | "<b>" + ...  "</b>" | Cross-site scripting vulnerability due to $@. | jquery.js:10:13:10:20 | location | user-provided value |
@@ -954,6 +956,8 @@ nodes
 | event-handler-receiver.js:2:31:2:83 | '<h2><a ... ></h2>' | semmle.label | '<h2><a ... ></h2>' |
 | event-handler-receiver.js:2:49:2:61 | location.href | semmle.label | location.href |
 | express.js:6:15:6:33 | req.param("wobble") | semmle.label | req.param("wobble") |
+| jquery-declare-any.ts:6:7:6:17 | window.name | semmle.label | window.name |
+| jquery-declare-type.ts:6:7:6:17 | window.name | semmle.label | window.name |
 | jquery.js:2:7:2:40 | tainted | semmle.label | tainted |
 | jquery.js:2:17:2:40 | documen ... .search | semmle.label | documen ... .search |
 | jquery.js:4:5:4:11 | tainted | semmle.label | tainted |
diff --git a/javascript/ql/test/query-tests/Security/CWE-079/DomBasedXss/XssWithAdditionalSources.expected b/javascript/ql/test/query-tests/Security/CWE-079/DomBasedXss/XssWithAdditionalSources.expected
index 0ed15b8d92a..c031b7c1810 100644
--- a/javascript/ql/test/query-tests/Security/CWE-079/DomBasedXss/XssWithAdditionalSources.expected
+++ b/javascript/ql/test/query-tests/Security/CWE-079/DomBasedXss/XssWithAdditionalSources.expected
@@ -182,6 +182,8 @@ nodes
 | hana.js:85:35:85:54 | tableRows[0].comment | semmle.label | tableRows[0].comment |
 | hana.js:90:33:90:34 | rs | semmle.label | rs |
 | hana.js:90:33:90:45 | rs[0].comment | semmle.label | rs[0].comment |
+| jquery-declare-any.ts:6:7:6:17 | window.name | semmle.label | window.name |
+| jquery-declare-type.ts:6:7:6:17 | window.name | semmle.label | window.name |
 | jquery.js:2:7:2:40 | tainted | semmle.label | tainted |
 | jquery.js:2:17:2:40 | documen ... .search | semmle.label | documen ... .search |
 | jquery.js:4:5:4:11 | tainted | semmle.label | tainted |
diff --git a/javascript/ql/test/query-tests/Security/CWE-079/DomBasedXss/jquery-declare-any.ts b/javascript/ql/test/query-tests/Security/CWE-079/DomBasedXss/jquery-declare-any.ts
new file mode 100644
index 00000000000..df8267bba30
--- /dev/null
+++ b/javascript/ql/test/query-tests/Security/CWE-079/DomBasedXss/jquery-declare-any.ts
@@ -0,0 +1,7 @@
+import 'dummy';
+
+declare var $: any;
+
+function t() {
+    $(window.name); // $ Alert
+}
diff --git a/javascript/ql/test/query-tests/Security/CWE-079/DomBasedXss/jquery-declare-type.ts b/javascript/ql/test/query-tests/Security/CWE-079/DomBasedXss/jquery-declare-type.ts
new file mode 100644
index 00000000000..c866f71a1eb
--- /dev/null
+++ b/javascript/ql/test/query-tests/Security/CWE-079/DomBasedXss/jquery-declare-type.ts
@@ -0,0 +1,7 @@
+import 'dummy';
+
+declare var $: JQueryStatic;
+
+function t() {
+    $(window.name); // $ Alert
+}
diff --git a/javascript/ql/test/query-tests/Security/CWE-079/UnsafeHtmlConstruction/UnsafeHtmlConstruction.expected b/javascript/ql/test/query-tests/Security/CWE-079/UnsafeHtmlConstruction/UnsafeHtmlConstruction.expected
index 499cf6cce49..4f757d1a931 100644
--- a/javascript/ql/test/query-tests/Security/CWE-079/UnsafeHtmlConstruction/UnsafeHtmlConstruction.expected
+++ b/javascript/ql/test/query-tests/Security/CWE-079/UnsafeHtmlConstruction/UnsafeHtmlConstruction.expected
@@ -22,7 +22,6 @@
 | main.js:111:37:111:37 | x | main.js:98:43:98:43 | x | main.js:111:37:111:37 | x | This markdown rendering which depends on $@ might later allow $@. | main.js:98:43:98:43 | x | library input | main.js:112:24:112:26 | svg | cross-site scripting |
 | main.js:117:34:117:34 | s | main.js:116:47:116:47 | s | main.js:117:34:117:34 | s | This markdown rendering which depends on $@ might later allow $@. | main.js:116:47:116:47 | s | library input | main.js:118:53:118:56 | html | cross-site scripting |
 | typed.ts:2:29:2:29 | s | typed.ts:1:39:1:39 | s | typed.ts:2:29:2:29 | s | This HTML construction which depends on $@ might later allow $@. | typed.ts:1:39:1:39 | s | library input | typed.ts:3:31:3:34 | html | cross-site scripting |
-| typed.ts:8:40:8:40 | s | typed.ts:6:43:6:43 | s | typed.ts:8:40:8:40 | s | This HTML construction which depends on $@ might later allow $@. | typed.ts:6:43:6:43 | s | library input | typed.ts:8:29:8:52 | "<span> ... /span>" | cross-site scripting |
 edges
 | jquery-plugin.js:11:27:11:31 | stuff | jquery-plugin.js:14:31:14:35 | stuff | provenance |  |
 | jquery-plugin.js:11:34:11:40 | options | jquery-plugin.js:12:31:12:37 | options | provenance |  |
@@ -69,7 +68,6 @@ edges
 | main.js:98:43:98:43 | x | main.js:111:37:111:37 | x | provenance |  |
 | main.js:116:47:116:47 | s | main.js:117:34:117:34 | s | provenance |  |
 | typed.ts:1:39:1:39 | s | typed.ts:2:29:2:29 | s | provenance |  |
-| typed.ts:6:43:6:43 | s | typed.ts:8:40:8:40 | s | provenance |  |
 nodes
 | jquery-plugin.js:11:27:11:31 | stuff | semmle.label | stuff |
 | jquery-plugin.js:11:34:11:40 | options | semmle.label | options |
@@ -128,6 +126,4 @@ nodes
 | main.js:117:34:117:34 | s | semmle.label | s |
 | typed.ts:1:39:1:39 | s | semmle.label | s |
 | typed.ts:2:29:2:29 | s | semmle.label | s |
-| typed.ts:6:43:6:43 | s | semmle.label | s |
-| typed.ts:8:40:8:40 | s | semmle.label | s |
 subpaths
diff --git a/javascript/ql/test/query-tests/Security/CWE-079/UnsafeHtmlConstruction/typed.ts b/javascript/ql/test/query-tests/Security/CWE-079/UnsafeHtmlConstruction/typed.ts
index 1c50460050c..8c166fb243f 100644
--- a/javascript/ql/test/query-tests/Security/CWE-079/UnsafeHtmlConstruction/typed.ts
+++ b/javascript/ql/test/query-tests/Security/CWE-079/UnsafeHtmlConstruction/typed.ts
@@ -3,9 +3,9 @@ export function basicHtmlConstruction(s: string) { // $ Source
     document.body.innerHTML = html;
 }
 
-export function insertIntoCreatedDocument(s: string) { // $ Source
+export function insertIntoCreatedDocument(s: string) {
     const newDoc = document.implementation.createHTMLDocument("");
-    newDoc.body.innerHTML = "<span>" + s + "</span>"; // $ SPURIOUS: Alert - inserted into document disconnected from the main DOM.
+    newDoc.body.innerHTML = "<span>" + s + "</span>"; // OK - inserted into document disconnected from the main DOM.
 }
 
 export function id(s: string) {
@@ -17,4 +17,3 @@ export function notVulnerable() {
     const html = "<span>" + s + "</span>";
     document.body.innerHTML = html;
 }
- 
\ No newline at end of file
diff --git a/javascript/ql/test/query-tests/definitions/definitions.expected b/javascript/ql/test/query-tests/definitions/definitions.expected
index 081db47c3fa..cb91ac6e37c 100644
--- a/javascript/ql/test/query-tests/definitions/definitions.expected
+++ b/javascript/ql/test/query-tests/definitions/definitions.expected
@@ -1,36 +1,36 @@
 | b.js:3:3:3:3 | x | b.js:2:7:2:7 | x | V |
-| b.js:7:1:7:1 | f | b.js:1:1:5:1 | functio ... ar x;\\n} | M |
-| b.js:8:1:8:1 | g | a.js:2:1:2:15 | function g() {} | M |
+| b.js:7:1:7:1 | f | b.js:1:10:1:10 | f | M |
+| b.js:8:1:8:1 | g | a.js:2:10:2:10 | g | M |
 | client.ts:1:22:1:30 | "./tslib" | tslib.ts:1:1:10:0 | <toplevel> | I |
-| client.ts:7:19:7:19 | C | tslib.ts:1:8:3:1 | class C {\\n  m() {}\\n} | T |
-| client.ts:8:10:8:10 | C | client.ts:3:1:5:1 | class C {\\n  m() {}\\n} | T |
-| client.ts:9:16:9:16 | C | client.ts:3:1:5:1 | class C {\\n  m() {}\\n} | T |
-| client.ts:10:16:10:16 | C | tslib.ts:6:10:8:3 | class C ...  {}\\n  } | T |
-| client.ts:13:25:13:25 | C | client.ts:3:1:5:1 | class C {\\n  m() {}\\n} | T |
-| client.ts:13:35:13:35 | C | tslib.ts:1:8:3:1 | class C {\\n  m() {}\\n} | T |
-| client.ts:13:47:13:47 | C | tslib.ts:6:10:8:3 | class C ...  {}\\n  } | T |
+| client.ts:7:19:7:19 | C | tslib.ts:1:14:1:14 | C | T |
+| client.ts:8:10:8:10 | C | client.ts:3:7:3:7 | C | T |
+| client.ts:9:16:9:16 | C | client.ts:3:7:3:7 | C | T |
+| client.ts:10:16:10:16 | C | tslib.ts:6:16:6:16 | C | T |
+| client.ts:13:25:13:25 | C | client.ts:3:7:3:7 | C | T |
+| client.ts:13:35:13:35 | C | tslib.ts:1:14:1:14 | C | T |
+| client.ts:13:47:13:47 | C | tslib.ts:6:16:6:16 | C | T |
 | client.ts:14:3:14:3 | x | client.ts:13:22:13:22 | x | V |
-| client.ts:14:5:14:5 | m | client.ts:4:3:4:8 | m() {} | M |
+| client.ts:14:5:14:5 | m | client.ts:4:3:4:3 | m | M |
 | client.ts:15:3:15:3 | y | client.ts:13:28:13:28 | y | V |
-| client.ts:15:5:15:5 | m | tslib.ts:2:3:2:8 | m() {} | M |
+| client.ts:15:5:15:5 | m | tslib.ts:2:3:2:3 | m | M |
 | client.ts:16:3:16:3 | z | client.ts:13:38:13:38 | z | V |
-| client.ts:16:5:16:5 | m | tslib.ts:7:5:7:10 | m() {} | M |
+| client.ts:16:5:16:5 | m | tslib.ts:7:5:7:5 | m | M |
 | d.js:1:17:1:21 | './c' | c.js:1:1:1:20 | <toplevel> | I |
-| d.js:10:1:10:1 | A | d.js:7:1:9:1 | functio ... = 42;\\n} | V |
-| d.js:16:19:16:23 | Super | d.js:12:1:14:1 | class S ... () {}\\n} | V |
+| d.js:10:1:10:1 | A | d.js:7:10:7:10 | A | V |
+| d.js:16:19:16:23 | Super | d.js:12:7:12:11 | Super | V |
 | d.js:16:25:16:24 | args | d.js:16:25:16:24 | args | V |
 | d.js:20:1:20:1 | o | d.js:3:9:5:1 | {\\n  f:  ... () {}\\n} | V |
 | d.js:20:3:20:3 | f | d.js:4:3:4:18 | f: function() {} | M |
-| d.js:22:13:22:13 | A | d.js:7:1:9:1 | functio ... = 42;\\n} | M |
+| d.js:22:13:22:13 | A | d.js:7:10:7:10 | A | M |
 | d.js:23:1:23:1 | a | d.js:22:5:22:5 | a | V |
 | d.js:23:3:23:3 | x | d.js:8:3:8:8 | this.x | M |
 | d.js:24:1:24:1 | a | d.js:22:5:22:5 | a | V |
 | d.js:24:3:24:3 | g | d.js:10:1:10:13 | A.prototype.g | M |
-| d.js:26:13:26:15 | Sub | d.js:16:1:18:1 | class S ... () {}\\n} | M |
+| d.js:26:13:26:15 | Sub | d.js:16:7:16:9 | Sub | M |
 | d.js:27:1:27:1 | x | d.js:26:5:26:5 | x | V |
 | d.js:27:3:27:3 | m | d.js:13:3:13:3 | m | M |
 | d.js:28:1:28:1 | x | d.js:26:5:26:5 | x | V |
 | d.js:28:3:28:3 | n | d.js:17:3:17:3 | n | M |
 | tst.js:1:19:1:23 | './m' | m.js:1:1:2:0 | <toplevel> | I |
-| tst.js:3:5:3:5 | A | m.js:1:8:1:17 | class A {} | M |
+| tst.js:3:5:3:5 | A | m.js:1:14:1:14 | A | M |
 | tst.js:5:15:5:19 | './m' | m.js:1:1:2:0 | <toplevel> | I |
diff --git a/misc/codegen/templates/rust_classes.mustache b/misc/codegen/templates/rust_classes.mustache
index 0fa29b1eb69..77a0335da51 100644
--- a/misc/codegen/templates/rust_classes.mustache
+++ b/misc/codegen/templates/rust_classes.mustache
@@ -63,8 +63,8 @@ pub struct {{name}} {
 
 impl {{name}} {
 {{#detached_fields}}
-    pub fn emit_{{singular_field_name}}(id: trap::Label<Self>, {{#is_repeated}}{{^is_unordered}}i: usize, {{/is_unordered}}{{/is_repeated}}value: {{base_type}}, out: &mut trap::Writer) {
-        out.add_tuple("{{table_name}}", vec![id.into(), {{#is_repeated}}{{^is_unordered}}i.into(), {{/is_unordered}}{{/is_repeated}}value.into()]);
+    pub fn emit_{{singular_field_name}}(id: trap::Label<Self>{{^is_predicate}}{{#is_repeated}}{{^is_unordered}}, i: usize{{/is_unordered}}{{/is_repeated}}, value: {{base_type}}{{/is_predicate}}, out: &mut trap::Writer) {
+        out.add_tuple("{{table_name}}", vec![id.into(){{^is_predicate}}{{#is_repeated}}{{^is_unordered}}, i.into(){{/is_unordered}}{{/is_repeated}}, value.into(){{/is_predicate}}]);
     }
 {{/detached_fields}}
 }
diff --git a/misc/scripts/models-as-data/bulk_generate_mad.py b/misc/scripts/models-as-data/bulk_generate_mad.py
old mode 100644
new mode 100755
index 22a872dc2bf..dfccf087803
--- a/misc/scripts/models-as-data/bulk_generate_mad.py
+++ b/misc/scripts/models-as-data/bulk_generate_mad.py
@@ -1,3 +1,4 @@
+#!/usr/bin/env python3
 """
 Experimental script for bulk generation of MaD models based on a list of projects.
 
@@ -7,15 +8,31 @@ Note: This file must be formatted using the Black Python formatter.
 import os.path
 import subprocess
 import sys
-from typing import NotRequired, TypedDict, List
+from typing import Required, TypedDict, List, Callable, Optional
 from concurrent.futures import ThreadPoolExecutor, as_completed
 import time
 import argparse
-import json
-import requests
 import zipfile
 import tarfile
-from functools import cmp_to_key
+import shutil
+
+
+def missing_module(module_name: str) -> None:
+    print(
+        f"ERROR: {module_name} is not installed. Please install it with 'pip install {module_name}'."
+    )
+    sys.exit(1)
+
+
+try:
+    import yaml
+except ImportError:
+    missing_module("pyyaml")
+
+try:
+    import requests
+except ImportError:
+    missing_module("requests")
 
 import generate_mad as mad
 
@@ -28,22 +45,18 @@ build_dir = os.path.join(gitroot, "mad-generation-build")
 
 
 # A project to generate models for
-class Project(TypedDict):
-    """
-    Type definition for projects (acquired via a GitHub repo) to model.
-
-    Attributes:
-        name: The name of the project
-        git_repo: URL to the git repository
-        git_tag: Optional Git tag to check out
-    """
-
-    name: str
-    git_repo: NotRequired[str]
-    git_tag: NotRequired[str]
-    with_sinks: NotRequired[bool]
-    with_sinks: NotRequired[bool]
-    with_summaries: NotRequired[bool]
+Project = TypedDict(
+    "Project",
+    {
+        "name": Required[str],
+        "git-repo": str,
+        "git-tag": str,
+        "with-sinks": bool,
+        "with-sources": bool,
+        "with-summaries": bool,
+    },
+    total=False,
+)
 
 
 def should_generate_sinks(project: Project) -> bool:
@@ -63,14 +76,14 @@ def clone_project(project: Project) -> str:
     Shallow clone a project into the build directory.
 
     Args:
-        project: A dictionary containing project information with 'name', 'git_repo', and optional 'git_tag' keys.
+        project: A dictionary containing project information with 'name', 'git-repo', and optional 'git-tag' keys.
 
     Returns:
         The path to the cloned project directory.
     """
     name = project["name"]
-    repo_url = project["git_repo"]
-    git_tag = project.get("git_tag")
+    repo_url = project["git-repo"]
+    git_tag = project.get("git-tag")
 
     # Determine target directory
     target_dir = os.path.join(build_dir, name)
@@ -103,6 +116,39 @@ def clone_project(project: Project) -> str:
     return target_dir
 
 
+def run_in_parallel[
+    T, U
+](
+    func: Callable[[T], U],
+    items: List[T],
+    *,
+    on_error=lambda item, exc: None,
+    error_summary=lambda failures: None,
+    max_workers=8,
+) -> List[Optional[U]]:
+    if not items:
+        return []
+    max_workers = min(max_workers, len(items))
+    results = [None for _ in range(len(items))]
+    with ThreadPoolExecutor(max_workers=max_workers) as executor:
+        # Start cloning tasks and keep track of them
+        futures = {
+            executor.submit(func, item): index for index, item in enumerate(items)
+        }
+        # Process results as they complete
+        for future in as_completed(futures):
+            index = futures[future]
+            try:
+                results[index] = future.result()
+            except Exception as e:
+                on_error(items[index], e)
+    failed = [item for item, result in zip(items, results) if result is None]
+    if failed:
+        error_summary(failed)
+        sys.exit(1)
+    return results
+
+
 def clone_projects(projects: List[Project]) -> List[tuple[Project, str]]:
     """
     Clone all projects in parallel.
@@ -114,40 +160,19 @@ def clone_projects(projects: List[Project]) -> List[tuple[Project, str]]:
         List of (project, project_dir) pairs in the same order as the input projects
     """
     start_time = time.time()
-    max_workers = min(8, len(projects))  # Use at most 8 threads
-    project_dirs_map = {}  # Map to store results by project name
-
-    with ThreadPoolExecutor(max_workers=max_workers) as executor:
-        # Start cloning tasks and keep track of them
-        future_to_project = {
-            executor.submit(clone_project, project): project for project in projects
-        }
-
-        # Process results as they complete
-        for future in as_completed(future_to_project):
-            project = future_to_project[future]
-            try:
-                project_dir = future.result()
-                project_dirs_map[project["name"]] = (project, project_dir)
-            except Exception as e:
-                print(f"ERROR: Failed to clone {project['name']}: {e}")
-
-    if len(project_dirs_map) != len(projects):
-        failed_projects = [
-            project["name"]
-            for project in projects
-            if project["name"] not in project_dirs_map
-        ]
-        print(
-            f"ERROR: Only {len(project_dirs_map)} out of {len(projects)} projects were cloned successfully. Failed projects: {', '.join(failed_projects)}"
-        )
-        sys.exit(1)
-
-    project_dirs = [project_dirs_map[project["name"]] for project in projects]
-
+    dirs = run_in_parallel(
+        clone_project,
+        projects,
+        on_error=lambda project, exc: print(
+            f"ERROR: Failed to clone project {project['name']}: {exc}"
+        ),
+        error_summary=lambda failures: print(
+            f"ERROR: Failed to clone {len(failures)} projects: {', '.join(p['name'] for p in failures)}"
+        ),
+    )
     clone_time = time.time() - start_time
     print(f"Cloning completed in {clone_time:.2f} seconds")
-    return project_dirs
+    return list(zip(projects, dirs))
 
 
 def build_database(
@@ -159,7 +184,7 @@ def build_database(
     Args:
         language: The language for which to build the database (e.g., "rust").
         extractor_options: Additional options for the extractor.
-        project: A dictionary containing project information with 'name' and 'git_repo' keys.
+        project: A dictionary containing project information with 'name' and 'git-repo' keys.
         project_dir: Path to the CodeQL database.
 
     Returns:
@@ -307,7 +332,10 @@ def pretty_name_from_artifact_name(artifact_name: str) -> str:
 
 
 def download_dca_databases(
-    experiment_name: str, pat: str, projects: List[Project]
+    language: str,
+    experiment_name: str,
+    pat: str,
+    projects: List[Project],
 ) -> List[tuple[Project, str | None]]:
     """
     Download databases from a DCA experiment.
@@ -318,7 +346,6 @@ def download_dca_databases(
     Returns:
         List of (project_name, database_dir) pairs, where database_dir is None if the download failed.
     """
-    database_results = {}
     print("\n=== Finding projects ===")
     response = get_json_from_github(
         f"https://raw.githubusercontent.com/github/codeql-dca-main/data/{experiment_name}/reports/downloads.json",
@@ -326,6 +353,7 @@ def download_dca_databases(
     )
     targets = response["targets"]
     project_map = {project["name"]: project for project in projects}
+    analyzed_databases = {}
     for data in targets.values():
         downloads = data["downloads"]
         analyzed_database = downloads["analyzed_database"]
@@ -336,6 +364,15 @@ def download_dca_databases(
             print(f"Skipping {pretty_name} as it is not in the list of projects")
             continue
 
+        if pretty_name in analyzed_databases:
+            print(
+                f"Skipping previous database {analyzed_databases[pretty_name]['artifact_name']} for {pretty_name}"
+            )
+
+        analyzed_databases[pretty_name] = analyzed_database
+
+    def download_and_decompress(analyzed_database: dict) -> str:
+        artifact_name = analyzed_database["artifact_name"]
         repository = analyzed_database["repository"]
         run_id = analyzed_database["run_id"]
         print(f"=== Finding artifact: {artifact_name} ===")
@@ -351,27 +388,40 @@ def download_dca_databases(
         artifact_zip_location = download_artifact(
             archive_download_url, artifact_name, pat
         )
-        print(f"=== Extracting artifact: {artifact_name} ===")
+        print(f"=== Decompressing artifact: {artifact_name} ===")
         # The database is in a zip file, which contains a tar.gz file with the DB
         # First we open the zip file
         with zipfile.ZipFile(artifact_zip_location, "r") as zip_ref:
             artifact_unzipped_location = os.path.join(build_dir, artifact_name)
+            # clean up any remnants of previous runs
+            shutil.rmtree(artifact_unzipped_location, ignore_errors=True)
             # And then we extract it to build_dir/artifact_name
             zip_ref.extractall(artifact_unzipped_location)
-            # And then we iterate over the contents of the extracted directory
-            # and extract the tar.gz files inside it
-            for entry in os.listdir(artifact_unzipped_location):
-                artifact_tar_location = os.path.join(artifact_unzipped_location, entry)
-                with tarfile.open(artifact_tar_location, "r:gz") as tar_ref:
-                    # And we just untar it to the same directory as the zip file
-                    tar_ref.extractall(artifact_unzipped_location)
-                    database_results[pretty_name] = os.path.join(
-                        artifact_unzipped_location, remove_extension(entry)
-                    )
+            # And then we extract the language tar.gz file inside it
+            artifact_tar_location = os.path.join(
+                artifact_unzipped_location, f"{language}.tar.gz"
+            )
+            with tarfile.open(artifact_tar_location, "r:gz") as tar_ref:
+                # And we just untar it to the same directory as the zip file
+                tar_ref.extractall(artifact_unzipped_location)
+        ret = os.path.join(artifact_unzipped_location, language)
+        print(f"Decompression complete: {ret}")
+        return ret
 
-    print(f"\n=== Extracted {len(database_results)} databases ===")
+    results = run_in_parallel(
+        download_and_decompress,
+        list(analyzed_databases.values()),
+        on_error=lambda db, exc: print(
+            f"ERROR: Failed to download and decompress {db["artifact_name"]}: {exc}"
+        ),
+        error_summary=lambda failures: print(
+            f"ERROR: Failed to download {len(failures)} databases: {', '.join(item[0] for item in failures)}"
+        ),
+    )
 
-    return [(project, database_results[project["name"]]) for project in projects]
+    print(f"\n=== Fetched {len(results)} databases ===")
+
+    return [(project_map[n], r) for n, r in zip(analyzed_databases, results)]
 
 
 def get_mad_destination_for_project(config, name: str) -> str:
@@ -422,7 +472,9 @@ To avoid loss of data, please commit your changes."""
         case "repo":
             extractor_options = config.get("extractor_options", [])
             database_results = build_databases_from_projects(
-                language, extractor_options, projects
+                language,
+                extractor_options,
+                projects,
             )
         case "dca":
             experiment_name = args.dca
@@ -439,7 +491,10 @@ To avoid loss of data, please commit your changes."""
             with open(args.pat, "r") as f:
                 pat = f.read().strip()
                 database_results = download_dca_databases(
-                    experiment_name, pat, projects
+                    language,
+                    experiment_name,
+                    pat,
+                    projects,
                 )
 
     # Generate models for all projects
@@ -492,9 +547,9 @@ if __name__ == "__main__":
         sys.exit(1)
     try:
         with open(args.config, "r") as f:
-            config = json.load(f)
-    except json.JSONDecodeError as e:
-        print(f"ERROR: Failed to parse JSON file {args.config}: {e}")
+            config = yaml.safe_load(f)
+    except yaml.YAMLError as e:
+        print(f"ERROR: Failed to parse YAML file {args.config}: {e}")
         sys.exit(1)
 
     main(config, args)
diff --git a/rust/ast-generator/README.md b/rust/ast-generator/README.md
index 17d75c6445d..21193bdee1c 100644
--- a/rust/ast-generator/README.md
+++ b/rust/ast-generator/README.md
@@ -8,7 +8,7 @@ It uses:
 Both are fetched by bazel while building. In order to have proper IDE support and being
 able to run cargo tooling in this crate, you can run
 ```bash
-bazel run //rust/ast-generator:inject_sources
+bazel run //rust/ast-generator:inject-sources
 ```
 which will create the missing sources. Be aware that bazel will still use the source taken
 directly from `rust-analyzer`, not the one in your working copy. Those should not need to be
diff --git a/rust/ast-generator/src/main.rs b/rust/ast-generator/src/main.rs
index 83999711161..70741c83382 100644
--- a/rust/ast-generator/src/main.rs
+++ b/rust/ast-generator/src/main.rs
@@ -114,7 +114,9 @@ fn node_src_to_schema_class(
             let (ty, child) = match &f.ty {
                 FieldType::String => ("optional[string]".to_string(), false),
                 FieldType::Predicate => ("predicate".to_string(), false),
-                FieldType::Optional(ty) => (format!("optional[\"{}\"]", class_name(ty)), true),
+                FieldType::Optional(ty) | FieldType::Body(ty) => {
+                    (format!("optional[\"{}\"]", class_name(ty)), true)
+                }
                 FieldType::List(ty) => (format!("list[\"{}\"]", class_name(ty)), true),
             };
             SchemaField {
@@ -169,6 +171,7 @@ enum FieldType {
     String,
     Predicate,
     Optional(String),
+    Body(String),
     List(String),
 }
 
@@ -177,158 +180,95 @@ struct FieldInfo {
     ty: FieldType,
 }
 
+impl FieldInfo {
+    pub fn optional(name: &str, ty: &str) -> FieldInfo {
+        FieldInfo {
+            name: name.to_string(),
+            ty: FieldType::Optional(ty.to_string()),
+        }
+    }
+
+    pub fn body(name: &str, ty: &str) -> FieldInfo {
+        FieldInfo {
+            name: name.to_string(),
+            ty: FieldType::Body(ty.to_string()),
+        }
+    }
+
+    pub fn string(name: &str) -> FieldInfo {
+        FieldInfo {
+            name: name.to_string(),
+            ty: FieldType::String,
+        }
+    }
+
+    pub fn predicate(name: &str) -> FieldInfo {
+        FieldInfo {
+            name: name.to_string(),
+            ty: FieldType::Predicate,
+        }
+    }
+
+    pub fn list(name: &str, ty: &str) -> FieldInfo {
+        FieldInfo {
+            name: name.to_string(),
+            ty: FieldType::List(ty.to_string()),
+        }
+    }
+}
+
 fn get_additional_fields(node: &AstNodeSrc) -> Vec<FieldInfo> {
     match node.name.as_str() {
-        "Name" | "NameRef" | "Lifetime" => vec![FieldInfo {
-            name: "text".to_string(),
-            ty: FieldType::String,
-        }],
-        "Abi" => vec![FieldInfo {
-            name: "abi_string".to_string(),
-            ty: FieldType::String,
-        }],
-        "Literal" => vec![FieldInfo {
-            name: "text_value".to_string(),
-            ty: FieldType::String,
-        }],
-        "PrefixExpr" => vec![FieldInfo {
-            name: "operator_name".to_string(),
-            ty: FieldType::String,
-        }],
+        "Name" | "NameRef" | "Lifetime" => vec![FieldInfo::string("text")],
+        "Abi" => vec![FieldInfo::string("abi_string")],
+        "Literal" => vec![FieldInfo::string("text_value")],
+        "PrefixExpr" => vec![FieldInfo::string("operator_name")],
         "BinExpr" => vec![
-            FieldInfo {
-                name: "lhs".to_string(),
-                ty: FieldType::Optional("Expr".to_string()),
-            },
-            FieldInfo {
-                name: "rhs".to_string(),
-                ty: FieldType::Optional("Expr".to_string()),
-            },
-            FieldInfo {
-                name: "operator_name".to_string(),
-                ty: FieldType::String,
-            },
+            FieldInfo::optional("lhs", "Expr"),
+            FieldInfo::optional("rhs", "Expr"),
+            FieldInfo::string("operator_name"),
         ],
         "IfExpr" => vec![
-            FieldInfo {
-                name: "then_branch".to_string(),
-                ty: FieldType::Optional("BlockExpr".to_string()),
-            },
-            FieldInfo {
-                name: "else_branch".to_string(),
-                ty: FieldType::Optional("ElseBranch".to_string()),
-            },
-            FieldInfo {
-                name: "condition".to_string(),
-                ty: FieldType::Optional("Expr".to_string()),
-            },
+            FieldInfo::optional("then_branch", "BlockExpr"),
+            FieldInfo::optional("else_branch", "ElseBranch"),
+            FieldInfo::optional("condition", "Expr"),
         ],
         "RangeExpr" => vec![
-            FieldInfo {
-                name: "start".to_string(),
-                ty: FieldType::Optional("Expr".to_string()),
-            },
-            FieldInfo {
-                name: "end".to_string(),
-                ty: FieldType::Optional("Expr".to_string()),
-            },
-            FieldInfo {
-                name: "operator_name".to_string(),
-                ty: FieldType::String,
-            },
+            FieldInfo::optional("start", "Expr"),
+            FieldInfo::optional("end", "Expr"),
+            FieldInfo::string("operator_name"),
         ],
         "RangePat" => vec![
-            FieldInfo {
-                name: "start".to_string(),
-                ty: FieldType::Optional("Pat".to_string()),
-            },
-            FieldInfo {
-                name: "end".to_string(),
-                ty: FieldType::Optional("Pat".to_string()),
-            },
-            FieldInfo {
-                name: "operator_name".to_string(),
-                ty: FieldType::String,
-            },
+            FieldInfo::optional("start", "Pat"),
+            FieldInfo::optional("end", "Pat"),
+            FieldInfo::string("operator_name"),
         ],
         "IndexExpr" => vec![
-            FieldInfo {
-                name: "index".to_string(),
-                ty: FieldType::Optional("Expr".to_string()),
-            },
-            FieldInfo {
-                name: "base".to_string(),
-                ty: FieldType::Optional("Expr".to_string()),
-            },
+            FieldInfo::optional("index", "Expr"),
+            FieldInfo::optional("base", "Expr"),
         ],
         "Impl" => vec![
-            FieldInfo {
-                name: "trait_".to_string(),
-                ty: FieldType::Optional("Type".to_string()),
-            },
-            FieldInfo {
-                name: "self_ty".to_string(),
-                ty: FieldType::Optional("Type".to_string()),
-            },
+            FieldInfo::optional("trait_", "Type"),
+            FieldInfo::optional("self_ty", "Type"),
         ],
-        "ForExpr" => vec![FieldInfo {
-            name: "iterable".to_string(),
-            ty: FieldType::Optional("Expr".to_string()),
-        }],
-        "WhileExpr" => vec![FieldInfo {
-            name: "condition".to_string(),
-            ty: FieldType::Optional("Expr".to_string()),
-        }],
-        "MatchGuard" => vec![FieldInfo {
-            name: "condition".to_string(),
-            ty: FieldType::Optional("Expr".to_string()),
-        }],
+        "ForExpr" => vec![FieldInfo::optional("iterable", "Expr")],
+        "WhileExpr" => vec![FieldInfo::optional("condition", "Expr")],
+        "MatchGuard" => vec![FieldInfo::optional("condition", "Expr")],
         "MacroDef" => vec![
-            FieldInfo {
-                name: "args".to_string(),
-                ty: FieldType::Optional("TokenTree".to_string()),
-            },
-            FieldInfo {
-                name: "body".to_string(),
-                ty: FieldType::Optional("TokenTree".to_string()),
-            },
+            FieldInfo::body("args", "TokenTree"),
+            FieldInfo::body("body", "TokenTree"),
         ],
-        "FormatArgsExpr" => vec![FieldInfo {
-            name: "args".to_string(),
-            ty: FieldType::List("FormatArgsArg".to_string()),
-        }],
-        "ArgList" => vec![FieldInfo {
-            name: "args".to_string(),
-            ty: FieldType::List("Expr".to_string()),
-        }],
-        "Fn" => vec![FieldInfo {
-            name: "body".to_string(),
-            ty: FieldType::Optional("BlockExpr".to_string()),
-        }],
-        "Const" => vec![FieldInfo {
-            name: "body".to_string(),
-            ty: FieldType::Optional("Expr".to_string()),
-        }],
-        "Static" => vec![FieldInfo {
-            name: "body".to_string(),
-            ty: FieldType::Optional("Expr".to_string()),
-        }],
-        "ClosureExpr" => vec![FieldInfo {
-            name: "body".to_string(),
-            ty: FieldType::Optional("Expr".to_string()),
-        }],
-        "ArrayExpr" => vec![FieldInfo {
-            name: "is_semicolon".to_string(),
-            ty: FieldType::Predicate,
-        }],
-        "SelfParam" => vec![FieldInfo {
-            name: "is_amp".to_string(),
-            ty: FieldType::Predicate,
-        }],
-        "UseTree" => vec![FieldInfo {
-            name: "is_star".to_string(),
-            ty: FieldType::Predicate,
-        }],
+        "MacroCall" => vec![FieldInfo::body("token_tree", "TokenTree")],
+        "FormatArgsExpr" => vec![FieldInfo::list("args", "FormatArgsArg")],
+        "ArgList" => vec![FieldInfo::list("args", "Expr")],
+        "Fn" => vec![FieldInfo::body("body", "BlockExpr")],
+        "Const" => vec![FieldInfo::body("body", "Expr")],
+        "Static" => vec![FieldInfo::body("body", "Expr")],
+        "Param" => vec![FieldInfo::body("pat", "Pat")],
+        "ClosureExpr" => vec![FieldInfo::optional("body", "Expr")],
+        "ArrayExpr" => vec![FieldInfo::predicate("is_semicolon")],
+        "SelfParam" => vec![FieldInfo::predicate("is_amp")],
+        "UseTree" => vec![FieldInfo::predicate("is_star")],
         _ => vec![],
     }
 }
@@ -352,9 +292,11 @@ fn get_fields(node: &AstNodeSrc) -> Vec<FieldInfo> {
     result.extend(get_additional_fields(node));
 
     for field in &node.fields {
-        match (node.name.as_str(), field.method_name().as_str()) {
+        let name = field.method_name();
+        match (node.name.as_str(), name.as_str()) {
             ("ArrayExpr", "expr") // The ArrayExpr type also has an 'exprs' field
             | ("PathSegment", "ty" | "path_type")  // these are broken, handling them manually
+            | ("Param", "pat") | ("MacroCall", "token_tree") // handled manually to use `body`
             => continue,
             _ => {}
         }
@@ -367,61 +309,30 @@ fn get_fields(node: &AstNodeSrc) -> Vec<FieldInfo> {
                 Cardinality::Many => FieldType::List(ty.clone()),
             },
         };
-        result.push(FieldInfo {
-            name: field.method_name(),
-            ty,
-        });
+        result.push(FieldInfo { name, ty });
     }
     for trait_ in &node.traits {
         match trait_.as_str() {
-            "HasAttrs" => result.push(FieldInfo {
-                name: "attrs".to_owned(),
-                ty: FieldType::List("Attr".to_owned()),
-            }),
-            "HasName" => result.push(FieldInfo {
-                name: "name".to_owned(),
-                ty: FieldType::Optional("Name".to_owned()),
-            }),
-            "HasVisibility" => result.push(FieldInfo {
-                name: "visibility".to_owned(),
-                ty: FieldType::Optional("Visibility".to_owned()),
-            }),
+            "HasAttrs" => result.push(FieldInfo::list("attrs", "Attr")),
+            "HasName" => result.push(FieldInfo::optional("name", "Name")),
+            "HasVisibility" => result.push(FieldInfo::optional("visibility", "Visibility")),
             "HasGenericParams" => {
-                result.push(FieldInfo {
-                    name: "generic_param_list".to_owned(),
-                    ty: FieldType::Optional("GenericParamList".to_owned()),
-                });
-                result.push(FieldInfo {
-                    name: "where_clause".to_owned(),
-                    ty: FieldType::Optional("WhereClause".to_owned()),
-                })
+                result.push(FieldInfo::optional(
+                    "generic_param_list",
+                    "GenericParamList",
+                ));
+                result.push(FieldInfo::optional("where_clause", "WhereClause"))
             }
-            "HasGenericArgs" => result.push(FieldInfo {
-                name: "generic_arg_list".to_owned(),
-                ty: FieldType::Optional("GenericArgList".to_owned()),
-            }),
-            "HasTypeBounds" => result.push(FieldInfo {
-                name: "type_bound_list".to_owned(),
-                ty: FieldType::Optional("TypeBoundList".to_owned()),
-            }),
-            "HasModuleItem" => result.push(FieldInfo {
-                name: "items".to_owned(),
-                ty: FieldType::List("Item".to_owned()),
-            }),
+            "HasGenericArgs" => {
+                result.push(FieldInfo::optional("generic_arg_list", "GenericArgList"))
+            }
+            "HasTypeBounds" => result.push(FieldInfo::optional("type_bound_list", "TypeBoundList")),
+            "HasModuleItem" => result.push(FieldInfo::list("items", "Item")),
             "HasLoopBody" => {
-                result.push(FieldInfo {
-                    name: "label".to_owned(),
-                    ty: FieldType::Optional("Label".to_owned()),
-                });
-                result.push(FieldInfo {
-                    name: "loop_body".to_owned(),
-                    ty: FieldType::Optional("BlockExpr".to_owned()),
-                })
+                result.push(FieldInfo::optional("label", "Label"));
+                result.push(FieldInfo::optional("loop_body", "BlockExpr"))
             }
-            "HasArgList" => result.push(FieldInfo {
-                name: "arg_list".to_owned(),
-                ty: FieldType::Optional("ArgList".to_owned()),
-            }),
+            "HasArgList" => result.push(FieldInfo::optional("arg_list", "ArgList")),
             "HasDocComments" => {}
 
             _ => panic!("Unknown trait {}", trait_),
@@ -455,6 +366,7 @@ struct ExtractorNodeFieldInfo {
     predicate: bool,
     optional: bool,
     list: bool,
+    body: bool,
 }
 
 #[derive(Serialize)]
@@ -518,6 +430,13 @@ fn field_info_to_extractor_info(name: &str, field: &FieldInfo) -> ExtractorNodeF
             optional: true,
             ..Default::default()
         },
+        FieldType::Body(ty) => ExtractorNodeFieldInfo {
+            name,
+            method: field.name.clone(),
+            snake_case_ty: to_lower_snake_case(ty),
+            body: true,
+            ..Default::default()
+        },
         FieldType::List(ty) => ExtractorNodeFieldInfo {
             name,
             method: field.name.clone(),
diff --git a/rust/ast-generator/templates/extractor.mustache b/rust/ast-generator/templates/extractor.mustache
index b94f8a6043a..ab1fd4b0d37 100644
--- a/rust/ast-generator/templates/extractor.mustache
+++ b/rust/ast-generator/templates/extractor.mustache
@@ -36,23 +36,27 @@ impl Translator<'_> {
 
     pub(crate) fn emit_{{snake_case_name}}(&mut self, node: &ast::{{ast_name}}) -> Option<Label<generated::{{name}}>> {
         pre_emit!({{name}}, self, node);
-        if self.should_be_excluded(node) { return None; }
         {{#has_attrs}}
-        if self.should_be_excluded_attrs(node) { return None; }
+        if self.should_be_excluded(node) { return None; }
         {{/has_attrs}}
         {{#fields}}
-        {{#predicate}}
-        let {{name}} = node.{{method}}().is_some();
-        {{/predicate}}
-        {{#string}}
-        let {{name}} = node.try_get_text();
-        {{/string}}
-        {{#list}}
-        let {{name}} = node.{{method}}().filter_map(|x| self.emit_{{snake_case_ty}}(&x)).collect();
-        {{/list}}
-        {{#optional}}
-        let {{name}} = node.{{method}}().and_then(|x| self.emit_{{snake_case_ty}}(&x));
-        {{/optional}}
+        let {{name}} =
+            {{#predicate}}
+            node.{{method}}().is_some()
+            {{/predicate}}
+            {{#string}}
+            node.try_get_text()
+            {{/string}}
+            {{#list}}
+            node.{{method}}().filter_map(|x| self.emit_{{snake_case_ty}}(&x)).collect()
+            {{/list}}
+            {{#optional}}
+            node.{{method}}().and_then(|x| self.emit_{{snake_case_ty}}(&x))
+            {{/optional}}
+            {{#body}}
+            if self.should_skip_bodies() { None } else { node.{{method}}().and_then(|x| self.emit_{{snake_case_ty}}(&x)) }
+            {{/body}}
+            ;
         {{/fields}}
         let label = self.trap.emit(generated::{{name}} {
             id: TrapId::Star,
diff --git a/rust/bulk_generation_targets.yml b/rust/bulk_generation_targets.yml
new file mode 100644
index 00000000000..15e38c7a18e
--- /dev/null
+++ b/rust/bulk_generation_targets.yml
@@ -0,0 +1,24 @@
+strategy: dca
+language: rust
+destination: rust/ql/lib/ext/generated
+# targets must have name specified and corresponding to the name in the DCA suite
+# they can optionally specify any of
+#   with-sinks: false
+#   with-sources: false
+#   with-summaries: false
+# if a target has a dependency in this same list, it should be listed after that dependency
+targets:
+- name: rust
+- name: libc
+- name: log
+- name: memchr
+- name: once_cell
+- name: rand
+- name: smallvec
+- name: serde
+- name: tokio
+- name: reqwest
+- name: rocket
+- name: actix-web
+- name: hyper
+- name: clap
diff --git a/rust/downgrades/aa9a0bda17c76b804ad9e108d43da15f6beaf2a7/old.dbscheme b/rust/downgrades/aa9a0bda17c76b804ad9e108d43da15f6beaf2a7/old.dbscheme
new file mode 100644
index 00000000000..aa9a0bda17c
--- /dev/null
+++ b/rust/downgrades/aa9a0bda17c76b804ad9e108d43da15f6beaf2a7/old.dbscheme
@@ -0,0 +1,3616 @@
+// generated by codegen, do not edit
+
+// from ../shared/tree-sitter-extractor/src/generator/prefix.dbscheme
+/*- Files and folders -*/
+
+/**
+ * The location of an element.
+ * The location spans column `startcolumn` of line `startline` to
+ * column `endcolumn` of line `endline` in file `file`.
+ * For more information, see
+ * [Locations](https://codeql.github.com/docs/writing-codeql-queries/providing-locations-in-codeql-queries/).
+ */
+locations_default(
+  unique int id: @location_default,
+  int file: @file ref,
+  int beginLine: int ref,
+  int beginColumn: int ref,
+  int endLine: int ref,
+  int endColumn: int ref
+);
+
+files(
+  unique int id: @file,
+  string name: string ref
+);
+
+folders(
+  unique int id: @folder,
+  string name: string ref
+);
+
+@container = @file | @folder
+
+containerparent(
+  int parent: @container ref,
+  unique int child: @container ref
+);
+
+/*- Empty location -*/
+
+empty_location(
+  int location: @location_default ref
+);
+
+/*- Source location prefix -*/
+
+/**
+ * The source location of the snapshot.
+ */
+sourceLocationPrefix(string prefix : string ref);
+
+/*- Diagnostic messages -*/
+
+diagnostics(
+  unique int id: @diagnostic,
+  int severity: int ref,
+  string error_tag: string ref,
+  string error_message: string ref,
+  string full_error_message: string ref,
+  int location: @location_default ref
+);
+
+/*- Diagnostic messages: severity -*/
+
+case @diagnostic.severity of
+  10 = @diagnostic_debug
+| 20 = @diagnostic_info
+| 30 = @diagnostic_warning
+| 40 = @diagnostic_error
+;
+
+/*- YAML -*/
+
+#keyset[parent, idx]
+yaml (unique int id: @yaml_node,
+      int kind: int ref,
+      int parent: @yaml_node_parent ref,
+      int idx: int ref,
+      string tag: string ref,
+      string tostring: string ref);
+
+case @yaml_node.kind of
+  0 = @yaml_scalar_node
+| 1 = @yaml_mapping_node
+| 2 = @yaml_sequence_node
+| 3 = @yaml_alias_node
+;
+
+@yaml_collection_node = @yaml_mapping_node | @yaml_sequence_node;
+
+@yaml_node_parent = @yaml_collection_node | @file;
+
+yaml_anchors (unique int node: @yaml_node ref,
+              string anchor: string ref);
+
+yaml_aliases (unique int alias: @yaml_alias_node ref,
+              string target: string ref);
+
+yaml_scalars (unique int scalar: @yaml_scalar_node ref,
+              int style: int ref,
+              string value: string ref);
+
+yaml_errors (unique int id: @yaml_error,
+             string message: string ref);
+
+yaml_locations(unique int locatable: @yaml_locatable ref,
+             int location: @location_default ref);
+
+@yaml_locatable = @yaml_node | @yaml_error;
+
+
+// from prefix.dbscheme
+#keyset[id]
+locatable_locations(
+  int id: @locatable ref,
+  int location: @location_default ref
+);
+
+
+// from schema
+
+@element =
+  @extractor_step
+| @locatable
+| @named_crate
+| @unextracted
+;
+
+extractor_steps(
+  unique int id: @extractor_step,
+  string action: string ref,
+  int duration_ms: int ref
+);
+
+#keyset[id]
+extractor_step_files(
+  int id: @extractor_step ref,
+  int file: @file ref
+);
+
+@locatable =
+  @ast_node
+| @crate
+;
+
+named_crates(
+  unique int id: @named_crate,
+  string name: string ref,
+  int crate: @crate ref
+);
+
+@unextracted =
+  @missing
+| @unimplemented
+;
+
+@ast_node =
+  @abi
+| @addressable
+| @arg_list
+| @asm_dir_spec
+| @asm_operand
+| @asm_operand_expr
+| @asm_option
+| @asm_piece
+| @asm_reg_spec
+| @assoc_item
+| @assoc_item_list
+| @attr
+| @callable
+| @closure_binder
+| @expr
+| @extern_item
+| @extern_item_list
+| @field_list
+| @format_args_arg
+| @generic_arg
+| @generic_arg_list
+| @generic_param
+| @generic_param_list
+| @item_list
+| @label
+| @let_else
+| @macro_items
+| @match_arm
+| @match_arm_list
+| @match_guard
+| @meta
+| @name
+| @param_base
+| @param_list
+| @parenthesized_arg_list
+| @pat
+| @path
+| @path_segment
+| @rename
+| @resolvable
+| @ret_type_repr
+| @return_type_syntax
+| @source_file
+| @stmt
+| @stmt_list
+| @struct_expr_field
+| @struct_expr_field_list
+| @struct_field
+| @struct_pat_field
+| @struct_pat_field_list
+| @token
+| @token_tree
+| @tuple_field
+| @type_bound
+| @type_bound_list
+| @type_repr
+| @use_bound_generic_arg
+| @use_bound_generic_args
+| @use_tree
+| @use_tree_list
+| @variant_def
+| @variant_list
+| @visibility
+| @where_clause
+| @where_pred
+;
+
+crates(
+  unique int id: @crate
+);
+
+#keyset[id]
+crate_names(
+  int id: @crate ref,
+  string name: string ref
+);
+
+#keyset[id]
+crate_versions(
+  int id: @crate ref,
+  string version: string ref
+);
+
+#keyset[id, index]
+crate_cfg_options(
+  int id: @crate ref,
+  int index: int ref,
+  string cfg_option: string ref
+);
+
+#keyset[id, index]
+crate_named_dependencies(
+  int id: @crate ref,
+  int index: int ref,
+  int named_dependency: @named_crate ref
+);
+
+missings(
+  unique int id: @missing
+);
+
+unimplementeds(
+  unique int id: @unimplemented
+);
+
+abis(
+  unique int id: @abi
+);
+
+#keyset[id]
+abi_abi_strings(
+  int id: @abi ref,
+  string abi_string: string ref
+);
+
+@addressable =
+  @item
+| @variant
+;
+
+#keyset[id]
+addressable_extended_canonical_paths(
+  int id: @addressable ref,
+  string extended_canonical_path: string ref
+);
+
+#keyset[id]
+addressable_crate_origins(
+  int id: @addressable ref,
+  string crate_origin: string ref
+);
+
+arg_lists(
+  unique int id: @arg_list
+);
+
+#keyset[id, index]
+arg_list_args(
+  int id: @arg_list ref,
+  int index: int ref,
+  int arg: @expr ref
+);
+
+asm_dir_specs(
+  unique int id: @asm_dir_spec
+);
+
+@asm_operand =
+  @asm_const
+| @asm_label
+| @asm_reg_operand
+| @asm_sym
+;
+
+asm_operand_exprs(
+  unique int id: @asm_operand_expr
+);
+
+#keyset[id]
+asm_operand_expr_in_exprs(
+  int id: @asm_operand_expr ref,
+  int in_expr: @expr ref
+);
+
+#keyset[id]
+asm_operand_expr_out_exprs(
+  int id: @asm_operand_expr ref,
+  int out_expr: @expr ref
+);
+
+asm_options(
+  unique int id: @asm_option
+);
+
+#keyset[id]
+asm_option_is_raw(
+  int id: @asm_option ref
+);
+
+@asm_piece =
+  @asm_clobber_abi
+| @asm_operand_named
+| @asm_options_list
+;
+
+asm_reg_specs(
+  unique int id: @asm_reg_spec
+);
+
+#keyset[id]
+asm_reg_spec_identifiers(
+  int id: @asm_reg_spec ref,
+  int identifier: @name_ref ref
+);
+
+@assoc_item =
+  @const
+| @function
+| @macro_call
+| @type_alias
+;
+
+assoc_item_lists(
+  unique int id: @assoc_item_list
+);
+
+#keyset[id, index]
+assoc_item_list_assoc_items(
+  int id: @assoc_item_list ref,
+  int index: int ref,
+  int assoc_item: @assoc_item ref
+);
+
+#keyset[id, index]
+assoc_item_list_attrs(
+  int id: @assoc_item_list ref,
+  int index: int ref,
+  int attr: @attr ref
+);
+
+attrs(
+  unique int id: @attr
+);
+
+#keyset[id]
+attr_meta(
+  int id: @attr ref,
+  int meta: @meta ref
+);
+
+@callable =
+  @closure_expr
+| @function
+;
+
+#keyset[id]
+callable_param_lists(
+  int id: @callable ref,
+  int param_list: @param_list ref
+);
+
+#keyset[id, index]
+callable_attrs(
+  int id: @callable ref,
+  int index: int ref,
+  int attr: @attr ref
+);
+
+closure_binders(
+  unique int id: @closure_binder
+);
+
+#keyset[id]
+closure_binder_generic_param_lists(
+  int id: @closure_binder ref,
+  int generic_param_list: @generic_param_list ref
+);
+
+@expr =
+  @array_expr_internal
+| @asm_expr
+| @await_expr
+| @become_expr
+| @binary_expr
+| @break_expr
+| @call_expr_base
+| @cast_expr
+| @closure_expr
+| @continue_expr
+| @field_expr
+| @format_args_expr
+| @if_expr
+| @index_expr
+| @labelable_expr
+| @let_expr
+| @literal_expr
+| @macro_block_expr
+| @macro_expr
+| @match_expr
+| @offset_of_expr
+| @paren_expr
+| @path_expr_base
+| @prefix_expr
+| @range_expr
+| @ref_expr
+| @return_expr
+| @struct_expr
+| @try_expr
+| @tuple_expr
+| @underscore_expr
+| @yeet_expr
+| @yield_expr
+;
+
+@extern_item =
+  @function
+| @macro_call
+| @static
+| @type_alias
+;
+
+extern_item_lists(
+  unique int id: @extern_item_list
+);
+
+#keyset[id, index]
+extern_item_list_attrs(
+  int id: @extern_item_list ref,
+  int index: int ref,
+  int attr: @attr ref
+);
+
+#keyset[id, index]
+extern_item_list_extern_items(
+  int id: @extern_item_list ref,
+  int index: int ref,
+  int extern_item: @extern_item ref
+);
+
+@field_list =
+  @struct_field_list
+| @tuple_field_list
+;
+
+format_args_args(
+  unique int id: @format_args_arg
+);
+
+#keyset[id]
+format_args_arg_exprs(
+  int id: @format_args_arg ref,
+  int expr: @expr ref
+);
+
+#keyset[id]
+format_args_arg_names(
+  int id: @format_args_arg ref,
+  int name: @name ref
+);
+
+@generic_arg =
+  @assoc_type_arg
+| @const_arg
+| @lifetime_arg
+| @type_arg
+;
+
+generic_arg_lists(
+  unique int id: @generic_arg_list
+);
+
+#keyset[id, index]
+generic_arg_list_generic_args(
+  int id: @generic_arg_list ref,
+  int index: int ref,
+  int generic_arg: @generic_arg ref
+);
+
+@generic_param =
+  @const_param
+| @lifetime_param
+| @type_param
+;
+
+generic_param_lists(
+  unique int id: @generic_param_list
+);
+
+#keyset[id, index]
+generic_param_list_generic_params(
+  int id: @generic_param_list ref,
+  int index: int ref,
+  int generic_param: @generic_param ref
+);
+
+item_lists(
+  unique int id: @item_list
+);
+
+#keyset[id, index]
+item_list_attrs(
+  int id: @item_list ref,
+  int index: int ref,
+  int attr: @attr ref
+);
+
+#keyset[id, index]
+item_list_items(
+  int id: @item_list ref,
+  int index: int ref,
+  int item: @item ref
+);
+
+labels(
+  unique int id: @label
+);
+
+#keyset[id]
+label_lifetimes(
+  int id: @label ref,
+  int lifetime: @lifetime ref
+);
+
+let_elses(
+  unique int id: @let_else
+);
+
+#keyset[id]
+let_else_block_exprs(
+  int id: @let_else ref,
+  int block_expr: @block_expr ref
+);
+
+macro_items(
+  unique int id: @macro_items
+);
+
+#keyset[id, index]
+macro_items_items(
+  int id: @macro_items ref,
+  int index: int ref,
+  int item: @item ref
+);
+
+match_arms(
+  unique int id: @match_arm
+);
+
+#keyset[id, index]
+match_arm_attrs(
+  int id: @match_arm ref,
+  int index: int ref,
+  int attr: @attr ref
+);
+
+#keyset[id]
+match_arm_exprs(
+  int id: @match_arm ref,
+  int expr: @expr ref
+);
+
+#keyset[id]
+match_arm_guards(
+  int id: @match_arm ref,
+  int guard: @match_guard ref
+);
+
+#keyset[id]
+match_arm_pats(
+  int id: @match_arm ref,
+  int pat: @pat ref
+);
+
+match_arm_lists(
+  unique int id: @match_arm_list
+);
+
+#keyset[id, index]
+match_arm_list_arms(
+  int id: @match_arm_list ref,
+  int index: int ref,
+  int arm: @match_arm ref
+);
+
+#keyset[id, index]
+match_arm_list_attrs(
+  int id: @match_arm_list ref,
+  int index: int ref,
+  int attr: @attr ref
+);
+
+match_guards(
+  unique int id: @match_guard
+);
+
+#keyset[id]
+match_guard_conditions(
+  int id: @match_guard ref,
+  int condition: @expr ref
+);
+
+meta(
+  unique int id: @meta
+);
+
+#keyset[id]
+meta_exprs(
+  int id: @meta ref,
+  int expr: @expr ref
+);
+
+#keyset[id]
+meta_is_unsafe(
+  int id: @meta ref
+);
+
+#keyset[id]
+meta_paths(
+  int id: @meta ref,
+  int path: @path ref
+);
+
+#keyset[id]
+meta_token_trees(
+  int id: @meta ref,
+  int token_tree: @token_tree ref
+);
+
+names(
+  unique int id: @name
+);
+
+#keyset[id]
+name_texts(
+  int id: @name ref,
+  string text: string ref
+);
+
+@param_base =
+  @param
+| @self_param
+;
+
+#keyset[id, index]
+param_base_attrs(
+  int id: @param_base ref,
+  int index: int ref,
+  int attr: @attr ref
+);
+
+#keyset[id]
+param_base_type_reprs(
+  int id: @param_base ref,
+  int type_repr: @type_repr ref
+);
+
+param_lists(
+  unique int id: @param_list
+);
+
+#keyset[id, index]
+param_list_params(
+  int id: @param_list ref,
+  int index: int ref,
+  int param: @param ref
+);
+
+#keyset[id]
+param_list_self_params(
+  int id: @param_list ref,
+  int self_param: @self_param ref
+);
+
+parenthesized_arg_lists(
+  unique int id: @parenthesized_arg_list
+);
+
+#keyset[id, index]
+parenthesized_arg_list_type_args(
+  int id: @parenthesized_arg_list ref,
+  int index: int ref,
+  int type_arg: @type_arg ref
+);
+
+@pat =
+  @box_pat
+| @const_block_pat
+| @ident_pat
+| @literal_pat
+| @macro_pat
+| @or_pat
+| @paren_pat
+| @path_pat
+| @range_pat
+| @ref_pat
+| @rest_pat
+| @slice_pat
+| @struct_pat
+| @tuple_pat
+| @tuple_struct_pat
+| @wildcard_pat
+;
+
+paths(
+  unique int id: @path
+);
+
+#keyset[id]
+path_qualifiers(
+  int id: @path ref,
+  int qualifier: @path ref
+);
+
+#keyset[id]
+path_segments_(
+  int id: @path ref,
+  int segment: @path_segment ref
+);
+
+path_segments(
+  unique int id: @path_segment
+);
+
+#keyset[id]
+path_segment_generic_arg_lists(
+  int id: @path_segment ref,
+  int generic_arg_list: @generic_arg_list ref
+);
+
+#keyset[id]
+path_segment_identifiers(
+  int id: @path_segment ref,
+  int identifier: @name_ref ref
+);
+
+#keyset[id]
+path_segment_parenthesized_arg_lists(
+  int id: @path_segment ref,
+  int parenthesized_arg_list: @parenthesized_arg_list ref
+);
+
+#keyset[id]
+path_segment_ret_types(
+  int id: @path_segment ref,
+  int ret_type: @ret_type_repr ref
+);
+
+#keyset[id]
+path_segment_return_type_syntaxes(
+  int id: @path_segment ref,
+  int return_type_syntax: @return_type_syntax ref
+);
+
+#keyset[id]
+path_segment_type_reprs(
+  int id: @path_segment ref,
+  int type_repr: @type_repr ref
+);
+
+#keyset[id]
+path_segment_trait_type_reprs(
+  int id: @path_segment ref,
+  int trait_type_repr: @path_type_repr ref
+);
+
+renames(
+  unique int id: @rename
+);
+
+#keyset[id]
+rename_names(
+  int id: @rename ref,
+  int name: @name ref
+);
+
+@resolvable =
+  @method_call_expr
+| @path_ast_node
+;
+
+#keyset[id]
+resolvable_resolved_paths(
+  int id: @resolvable ref,
+  string resolved_path: string ref
+);
+
+#keyset[id]
+resolvable_resolved_crate_origins(
+  int id: @resolvable ref,
+  string resolved_crate_origin: string ref
+);
+
+ret_type_reprs(
+  unique int id: @ret_type_repr
+);
+
+#keyset[id]
+ret_type_repr_type_reprs(
+  int id: @ret_type_repr ref,
+  int type_repr: @type_repr ref
+);
+
+return_type_syntaxes(
+  unique int id: @return_type_syntax
+);
+
+source_files(
+  unique int id: @source_file
+);
+
+#keyset[id, index]
+source_file_attrs(
+  int id: @source_file ref,
+  int index: int ref,
+  int attr: @attr ref
+);
+
+#keyset[id, index]
+source_file_items(
+  int id: @source_file ref,
+  int index: int ref,
+  int item: @item ref
+);
+
+@stmt =
+  @expr_stmt
+| @item
+| @let_stmt
+;
+
+stmt_lists(
+  unique int id: @stmt_list
+);
+
+#keyset[id, index]
+stmt_list_attrs(
+  int id: @stmt_list ref,
+  int index: int ref,
+  int attr: @attr ref
+);
+
+#keyset[id, index]
+stmt_list_statements(
+  int id: @stmt_list ref,
+  int index: int ref,
+  int statement: @stmt ref
+);
+
+#keyset[id]
+stmt_list_tail_exprs(
+  int id: @stmt_list ref,
+  int tail_expr: @expr ref
+);
+
+struct_expr_fields(
+  unique int id: @struct_expr_field
+);
+
+#keyset[id, index]
+struct_expr_field_attrs(
+  int id: @struct_expr_field ref,
+  int index: int ref,
+  int attr: @attr ref
+);
+
+#keyset[id]
+struct_expr_field_exprs(
+  int id: @struct_expr_field ref,
+  int expr: @expr ref
+);
+
+#keyset[id]
+struct_expr_field_identifiers(
+  int id: @struct_expr_field ref,
+  int identifier: @name_ref ref
+);
+
+struct_expr_field_lists(
+  unique int id: @struct_expr_field_list
+);
+
+#keyset[id, index]
+struct_expr_field_list_attrs(
+  int id: @struct_expr_field_list ref,
+  int index: int ref,
+  int attr: @attr ref
+);
+
+#keyset[id, index]
+struct_expr_field_list_fields(
+  int id: @struct_expr_field_list ref,
+  int index: int ref,
+  int field: @struct_expr_field ref
+);
+
+#keyset[id]
+struct_expr_field_list_spreads(
+  int id: @struct_expr_field_list ref,
+  int spread: @expr ref
+);
+
+struct_fields(
+  unique int id: @struct_field
+);
+
+#keyset[id, index]
+struct_field_attrs(
+  int id: @struct_field ref,
+  int index: int ref,
+  int attr: @attr ref
+);
+
+#keyset[id]
+struct_field_defaults(
+  int id: @struct_field ref,
+  int default: @expr ref
+);
+
+#keyset[id]
+struct_field_is_unsafe(
+  int id: @struct_field ref
+);
+
+#keyset[id]
+struct_field_names(
+  int id: @struct_field ref,
+  int name: @name ref
+);
+
+#keyset[id]
+struct_field_type_reprs(
+  int id: @struct_field ref,
+  int type_repr: @type_repr ref
+);
+
+#keyset[id]
+struct_field_visibilities(
+  int id: @struct_field ref,
+  int visibility: @visibility ref
+);
+
+struct_pat_fields(
+  unique int id: @struct_pat_field
+);
+
+#keyset[id, index]
+struct_pat_field_attrs(
+  int id: @struct_pat_field ref,
+  int index: int ref,
+  int attr: @attr ref
+);
+
+#keyset[id]
+struct_pat_field_identifiers(
+  int id: @struct_pat_field ref,
+  int identifier: @name_ref ref
+);
+
+#keyset[id]
+struct_pat_field_pats(
+  int id: @struct_pat_field ref,
+  int pat: @pat ref
+);
+
+struct_pat_field_lists(
+  unique int id: @struct_pat_field_list
+);
+
+#keyset[id, index]
+struct_pat_field_list_fields(
+  int id: @struct_pat_field_list ref,
+  int index: int ref,
+  int field: @struct_pat_field ref
+);
+
+#keyset[id]
+struct_pat_field_list_rest_pats(
+  int id: @struct_pat_field_list ref,
+  int rest_pat: @rest_pat ref
+);
+
+@token =
+  @comment
+;
+
+token_trees(
+  unique int id: @token_tree
+);
+
+tuple_fields(
+  unique int id: @tuple_field
+);
+
+#keyset[id, index]
+tuple_field_attrs(
+  int id: @tuple_field ref,
+  int index: int ref,
+  int attr: @attr ref
+);
+
+#keyset[id]
+tuple_field_type_reprs(
+  int id: @tuple_field ref,
+  int type_repr: @type_repr ref
+);
+
+#keyset[id]
+tuple_field_visibilities(
+  int id: @tuple_field ref,
+  int visibility: @visibility ref
+);
+
+type_bounds(
+  unique int id: @type_bound
+);
+
+#keyset[id]
+type_bound_is_async(
+  int id: @type_bound ref
+);
+
+#keyset[id]
+type_bound_is_const(
+  int id: @type_bound ref
+);
+
+#keyset[id]
+type_bound_lifetimes(
+  int id: @type_bound ref,
+  int lifetime: @lifetime ref
+);
+
+#keyset[id]
+type_bound_type_reprs(
+  int id: @type_bound ref,
+  int type_repr: @type_repr ref
+);
+
+#keyset[id]
+type_bound_use_bound_generic_args(
+  int id: @type_bound ref,
+  int use_bound_generic_args: @use_bound_generic_args ref
+);
+
+type_bound_lists(
+  unique int id: @type_bound_list
+);
+
+#keyset[id, index]
+type_bound_list_bounds(
+  int id: @type_bound_list ref,
+  int index: int ref,
+  int bound: @type_bound ref
+);
+
+@type_repr =
+  @array_type_repr
+| @dyn_trait_type_repr
+| @fn_ptr_type_repr
+| @for_type_repr
+| @impl_trait_type_repr
+| @infer_type_repr
+| @macro_type_repr
+| @never_type_repr
+| @paren_type_repr
+| @path_type_repr
+| @ptr_type_repr
+| @ref_type_repr
+| @slice_type_repr
+| @tuple_type_repr
+;
+
+@use_bound_generic_arg =
+  @lifetime
+| @name_ref
+;
+
+use_bound_generic_args(
+  unique int id: @use_bound_generic_args
+);
+
+#keyset[id, index]
+use_bound_generic_args_use_bound_generic_args(
+  int id: @use_bound_generic_args ref,
+  int index: int ref,
+  int use_bound_generic_arg: @use_bound_generic_arg ref
+);
+
+use_trees(
+  unique int id: @use_tree
+);
+
+#keyset[id]
+use_tree_is_glob(
+  int id: @use_tree ref
+);
+
+#keyset[id]
+use_tree_paths(
+  int id: @use_tree ref,
+  int path: @path ref
+);
+
+#keyset[id]
+use_tree_renames(
+  int id: @use_tree ref,
+  int rename: @rename ref
+);
+
+#keyset[id]
+use_tree_use_tree_lists(
+  int id: @use_tree ref,
+  int use_tree_list: @use_tree_list ref
+);
+
+use_tree_lists(
+  unique int id: @use_tree_list
+);
+
+#keyset[id, index]
+use_tree_list_use_trees(
+  int id: @use_tree_list ref,
+  int index: int ref,
+  int use_tree: @use_tree ref
+);
+
+@variant_def =
+  @struct
+| @union
+| @variant
+;
+
+variant_lists(
+  unique int id: @variant_list
+);
+
+#keyset[id, index]
+variant_list_variants(
+  int id: @variant_list ref,
+  int index: int ref,
+  int variant: @variant ref
+);
+
+visibilities(
+  unique int id: @visibility
+);
+
+#keyset[id]
+visibility_paths(
+  int id: @visibility ref,
+  int path: @path ref
+);
+
+where_clauses(
+  unique int id: @where_clause
+);
+
+#keyset[id, index]
+where_clause_predicates(
+  int id: @where_clause ref,
+  int index: int ref,
+  int predicate: @where_pred ref
+);
+
+where_preds(
+  unique int id: @where_pred
+);
+
+#keyset[id]
+where_pred_generic_param_lists(
+  int id: @where_pred ref,
+  int generic_param_list: @generic_param_list ref
+);
+
+#keyset[id]
+where_pred_lifetimes(
+  int id: @where_pred ref,
+  int lifetime: @lifetime ref
+);
+
+#keyset[id]
+where_pred_type_reprs(
+  int id: @where_pred ref,
+  int type_repr: @type_repr ref
+);
+
+#keyset[id]
+where_pred_type_bound_lists(
+  int id: @where_pred ref,
+  int type_bound_list: @type_bound_list ref
+);
+
+array_expr_internals(
+  unique int id: @array_expr_internal
+);
+
+#keyset[id, index]
+array_expr_internal_attrs(
+  int id: @array_expr_internal ref,
+  int index: int ref,
+  int attr: @attr ref
+);
+
+#keyset[id, index]
+array_expr_internal_exprs(
+  int id: @array_expr_internal ref,
+  int index: int ref,
+  int expr: @expr ref
+);
+
+#keyset[id]
+array_expr_internal_is_semicolon(
+  int id: @array_expr_internal ref
+);
+
+array_type_reprs(
+  unique int id: @array_type_repr
+);
+
+#keyset[id]
+array_type_repr_const_args(
+  int id: @array_type_repr ref,
+  int const_arg: @const_arg ref
+);
+
+#keyset[id]
+array_type_repr_element_type_reprs(
+  int id: @array_type_repr ref,
+  int element_type_repr: @type_repr ref
+);
+
+asm_clobber_abis(
+  unique int id: @asm_clobber_abi
+);
+
+asm_consts(
+  unique int id: @asm_const
+);
+
+#keyset[id]
+asm_const_exprs(
+  int id: @asm_const ref,
+  int expr: @expr ref
+);
+
+#keyset[id]
+asm_const_is_const(
+  int id: @asm_const ref
+);
+
+asm_exprs(
+  unique int id: @asm_expr
+);
+
+#keyset[id, index]
+asm_expr_asm_pieces(
+  int id: @asm_expr ref,
+  int index: int ref,
+  int asm_piece: @asm_piece ref
+);
+
+#keyset[id, index]
+asm_expr_attrs(
+  int id: @asm_expr ref,
+  int index: int ref,
+  int attr: @attr ref
+);
+
+#keyset[id, index]
+asm_expr_templates(
+  int id: @asm_expr ref,
+  int index: int ref,
+  int template: @expr ref
+);
+
+asm_labels(
+  unique int id: @asm_label
+);
+
+#keyset[id]
+asm_label_block_exprs(
+  int id: @asm_label ref,
+  int block_expr: @block_expr ref
+);
+
+asm_operand_nameds(
+  unique int id: @asm_operand_named
+);
+
+#keyset[id]
+asm_operand_named_asm_operands(
+  int id: @asm_operand_named ref,
+  int asm_operand: @asm_operand ref
+);
+
+#keyset[id]
+asm_operand_named_names(
+  int id: @asm_operand_named ref,
+  int name: @name ref
+);
+
+asm_options_lists(
+  unique int id: @asm_options_list
+);
+
+#keyset[id, index]
+asm_options_list_asm_options(
+  int id: @asm_options_list ref,
+  int index: int ref,
+  int asm_option: @asm_option ref
+);
+
+asm_reg_operands(
+  unique int id: @asm_reg_operand
+);
+
+#keyset[id]
+asm_reg_operand_asm_dir_specs(
+  int id: @asm_reg_operand ref,
+  int asm_dir_spec: @asm_dir_spec ref
+);
+
+#keyset[id]
+asm_reg_operand_asm_operand_exprs(
+  int id: @asm_reg_operand ref,
+  int asm_operand_expr: @asm_operand_expr ref
+);
+
+#keyset[id]
+asm_reg_operand_asm_reg_specs(
+  int id: @asm_reg_operand ref,
+  int asm_reg_spec: @asm_reg_spec ref
+);
+
+asm_syms(
+  unique int id: @asm_sym
+);
+
+#keyset[id]
+asm_sym_paths(
+  int id: @asm_sym ref,
+  int path: @path ref
+);
+
+assoc_type_args(
+  unique int id: @assoc_type_arg
+);
+
+#keyset[id]
+assoc_type_arg_const_args(
+  int id: @assoc_type_arg ref,
+  int const_arg: @const_arg ref
+);
+
+#keyset[id]
+assoc_type_arg_generic_arg_lists(
+  int id: @assoc_type_arg ref,
+  int generic_arg_list: @generic_arg_list ref
+);
+
+#keyset[id]
+assoc_type_arg_identifiers(
+  int id: @assoc_type_arg ref,
+  int identifier: @name_ref ref
+);
+
+#keyset[id]
+assoc_type_arg_param_lists(
+  int id: @assoc_type_arg ref,
+  int param_list: @param_list ref
+);
+
+#keyset[id]
+assoc_type_arg_ret_types(
+  int id: @assoc_type_arg ref,
+  int ret_type: @ret_type_repr ref
+);
+
+#keyset[id]
+assoc_type_arg_return_type_syntaxes(
+  int id: @assoc_type_arg ref,
+  int return_type_syntax: @return_type_syntax ref
+);
+
+#keyset[id]
+assoc_type_arg_type_reprs(
+  int id: @assoc_type_arg ref,
+  int type_repr: @type_repr ref
+);
+
+#keyset[id]
+assoc_type_arg_type_bound_lists(
+  int id: @assoc_type_arg ref,
+  int type_bound_list: @type_bound_list ref
+);
+
+await_exprs(
+  unique int id: @await_expr
+);
+
+#keyset[id, index]
+await_expr_attrs(
+  int id: @await_expr ref,
+  int index: int ref,
+  int attr: @attr ref
+);
+
+#keyset[id]
+await_expr_exprs(
+  int id: @await_expr ref,
+  int expr: @expr ref
+);
+
+become_exprs(
+  unique int id: @become_expr
+);
+
+#keyset[id, index]
+become_expr_attrs(
+  int id: @become_expr ref,
+  int index: int ref,
+  int attr: @attr ref
+);
+
+#keyset[id]
+become_expr_exprs(
+  int id: @become_expr ref,
+  int expr: @expr ref
+);
+
+binary_exprs(
+  unique int id: @binary_expr
+);
+
+#keyset[id, index]
+binary_expr_attrs(
+  int id: @binary_expr ref,
+  int index: int ref,
+  int attr: @attr ref
+);
+
+#keyset[id]
+binary_expr_lhs(
+  int id: @binary_expr ref,
+  int lhs: @expr ref
+);
+
+#keyset[id]
+binary_expr_operator_names(
+  int id: @binary_expr ref,
+  string operator_name: string ref
+);
+
+#keyset[id]
+binary_expr_rhs(
+  int id: @binary_expr ref,
+  int rhs: @expr ref
+);
+
+box_pats(
+  unique int id: @box_pat
+);
+
+#keyset[id]
+box_pat_pats(
+  int id: @box_pat ref,
+  int pat: @pat ref
+);
+
+break_exprs(
+  unique int id: @break_expr
+);
+
+#keyset[id, index]
+break_expr_attrs(
+  int id: @break_expr ref,
+  int index: int ref,
+  int attr: @attr ref
+);
+
+#keyset[id]
+break_expr_exprs(
+  int id: @break_expr ref,
+  int expr: @expr ref
+);
+
+#keyset[id]
+break_expr_lifetimes(
+  int id: @break_expr ref,
+  int lifetime: @lifetime ref
+);
+
+@call_expr_base =
+  @call_expr
+| @method_call_expr
+;
+
+#keyset[id]
+call_expr_base_arg_lists(
+  int id: @call_expr_base ref,
+  int arg_list: @arg_list ref
+);
+
+#keyset[id, index]
+call_expr_base_attrs(
+  int id: @call_expr_base ref,
+  int index: int ref,
+  int attr: @attr ref
+);
+
+cast_exprs(
+  unique int id: @cast_expr
+);
+
+#keyset[id, index]
+cast_expr_attrs(
+  int id: @cast_expr ref,
+  int index: int ref,
+  int attr: @attr ref
+);
+
+#keyset[id]
+cast_expr_exprs(
+  int id: @cast_expr ref,
+  int expr: @expr ref
+);
+
+#keyset[id]
+cast_expr_type_reprs(
+  int id: @cast_expr ref,
+  int type_repr: @type_repr ref
+);
+
+closure_exprs(
+  unique int id: @closure_expr
+);
+
+#keyset[id]
+closure_expr_bodies(
+  int id: @closure_expr ref,
+  int body: @expr ref
+);
+
+#keyset[id]
+closure_expr_closure_binders(
+  int id: @closure_expr ref,
+  int closure_binder: @closure_binder ref
+);
+
+#keyset[id]
+closure_expr_is_async(
+  int id: @closure_expr ref
+);
+
+#keyset[id]
+closure_expr_is_const(
+  int id: @closure_expr ref
+);
+
+#keyset[id]
+closure_expr_is_gen(
+  int id: @closure_expr ref
+);
+
+#keyset[id]
+closure_expr_is_move(
+  int id: @closure_expr ref
+);
+
+#keyset[id]
+closure_expr_is_static(
+  int id: @closure_expr ref
+);
+
+#keyset[id]
+closure_expr_ret_types(
+  int id: @closure_expr ref,
+  int ret_type: @ret_type_repr ref
+);
+
+comments(
+  unique int id: @comment,
+  int parent: @ast_node ref,
+  string text: string ref
+);
+
+const_args(
+  unique int id: @const_arg
+);
+
+#keyset[id]
+const_arg_exprs(
+  int id: @const_arg ref,
+  int expr: @expr ref
+);
+
+const_block_pats(
+  unique int id: @const_block_pat
+);
+
+#keyset[id]
+const_block_pat_block_exprs(
+  int id: @const_block_pat ref,
+  int block_expr: @block_expr ref
+);
+
+#keyset[id]
+const_block_pat_is_const(
+  int id: @const_block_pat ref
+);
+
+const_params(
+  unique int id: @const_param
+);
+
+#keyset[id, index]
+const_param_attrs(
+  int id: @const_param ref,
+  int index: int ref,
+  int attr: @attr ref
+);
+
+#keyset[id]
+const_param_default_vals(
+  int id: @const_param ref,
+  int default_val: @const_arg ref
+);
+
+#keyset[id]
+const_param_is_const(
+  int id: @const_param ref
+);
+
+#keyset[id]
+const_param_names(
+  int id: @const_param ref,
+  int name: @name ref
+);
+
+#keyset[id]
+const_param_type_reprs(
+  int id: @const_param ref,
+  int type_repr: @type_repr ref
+);
+
+continue_exprs(
+  unique int id: @continue_expr
+);
+
+#keyset[id, index]
+continue_expr_attrs(
+  int id: @continue_expr ref,
+  int index: int ref,
+  int attr: @attr ref
+);
+
+#keyset[id]
+continue_expr_lifetimes(
+  int id: @continue_expr ref,
+  int lifetime: @lifetime ref
+);
+
+dyn_trait_type_reprs(
+  unique int id: @dyn_trait_type_repr
+);
+
+#keyset[id]
+dyn_trait_type_repr_type_bound_lists(
+  int id: @dyn_trait_type_repr ref,
+  int type_bound_list: @type_bound_list ref
+);
+
+expr_stmts(
+  unique int id: @expr_stmt
+);
+
+#keyset[id]
+expr_stmt_exprs(
+  int id: @expr_stmt ref,
+  int expr: @expr ref
+);
+
+field_exprs(
+  unique int id: @field_expr
+);
+
+#keyset[id, index]
+field_expr_attrs(
+  int id: @field_expr ref,
+  int index: int ref,
+  int attr: @attr ref
+);
+
+#keyset[id]
+field_expr_containers(
+  int id: @field_expr ref,
+  int container: @expr ref
+);
+
+#keyset[id]
+field_expr_identifiers(
+  int id: @field_expr ref,
+  int identifier: @name_ref ref
+);
+
+fn_ptr_type_reprs(
+  unique int id: @fn_ptr_type_repr
+);
+
+#keyset[id]
+fn_ptr_type_repr_abis(
+  int id: @fn_ptr_type_repr ref,
+  int abi: @abi ref
+);
+
+#keyset[id]
+fn_ptr_type_repr_is_async(
+  int id: @fn_ptr_type_repr ref
+);
+
+#keyset[id]
+fn_ptr_type_repr_is_const(
+  int id: @fn_ptr_type_repr ref
+);
+
+#keyset[id]
+fn_ptr_type_repr_is_unsafe(
+  int id: @fn_ptr_type_repr ref
+);
+
+#keyset[id]
+fn_ptr_type_repr_param_lists(
+  int id: @fn_ptr_type_repr ref,
+  int param_list: @param_list ref
+);
+
+#keyset[id]
+fn_ptr_type_repr_ret_types(
+  int id: @fn_ptr_type_repr ref,
+  int ret_type: @ret_type_repr ref
+);
+
+for_type_reprs(
+  unique int id: @for_type_repr
+);
+
+#keyset[id]
+for_type_repr_generic_param_lists(
+  int id: @for_type_repr ref,
+  int generic_param_list: @generic_param_list ref
+);
+
+#keyset[id]
+for_type_repr_type_reprs(
+  int id: @for_type_repr ref,
+  int type_repr: @type_repr ref
+);
+
+format_args_exprs(
+  unique int id: @format_args_expr
+);
+
+#keyset[id, index]
+format_args_expr_args(
+  int id: @format_args_expr ref,
+  int index: int ref,
+  int arg: @format_args_arg ref
+);
+
+#keyset[id, index]
+format_args_expr_attrs(
+  int id: @format_args_expr ref,
+  int index: int ref,
+  int attr: @attr ref
+);
+
+#keyset[id]
+format_args_expr_templates(
+  int id: @format_args_expr ref,
+  int template: @expr ref
+);
+
+ident_pats(
+  unique int id: @ident_pat
+);
+
+#keyset[id, index]
+ident_pat_attrs(
+  int id: @ident_pat ref,
+  int index: int ref,
+  int attr: @attr ref
+);
+
+#keyset[id]
+ident_pat_is_mut(
+  int id: @ident_pat ref
+);
+
+#keyset[id]
+ident_pat_is_ref(
+  int id: @ident_pat ref
+);
+
+#keyset[id]
+ident_pat_names(
+  int id: @ident_pat ref,
+  int name: @name ref
+);
+
+#keyset[id]
+ident_pat_pats(
+  int id: @ident_pat ref,
+  int pat: @pat ref
+);
+
+if_exprs(
+  unique int id: @if_expr
+);
+
+#keyset[id, index]
+if_expr_attrs(
+  int id: @if_expr ref,
+  int index: int ref,
+  int attr: @attr ref
+);
+
+#keyset[id]
+if_expr_conditions(
+  int id: @if_expr ref,
+  int condition: @expr ref
+);
+
+#keyset[id]
+if_expr_elses(
+  int id: @if_expr ref,
+  int else: @expr ref
+);
+
+#keyset[id]
+if_expr_thens(
+  int id: @if_expr ref,
+  int then: @block_expr ref
+);
+
+impl_trait_type_reprs(
+  unique int id: @impl_trait_type_repr
+);
+
+#keyset[id]
+impl_trait_type_repr_type_bound_lists(
+  int id: @impl_trait_type_repr ref,
+  int type_bound_list: @type_bound_list ref
+);
+
+index_exprs(
+  unique int id: @index_expr
+);
+
+#keyset[id, index]
+index_expr_attrs(
+  int id: @index_expr ref,
+  int index: int ref,
+  int attr: @attr ref
+);
+
+#keyset[id]
+index_expr_bases(
+  int id: @index_expr ref,
+  int base: @expr ref
+);
+
+#keyset[id]
+index_expr_indices(
+  int id: @index_expr ref,
+  int index: @expr ref
+);
+
+infer_type_reprs(
+  unique int id: @infer_type_repr
+);
+
+@item =
+  @const
+| @enum
+| @extern_block
+| @extern_crate
+| @function
+| @impl
+| @macro_call
+| @macro_def
+| @macro_rules
+| @module
+| @static
+| @struct
+| @trait
+| @trait_alias
+| @type_alias
+| @union
+| @use
+;
+
+#keyset[id]
+item_attribute_macro_expansions(
+  int id: @item ref,
+  int attribute_macro_expansion: @macro_items ref
+);
+
+@labelable_expr =
+  @block_expr
+| @looping_expr
+;
+
+#keyset[id]
+labelable_expr_labels(
+  int id: @labelable_expr ref,
+  int label: @label ref
+);
+
+let_exprs(
+  unique int id: @let_expr
+);
+
+#keyset[id, index]
+let_expr_attrs(
+  int id: @let_expr ref,
+  int index: int ref,
+  int attr: @attr ref
+);
+
+#keyset[id]
+let_expr_scrutinees(
+  int id: @let_expr ref,
+  int scrutinee: @expr ref
+);
+
+#keyset[id]
+let_expr_pats(
+  int id: @let_expr ref,
+  int pat: @pat ref
+);
+
+let_stmts(
+  unique int id: @let_stmt
+);
+
+#keyset[id, index]
+let_stmt_attrs(
+  int id: @let_stmt ref,
+  int index: int ref,
+  int attr: @attr ref
+);
+
+#keyset[id]
+let_stmt_initializers(
+  int id: @let_stmt ref,
+  int initializer: @expr ref
+);
+
+#keyset[id]
+let_stmt_let_elses(
+  int id: @let_stmt ref,
+  int let_else: @let_else ref
+);
+
+#keyset[id]
+let_stmt_pats(
+  int id: @let_stmt ref,
+  int pat: @pat ref
+);
+
+#keyset[id]
+let_stmt_type_reprs(
+  int id: @let_stmt ref,
+  int type_repr: @type_repr ref
+);
+
+lifetimes(
+  unique int id: @lifetime
+);
+
+#keyset[id]
+lifetime_texts(
+  int id: @lifetime ref,
+  string text: string ref
+);
+
+lifetime_args(
+  unique int id: @lifetime_arg
+);
+
+#keyset[id]
+lifetime_arg_lifetimes(
+  int id: @lifetime_arg ref,
+  int lifetime: @lifetime ref
+);
+
+lifetime_params(
+  unique int id: @lifetime_param
+);
+
+#keyset[id, index]
+lifetime_param_attrs(
+  int id: @lifetime_param ref,
+  int index: int ref,
+  int attr: @attr ref
+);
+
+#keyset[id]
+lifetime_param_lifetimes(
+  int id: @lifetime_param ref,
+  int lifetime: @lifetime ref
+);
+
+#keyset[id]
+lifetime_param_type_bound_lists(
+  int id: @lifetime_param ref,
+  int type_bound_list: @type_bound_list ref
+);
+
+literal_exprs(
+  unique int id: @literal_expr
+);
+
+#keyset[id, index]
+literal_expr_attrs(
+  int id: @literal_expr ref,
+  int index: int ref,
+  int attr: @attr ref
+);
+
+#keyset[id]
+literal_expr_text_values(
+  int id: @literal_expr ref,
+  string text_value: string ref
+);
+
+literal_pats(
+  unique int id: @literal_pat
+);
+
+#keyset[id]
+literal_pat_literals(
+  int id: @literal_pat ref,
+  int literal: @literal_expr ref
+);
+
+macro_block_exprs(
+  unique int id: @macro_block_expr
+);
+
+#keyset[id]
+macro_block_expr_tail_exprs(
+  int id: @macro_block_expr ref,
+  int tail_expr: @expr ref
+);
+
+#keyset[id, index]
+macro_block_expr_statements(
+  int id: @macro_block_expr ref,
+  int index: int ref,
+  int statement: @stmt ref
+);
+
+macro_exprs(
+  unique int id: @macro_expr
+);
+
+#keyset[id]
+macro_expr_macro_calls(
+  int id: @macro_expr ref,
+  int macro_call: @macro_call ref
+);
+
+macro_pats(
+  unique int id: @macro_pat
+);
+
+#keyset[id]
+macro_pat_macro_calls(
+  int id: @macro_pat ref,
+  int macro_call: @macro_call ref
+);
+
+macro_type_reprs(
+  unique int id: @macro_type_repr
+);
+
+#keyset[id]
+macro_type_repr_macro_calls(
+  int id: @macro_type_repr ref,
+  int macro_call: @macro_call ref
+);
+
+match_exprs(
+  unique int id: @match_expr
+);
+
+#keyset[id, index]
+match_expr_attrs(
+  int id: @match_expr ref,
+  int index: int ref,
+  int attr: @attr ref
+);
+
+#keyset[id]
+match_expr_scrutinees(
+  int id: @match_expr ref,
+  int scrutinee: @expr ref
+);
+
+#keyset[id]
+match_expr_match_arm_lists(
+  int id: @match_expr ref,
+  int match_arm_list: @match_arm_list ref
+);
+
+name_refs(
+  unique int id: @name_ref
+);
+
+#keyset[id]
+name_ref_texts(
+  int id: @name_ref ref,
+  string text: string ref
+);
+
+never_type_reprs(
+  unique int id: @never_type_repr
+);
+
+offset_of_exprs(
+  unique int id: @offset_of_expr
+);
+
+#keyset[id, index]
+offset_of_expr_attrs(
+  int id: @offset_of_expr ref,
+  int index: int ref,
+  int attr: @attr ref
+);
+
+#keyset[id, index]
+offset_of_expr_fields(
+  int id: @offset_of_expr ref,
+  int index: int ref,
+  int field: @name_ref ref
+);
+
+#keyset[id]
+offset_of_expr_type_reprs(
+  int id: @offset_of_expr ref,
+  int type_repr: @type_repr ref
+);
+
+or_pats(
+  unique int id: @or_pat
+);
+
+#keyset[id, index]
+or_pat_pats(
+  int id: @or_pat ref,
+  int index: int ref,
+  int pat: @pat ref
+);
+
+params(
+  unique int id: @param
+);
+
+#keyset[id]
+param_pats(
+  int id: @param ref,
+  int pat: @pat ref
+);
+
+paren_exprs(
+  unique int id: @paren_expr
+);
+
+#keyset[id, index]
+paren_expr_attrs(
+  int id: @paren_expr ref,
+  int index: int ref,
+  int attr: @attr ref
+);
+
+#keyset[id]
+paren_expr_exprs(
+  int id: @paren_expr ref,
+  int expr: @expr ref
+);
+
+paren_pats(
+  unique int id: @paren_pat
+);
+
+#keyset[id]
+paren_pat_pats(
+  int id: @paren_pat ref,
+  int pat: @pat ref
+);
+
+paren_type_reprs(
+  unique int id: @paren_type_repr
+);
+
+#keyset[id]
+paren_type_repr_type_reprs(
+  int id: @paren_type_repr ref,
+  int type_repr: @type_repr ref
+);
+
+@path_ast_node =
+  @path_expr
+| @path_pat
+| @struct_expr
+| @struct_pat
+| @tuple_struct_pat
+;
+
+#keyset[id]
+path_ast_node_paths(
+  int id: @path_ast_node ref,
+  int path: @path ref
+);
+
+@path_expr_base =
+  @path_expr
+;
+
+path_type_reprs(
+  unique int id: @path_type_repr
+);
+
+#keyset[id]
+path_type_repr_paths(
+  int id: @path_type_repr ref,
+  int path: @path ref
+);
+
+prefix_exprs(
+  unique int id: @prefix_expr
+);
+
+#keyset[id, index]
+prefix_expr_attrs(
+  int id: @prefix_expr ref,
+  int index: int ref,
+  int attr: @attr ref
+);
+
+#keyset[id]
+prefix_expr_exprs(
+  int id: @prefix_expr ref,
+  int expr: @expr ref
+);
+
+#keyset[id]
+prefix_expr_operator_names(
+  int id: @prefix_expr ref,
+  string operator_name: string ref
+);
+
+ptr_type_reprs(
+  unique int id: @ptr_type_repr
+);
+
+#keyset[id]
+ptr_type_repr_is_const(
+  int id: @ptr_type_repr ref
+);
+
+#keyset[id]
+ptr_type_repr_is_mut(
+  int id: @ptr_type_repr ref
+);
+
+#keyset[id]
+ptr_type_repr_type_reprs(
+  int id: @ptr_type_repr ref,
+  int type_repr: @type_repr ref
+);
+
+range_exprs(
+  unique int id: @range_expr
+);
+
+#keyset[id, index]
+range_expr_attrs(
+  int id: @range_expr ref,
+  int index: int ref,
+  int attr: @attr ref
+);
+
+#keyset[id]
+range_expr_ends(
+  int id: @range_expr ref,
+  int end: @expr ref
+);
+
+#keyset[id]
+range_expr_operator_names(
+  int id: @range_expr ref,
+  string operator_name: string ref
+);
+
+#keyset[id]
+range_expr_starts(
+  int id: @range_expr ref,
+  int start: @expr ref
+);
+
+range_pats(
+  unique int id: @range_pat
+);
+
+#keyset[id]
+range_pat_ends(
+  int id: @range_pat ref,
+  int end: @pat ref
+);
+
+#keyset[id]
+range_pat_operator_names(
+  int id: @range_pat ref,
+  string operator_name: string ref
+);
+
+#keyset[id]
+range_pat_starts(
+  int id: @range_pat ref,
+  int start: @pat ref
+);
+
+ref_exprs(
+  unique int id: @ref_expr
+);
+
+#keyset[id, index]
+ref_expr_attrs(
+  int id: @ref_expr ref,
+  int index: int ref,
+  int attr: @attr ref
+);
+
+#keyset[id]
+ref_expr_exprs(
+  int id: @ref_expr ref,
+  int expr: @expr ref
+);
+
+#keyset[id]
+ref_expr_is_const(
+  int id: @ref_expr ref
+);
+
+#keyset[id]
+ref_expr_is_mut(
+  int id: @ref_expr ref
+);
+
+#keyset[id]
+ref_expr_is_raw(
+  int id: @ref_expr ref
+);
+
+ref_pats(
+  unique int id: @ref_pat
+);
+
+#keyset[id]
+ref_pat_is_mut(
+  int id: @ref_pat ref
+);
+
+#keyset[id]
+ref_pat_pats(
+  int id: @ref_pat ref,
+  int pat: @pat ref
+);
+
+ref_type_reprs(
+  unique int id: @ref_type_repr
+);
+
+#keyset[id]
+ref_type_repr_is_mut(
+  int id: @ref_type_repr ref
+);
+
+#keyset[id]
+ref_type_repr_lifetimes(
+  int id: @ref_type_repr ref,
+  int lifetime: @lifetime ref
+);
+
+#keyset[id]
+ref_type_repr_type_reprs(
+  int id: @ref_type_repr ref,
+  int type_repr: @type_repr ref
+);
+
+rest_pats(
+  unique int id: @rest_pat
+);
+
+#keyset[id, index]
+rest_pat_attrs(
+  int id: @rest_pat ref,
+  int index: int ref,
+  int attr: @attr ref
+);
+
+return_exprs(
+  unique int id: @return_expr
+);
+
+#keyset[id, index]
+return_expr_attrs(
+  int id: @return_expr ref,
+  int index: int ref,
+  int attr: @attr ref
+);
+
+#keyset[id]
+return_expr_exprs(
+  int id: @return_expr ref,
+  int expr: @expr ref
+);
+
+self_params(
+  unique int id: @self_param
+);
+
+#keyset[id]
+self_param_is_ref(
+  int id: @self_param ref
+);
+
+#keyset[id]
+self_param_is_mut(
+  int id: @self_param ref
+);
+
+#keyset[id]
+self_param_lifetimes(
+  int id: @self_param ref,
+  int lifetime: @lifetime ref
+);
+
+#keyset[id]
+self_param_names(
+  int id: @self_param ref,
+  int name: @name ref
+);
+
+slice_pats(
+  unique int id: @slice_pat
+);
+
+#keyset[id, index]
+slice_pat_pats(
+  int id: @slice_pat ref,
+  int index: int ref,
+  int pat: @pat ref
+);
+
+slice_type_reprs(
+  unique int id: @slice_type_repr
+);
+
+#keyset[id]
+slice_type_repr_type_reprs(
+  int id: @slice_type_repr ref,
+  int type_repr: @type_repr ref
+);
+
+struct_field_lists(
+  unique int id: @struct_field_list
+);
+
+#keyset[id, index]
+struct_field_list_fields(
+  int id: @struct_field_list ref,
+  int index: int ref,
+  int field: @struct_field ref
+);
+
+try_exprs(
+  unique int id: @try_expr
+);
+
+#keyset[id, index]
+try_expr_attrs(
+  int id: @try_expr ref,
+  int index: int ref,
+  int attr: @attr ref
+);
+
+#keyset[id]
+try_expr_exprs(
+  int id: @try_expr ref,
+  int expr: @expr ref
+);
+
+tuple_exprs(
+  unique int id: @tuple_expr
+);
+
+#keyset[id, index]
+tuple_expr_attrs(
+  int id: @tuple_expr ref,
+  int index: int ref,
+  int attr: @attr ref
+);
+
+#keyset[id, index]
+tuple_expr_fields(
+  int id: @tuple_expr ref,
+  int index: int ref,
+  int field: @expr ref
+);
+
+tuple_field_lists(
+  unique int id: @tuple_field_list
+);
+
+#keyset[id, index]
+tuple_field_list_fields(
+  int id: @tuple_field_list ref,
+  int index: int ref,
+  int field: @tuple_field ref
+);
+
+tuple_pats(
+  unique int id: @tuple_pat
+);
+
+#keyset[id, index]
+tuple_pat_fields(
+  int id: @tuple_pat ref,
+  int index: int ref,
+  int field: @pat ref
+);
+
+tuple_type_reprs(
+  unique int id: @tuple_type_repr
+);
+
+#keyset[id, index]
+tuple_type_repr_fields(
+  int id: @tuple_type_repr ref,
+  int index: int ref,
+  int field: @type_repr ref
+);
+
+type_args(
+  unique int id: @type_arg
+);
+
+#keyset[id]
+type_arg_type_reprs(
+  int id: @type_arg ref,
+  int type_repr: @type_repr ref
+);
+
+type_params(
+  unique int id: @type_param
+);
+
+#keyset[id, index]
+type_param_attrs(
+  int id: @type_param ref,
+  int index: int ref,
+  int attr: @attr ref
+);
+
+#keyset[id]
+type_param_default_types(
+  int id: @type_param ref,
+  int default_type: @type_repr ref
+);
+
+#keyset[id]
+type_param_names(
+  int id: @type_param ref,
+  int name: @name ref
+);
+
+#keyset[id]
+type_param_type_bound_lists(
+  int id: @type_param ref,
+  int type_bound_list: @type_bound_list ref
+);
+
+underscore_exprs(
+  unique int id: @underscore_expr
+);
+
+#keyset[id, index]
+underscore_expr_attrs(
+  int id: @underscore_expr ref,
+  int index: int ref,
+  int attr: @attr ref
+);
+
+variants(
+  unique int id: @variant
+);
+
+#keyset[id, index]
+variant_attrs(
+  int id: @variant ref,
+  int index: int ref,
+  int attr: @attr ref
+);
+
+#keyset[id]
+variant_discriminants(
+  int id: @variant ref,
+  int discriminant: @expr ref
+);
+
+#keyset[id]
+variant_field_lists(
+  int id: @variant ref,
+  int field_list: @field_list ref
+);
+
+#keyset[id]
+variant_names(
+  int id: @variant ref,
+  int name: @name ref
+);
+
+#keyset[id]
+variant_visibilities(
+  int id: @variant ref,
+  int visibility: @visibility ref
+);
+
+wildcard_pats(
+  unique int id: @wildcard_pat
+);
+
+yeet_exprs(
+  unique int id: @yeet_expr
+);
+
+#keyset[id, index]
+yeet_expr_attrs(
+  int id: @yeet_expr ref,
+  int index: int ref,
+  int attr: @attr ref
+);
+
+#keyset[id]
+yeet_expr_exprs(
+  int id: @yeet_expr ref,
+  int expr: @expr ref
+);
+
+yield_exprs(
+  unique int id: @yield_expr
+);
+
+#keyset[id, index]
+yield_expr_attrs(
+  int id: @yield_expr ref,
+  int index: int ref,
+  int attr: @attr ref
+);
+
+#keyset[id]
+yield_expr_exprs(
+  int id: @yield_expr ref,
+  int expr: @expr ref
+);
+
+block_exprs(
+  unique int id: @block_expr
+);
+
+#keyset[id, index]
+block_expr_attrs(
+  int id: @block_expr ref,
+  int index: int ref,
+  int attr: @attr ref
+);
+
+#keyset[id]
+block_expr_is_async(
+  int id: @block_expr ref
+);
+
+#keyset[id]
+block_expr_is_const(
+  int id: @block_expr ref
+);
+
+#keyset[id]
+block_expr_is_gen(
+  int id: @block_expr ref
+);
+
+#keyset[id]
+block_expr_is_move(
+  int id: @block_expr ref
+);
+
+#keyset[id]
+block_expr_is_try(
+  int id: @block_expr ref
+);
+
+#keyset[id]
+block_expr_is_unsafe(
+  int id: @block_expr ref
+);
+
+#keyset[id]
+block_expr_stmt_lists(
+  int id: @block_expr ref,
+  int stmt_list: @stmt_list ref
+);
+
+call_exprs(
+  unique int id: @call_expr
+);
+
+#keyset[id]
+call_expr_functions(
+  int id: @call_expr ref,
+  int function: @expr ref
+);
+
+consts(
+  unique int id: @const
+);
+
+#keyset[id, index]
+const_attrs(
+  int id: @const ref,
+  int index: int ref,
+  int attr: @attr ref
+);
+
+#keyset[id]
+const_bodies(
+  int id: @const ref,
+  int body: @expr ref
+);
+
+#keyset[id]
+const_is_const(
+  int id: @const ref
+);
+
+#keyset[id]
+const_is_default(
+  int id: @const ref
+);
+
+#keyset[id]
+const_names(
+  int id: @const ref,
+  int name: @name ref
+);
+
+#keyset[id]
+const_type_reprs(
+  int id: @const ref,
+  int type_repr: @type_repr ref
+);
+
+#keyset[id]
+const_visibilities(
+  int id: @const ref,
+  int visibility: @visibility ref
+);
+
+#keyset[id]
+const_has_implementation(
+  int id: @const ref
+);
+
+enums(
+  unique int id: @enum
+);
+
+#keyset[id, index]
+enum_attrs(
+  int id: @enum ref,
+  int index: int ref,
+  int attr: @attr ref
+);
+
+#keyset[id]
+enum_generic_param_lists(
+  int id: @enum ref,
+  int generic_param_list: @generic_param_list ref
+);
+
+#keyset[id]
+enum_names(
+  int id: @enum ref,
+  int name: @name ref
+);
+
+#keyset[id]
+enum_variant_lists(
+  int id: @enum ref,
+  int variant_list: @variant_list ref
+);
+
+#keyset[id]
+enum_visibilities(
+  int id: @enum ref,
+  int visibility: @visibility ref
+);
+
+#keyset[id]
+enum_where_clauses(
+  int id: @enum ref,
+  int where_clause: @where_clause ref
+);
+
+extern_blocks(
+  unique int id: @extern_block
+);
+
+#keyset[id]
+extern_block_abis(
+  int id: @extern_block ref,
+  int abi: @abi ref
+);
+
+#keyset[id, index]
+extern_block_attrs(
+  int id: @extern_block ref,
+  int index: int ref,
+  int attr: @attr ref
+);
+
+#keyset[id]
+extern_block_extern_item_lists(
+  int id: @extern_block ref,
+  int extern_item_list: @extern_item_list ref
+);
+
+#keyset[id]
+extern_block_is_unsafe(
+  int id: @extern_block ref
+);
+
+extern_crates(
+  unique int id: @extern_crate
+);
+
+#keyset[id, index]
+extern_crate_attrs(
+  int id: @extern_crate ref,
+  int index: int ref,
+  int attr: @attr ref
+);
+
+#keyset[id]
+extern_crate_identifiers(
+  int id: @extern_crate ref,
+  int identifier: @name_ref ref
+);
+
+#keyset[id]
+extern_crate_renames(
+  int id: @extern_crate ref,
+  int rename: @rename ref
+);
+
+#keyset[id]
+extern_crate_visibilities(
+  int id: @extern_crate ref,
+  int visibility: @visibility ref
+);
+
+functions(
+  unique int id: @function
+);
+
+#keyset[id]
+function_abis(
+  int id: @function ref,
+  int abi: @abi ref
+);
+
+#keyset[id]
+function_bodies(
+  int id: @function ref,
+  int body: @block_expr ref
+);
+
+#keyset[id]
+function_generic_param_lists(
+  int id: @function ref,
+  int generic_param_list: @generic_param_list ref
+);
+
+#keyset[id]
+function_is_async(
+  int id: @function ref
+);
+
+#keyset[id]
+function_is_const(
+  int id: @function ref
+);
+
+#keyset[id]
+function_is_default(
+  int id: @function ref
+);
+
+#keyset[id]
+function_is_gen(
+  int id: @function ref
+);
+
+#keyset[id]
+function_is_unsafe(
+  int id: @function ref
+);
+
+#keyset[id]
+function_names(
+  int id: @function ref,
+  int name: @name ref
+);
+
+#keyset[id]
+function_ret_types(
+  int id: @function ref,
+  int ret_type: @ret_type_repr ref
+);
+
+#keyset[id]
+function_visibilities(
+  int id: @function ref,
+  int visibility: @visibility ref
+);
+
+#keyset[id]
+function_where_clauses(
+  int id: @function ref,
+  int where_clause: @where_clause ref
+);
+
+#keyset[id]
+function_has_implementation(
+  int id: @function ref
+);
+
+impls(
+  unique int id: @impl
+);
+
+#keyset[id]
+impl_assoc_item_lists(
+  int id: @impl ref,
+  int assoc_item_list: @assoc_item_list ref
+);
+
+#keyset[id, index]
+impl_attrs(
+  int id: @impl ref,
+  int index: int ref,
+  int attr: @attr ref
+);
+
+#keyset[id]
+impl_generic_param_lists(
+  int id: @impl ref,
+  int generic_param_list: @generic_param_list ref
+);
+
+#keyset[id]
+impl_is_const(
+  int id: @impl ref
+);
+
+#keyset[id]
+impl_is_default(
+  int id: @impl ref
+);
+
+#keyset[id]
+impl_is_unsafe(
+  int id: @impl ref
+);
+
+#keyset[id]
+impl_self_ties(
+  int id: @impl ref,
+  int self_ty: @type_repr ref
+);
+
+#keyset[id]
+impl_traits(
+  int id: @impl ref,
+  int trait: @type_repr ref
+);
+
+#keyset[id]
+impl_visibilities(
+  int id: @impl ref,
+  int visibility: @visibility ref
+);
+
+#keyset[id]
+impl_where_clauses(
+  int id: @impl ref,
+  int where_clause: @where_clause ref
+);
+
+@looping_expr =
+  @for_expr
+| @loop_expr
+| @while_expr
+;
+
+#keyset[id]
+looping_expr_loop_bodies(
+  int id: @looping_expr ref,
+  int loop_body: @block_expr ref
+);
+
+macro_calls(
+  unique int id: @macro_call
+);
+
+#keyset[id, index]
+macro_call_attrs(
+  int id: @macro_call ref,
+  int index: int ref,
+  int attr: @attr ref
+);
+
+#keyset[id]
+macro_call_paths(
+  int id: @macro_call ref,
+  int path: @path ref
+);
+
+#keyset[id]
+macro_call_token_trees(
+  int id: @macro_call ref,
+  int token_tree: @token_tree ref
+);
+
+#keyset[id]
+macro_call_macro_call_expansions(
+  int id: @macro_call ref,
+  int macro_call_expansion: @ast_node ref
+);
+
+macro_defs(
+  unique int id: @macro_def
+);
+
+#keyset[id]
+macro_def_args(
+  int id: @macro_def ref,
+  int args: @token_tree ref
+);
+
+#keyset[id, index]
+macro_def_attrs(
+  int id: @macro_def ref,
+  int index: int ref,
+  int attr: @attr ref
+);
+
+#keyset[id]
+macro_def_bodies(
+  int id: @macro_def ref,
+  int body: @token_tree ref
+);
+
+#keyset[id]
+macro_def_names(
+  int id: @macro_def ref,
+  int name: @name ref
+);
+
+#keyset[id]
+macro_def_visibilities(
+  int id: @macro_def ref,
+  int visibility: @visibility ref
+);
+
+macro_rules(
+  unique int id: @macro_rules
+);
+
+#keyset[id, index]
+macro_rules_attrs(
+  int id: @macro_rules ref,
+  int index: int ref,
+  int attr: @attr ref
+);
+
+#keyset[id]
+macro_rules_names(
+  int id: @macro_rules ref,
+  int name: @name ref
+);
+
+#keyset[id]
+macro_rules_token_trees(
+  int id: @macro_rules ref,
+  int token_tree: @token_tree ref
+);
+
+#keyset[id]
+macro_rules_visibilities(
+  int id: @macro_rules ref,
+  int visibility: @visibility ref
+);
+
+method_call_exprs(
+  unique int id: @method_call_expr
+);
+
+#keyset[id]
+method_call_expr_generic_arg_lists(
+  int id: @method_call_expr ref,
+  int generic_arg_list: @generic_arg_list ref
+);
+
+#keyset[id]
+method_call_expr_identifiers(
+  int id: @method_call_expr ref,
+  int identifier: @name_ref ref
+);
+
+#keyset[id]
+method_call_expr_receivers(
+  int id: @method_call_expr ref,
+  int receiver: @expr ref
+);
+
+modules(
+  unique int id: @module
+);
+
+#keyset[id, index]
+module_attrs(
+  int id: @module ref,
+  int index: int ref,
+  int attr: @attr ref
+);
+
+#keyset[id]
+module_item_lists(
+  int id: @module ref,
+  int item_list: @item_list ref
+);
+
+#keyset[id]
+module_names(
+  int id: @module ref,
+  int name: @name ref
+);
+
+#keyset[id]
+module_visibilities(
+  int id: @module ref,
+  int visibility: @visibility ref
+);
+
+path_exprs(
+  unique int id: @path_expr
+);
+
+#keyset[id, index]
+path_expr_attrs(
+  int id: @path_expr ref,
+  int index: int ref,
+  int attr: @attr ref
+);
+
+path_pats(
+  unique int id: @path_pat
+);
+
+statics(
+  unique int id: @static
+);
+
+#keyset[id, index]
+static_attrs(
+  int id: @static ref,
+  int index: int ref,
+  int attr: @attr ref
+);
+
+#keyset[id]
+static_bodies(
+  int id: @static ref,
+  int body: @expr ref
+);
+
+#keyset[id]
+static_is_mut(
+  int id: @static ref
+);
+
+#keyset[id]
+static_is_static(
+  int id: @static ref
+);
+
+#keyset[id]
+static_is_unsafe(
+  int id: @static ref
+);
+
+#keyset[id]
+static_names(
+  int id: @static ref,
+  int name: @name ref
+);
+
+#keyset[id]
+static_type_reprs(
+  int id: @static ref,
+  int type_repr: @type_repr ref
+);
+
+#keyset[id]
+static_visibilities(
+  int id: @static ref,
+  int visibility: @visibility ref
+);
+
+structs(
+  unique int id: @struct
+);
+
+#keyset[id, index]
+struct_attrs(
+  int id: @struct ref,
+  int index: int ref,
+  int attr: @attr ref
+);
+
+#keyset[id]
+struct_field_lists_(
+  int id: @struct ref,
+  int field_list: @field_list ref
+);
+
+#keyset[id]
+struct_generic_param_lists(
+  int id: @struct ref,
+  int generic_param_list: @generic_param_list ref
+);
+
+#keyset[id]
+struct_names(
+  int id: @struct ref,
+  int name: @name ref
+);
+
+#keyset[id]
+struct_visibilities(
+  int id: @struct ref,
+  int visibility: @visibility ref
+);
+
+#keyset[id]
+struct_where_clauses(
+  int id: @struct ref,
+  int where_clause: @where_clause ref
+);
+
+struct_exprs(
+  unique int id: @struct_expr
+);
+
+#keyset[id]
+struct_expr_struct_expr_field_lists(
+  int id: @struct_expr ref,
+  int struct_expr_field_list: @struct_expr_field_list ref
+);
+
+struct_pats(
+  unique int id: @struct_pat
+);
+
+#keyset[id]
+struct_pat_struct_pat_field_lists(
+  int id: @struct_pat ref,
+  int struct_pat_field_list: @struct_pat_field_list ref
+);
+
+traits(
+  unique int id: @trait
+);
+
+#keyset[id]
+trait_assoc_item_lists(
+  int id: @trait ref,
+  int assoc_item_list: @assoc_item_list ref
+);
+
+#keyset[id, index]
+trait_attrs(
+  int id: @trait ref,
+  int index: int ref,
+  int attr: @attr ref
+);
+
+#keyset[id]
+trait_generic_param_lists(
+  int id: @trait ref,
+  int generic_param_list: @generic_param_list ref
+);
+
+#keyset[id]
+trait_is_auto(
+  int id: @trait ref
+);
+
+#keyset[id]
+trait_is_unsafe(
+  int id: @trait ref
+);
+
+#keyset[id]
+trait_names(
+  int id: @trait ref,
+  int name: @name ref
+);
+
+#keyset[id]
+trait_type_bound_lists(
+  int id: @trait ref,
+  int type_bound_list: @type_bound_list ref
+);
+
+#keyset[id]
+trait_visibilities(
+  int id: @trait ref,
+  int visibility: @visibility ref
+);
+
+#keyset[id]
+trait_where_clauses(
+  int id: @trait ref,
+  int where_clause: @where_clause ref
+);
+
+trait_aliases(
+  unique int id: @trait_alias
+);
+
+#keyset[id, index]
+trait_alias_attrs(
+  int id: @trait_alias ref,
+  int index: int ref,
+  int attr: @attr ref
+);
+
+#keyset[id]
+trait_alias_generic_param_lists(
+  int id: @trait_alias ref,
+  int generic_param_list: @generic_param_list ref
+);
+
+#keyset[id]
+trait_alias_names(
+  int id: @trait_alias ref,
+  int name: @name ref
+);
+
+#keyset[id]
+trait_alias_type_bound_lists(
+  int id: @trait_alias ref,
+  int type_bound_list: @type_bound_list ref
+);
+
+#keyset[id]
+trait_alias_visibilities(
+  int id: @trait_alias ref,
+  int visibility: @visibility ref
+);
+
+#keyset[id]
+trait_alias_where_clauses(
+  int id: @trait_alias ref,
+  int where_clause: @where_clause ref
+);
+
+tuple_struct_pats(
+  unique int id: @tuple_struct_pat
+);
+
+#keyset[id, index]
+tuple_struct_pat_fields(
+  int id: @tuple_struct_pat ref,
+  int index: int ref,
+  int field: @pat ref
+);
+
+type_aliases(
+  unique int id: @type_alias
+);
+
+#keyset[id, index]
+type_alias_attrs(
+  int id: @type_alias ref,
+  int index: int ref,
+  int attr: @attr ref
+);
+
+#keyset[id]
+type_alias_generic_param_lists(
+  int id: @type_alias ref,
+  int generic_param_list: @generic_param_list ref
+);
+
+#keyset[id]
+type_alias_is_default(
+  int id: @type_alias ref
+);
+
+#keyset[id]
+type_alias_names(
+  int id: @type_alias ref,
+  int name: @name ref
+);
+
+#keyset[id]
+type_alias_type_reprs(
+  int id: @type_alias ref,
+  int type_repr: @type_repr ref
+);
+
+#keyset[id]
+type_alias_type_bound_lists(
+  int id: @type_alias ref,
+  int type_bound_list: @type_bound_list ref
+);
+
+#keyset[id]
+type_alias_visibilities(
+  int id: @type_alias ref,
+  int visibility: @visibility ref
+);
+
+#keyset[id]
+type_alias_where_clauses(
+  int id: @type_alias ref,
+  int where_clause: @where_clause ref
+);
+
+unions(
+  unique int id: @union
+);
+
+#keyset[id, index]
+union_attrs(
+  int id: @union ref,
+  int index: int ref,
+  int attr: @attr ref
+);
+
+#keyset[id]
+union_generic_param_lists(
+  int id: @union ref,
+  int generic_param_list: @generic_param_list ref
+);
+
+#keyset[id]
+union_names(
+  int id: @union ref,
+  int name: @name ref
+);
+
+#keyset[id]
+union_struct_field_lists(
+  int id: @union ref,
+  int struct_field_list: @struct_field_list ref
+);
+
+#keyset[id]
+union_visibilities(
+  int id: @union ref,
+  int visibility: @visibility ref
+);
+
+#keyset[id]
+union_where_clauses(
+  int id: @union ref,
+  int where_clause: @where_clause ref
+);
+
+uses(
+  unique int id: @use
+);
+
+#keyset[id, index]
+use_attrs(
+  int id: @use ref,
+  int index: int ref,
+  int attr: @attr ref
+);
+
+#keyset[id]
+use_use_trees(
+  int id: @use ref,
+  int use_tree: @use_tree ref
+);
+
+#keyset[id]
+use_visibilities(
+  int id: @use ref,
+  int visibility: @visibility ref
+);
+
+for_exprs(
+  unique int id: @for_expr
+);
+
+#keyset[id, index]
+for_expr_attrs(
+  int id: @for_expr ref,
+  int index: int ref,
+  int attr: @attr ref
+);
+
+#keyset[id]
+for_expr_iterables(
+  int id: @for_expr ref,
+  int iterable: @expr ref
+);
+
+#keyset[id]
+for_expr_pats(
+  int id: @for_expr ref,
+  int pat: @pat ref
+);
+
+loop_exprs(
+  unique int id: @loop_expr
+);
+
+#keyset[id, index]
+loop_expr_attrs(
+  int id: @loop_expr ref,
+  int index: int ref,
+  int attr: @attr ref
+);
+
+while_exprs(
+  unique int id: @while_expr
+);
+
+#keyset[id, index]
+while_expr_attrs(
+  int id: @while_expr ref,
+  int index: int ref,
+  int attr: @attr ref
+);
+
+#keyset[id]
+while_expr_conditions(
+  int id: @while_expr ref,
+  int condition: @expr ref
+);
diff --git a/rust/downgrades/aa9a0bda17c76b804ad9e108d43da15f6beaf2a7/rust.dbscheme b/rust/downgrades/aa9a0bda17c76b804ad9e108d43da15f6beaf2a7/rust.dbscheme
new file mode 100644
index 00000000000..a1005655e9e
--- /dev/null
+++ b/rust/downgrades/aa9a0bda17c76b804ad9e108d43da15f6beaf2a7/rust.dbscheme
@@ -0,0 +1,3606 @@
+// generated by codegen, do not edit
+
+// from ../shared/tree-sitter-extractor/src/generator/prefix.dbscheme
+/*- Files and folders -*/
+
+/**
+ * The location of an element.
+ * The location spans column `startcolumn` of line `startline` to
+ * column `endcolumn` of line `endline` in file `file`.
+ * For more information, see
+ * [Locations](https://codeql.github.com/docs/writing-codeql-queries/providing-locations-in-codeql-queries/).
+ */
+locations_default(
+  unique int id: @location_default,
+  int file: @file ref,
+  int beginLine: int ref,
+  int beginColumn: int ref,
+  int endLine: int ref,
+  int endColumn: int ref
+);
+
+files(
+  unique int id: @file,
+  string name: string ref
+);
+
+folders(
+  unique int id: @folder,
+  string name: string ref
+);
+
+@container = @file | @folder
+
+containerparent(
+  int parent: @container ref,
+  unique int child: @container ref
+);
+
+/*- Empty location -*/
+
+empty_location(
+  int location: @location_default ref
+);
+
+/*- Source location prefix -*/
+
+/**
+ * The source location of the snapshot.
+ */
+sourceLocationPrefix(string prefix : string ref);
+
+/*- Diagnostic messages -*/
+
+diagnostics(
+  unique int id: @diagnostic,
+  int severity: int ref,
+  string error_tag: string ref,
+  string error_message: string ref,
+  string full_error_message: string ref,
+  int location: @location_default ref
+);
+
+/*- Diagnostic messages: severity -*/
+
+case @diagnostic.severity of
+  10 = @diagnostic_debug
+| 20 = @diagnostic_info
+| 30 = @diagnostic_warning
+| 40 = @diagnostic_error
+;
+
+/*- YAML -*/
+
+#keyset[parent, idx]
+yaml (unique int id: @yaml_node,
+      int kind: int ref,
+      int parent: @yaml_node_parent ref,
+      int idx: int ref,
+      string tag: string ref,
+      string tostring: string ref);
+
+case @yaml_node.kind of
+  0 = @yaml_scalar_node
+| 1 = @yaml_mapping_node
+| 2 = @yaml_sequence_node
+| 3 = @yaml_alias_node
+;
+
+@yaml_collection_node = @yaml_mapping_node | @yaml_sequence_node;
+
+@yaml_node_parent = @yaml_collection_node | @file;
+
+yaml_anchors (unique int node: @yaml_node ref,
+              string anchor: string ref);
+
+yaml_aliases (unique int alias: @yaml_alias_node ref,
+              string target: string ref);
+
+yaml_scalars (unique int scalar: @yaml_scalar_node ref,
+              int style: int ref,
+              string value: string ref);
+
+yaml_errors (unique int id: @yaml_error,
+             string message: string ref);
+
+yaml_locations(unique int locatable: @yaml_locatable ref,
+             int location: @location_default ref);
+
+@yaml_locatable = @yaml_node | @yaml_error;
+
+
+// from prefix.dbscheme
+#keyset[id]
+locatable_locations(
+  int id: @locatable ref,
+  int location: @location_default ref
+);
+
+
+// from schema
+
+@element =
+  @extractor_step
+| @locatable
+| @named_crate
+| @unextracted
+;
+
+extractor_steps(
+  unique int id: @extractor_step,
+  string action: string ref,
+  int duration_ms: int ref
+);
+
+#keyset[id]
+extractor_step_files(
+  int id: @extractor_step ref,
+  int file: @file ref
+);
+
+@locatable =
+  @ast_node
+| @crate
+;
+
+named_crates(
+  unique int id: @named_crate,
+  string name: string ref,
+  int crate: @crate ref
+);
+
+@unextracted =
+  @missing
+| @unimplemented
+;
+
+@ast_node =
+  @abi
+| @addressable
+| @arg_list
+| @asm_dir_spec
+| @asm_operand
+| @asm_operand_expr
+| @asm_option
+| @asm_piece
+| @asm_reg_spec
+| @assoc_item
+| @assoc_item_list
+| @attr
+| @callable
+| @closure_binder
+| @expr
+| @extern_item
+| @extern_item_list
+| @field_list
+| @format_args_arg
+| @generic_arg
+| @generic_arg_list
+| @generic_param
+| @generic_param_list
+| @item_list
+| @label
+| @let_else
+| @macro_items
+| @match_arm
+| @match_arm_list
+| @match_guard
+| @meta
+| @name
+| @param_base
+| @param_list
+| @parenthesized_arg_list
+| @pat
+| @path
+| @path_segment
+| @rename
+| @resolvable
+| @ret_type_repr
+| @return_type_syntax
+| @source_file
+| @stmt
+| @stmt_list
+| @struct_expr_field
+| @struct_expr_field_list
+| @struct_field
+| @struct_pat_field
+| @struct_pat_field_list
+| @token
+| @token_tree
+| @tuple_field
+| @type_bound
+| @type_bound_list
+| @type_repr
+| @use_bound_generic_arg
+| @use_bound_generic_args
+| @use_tree
+| @use_tree_list
+| @variant_def
+| @variant_list
+| @visibility
+| @where_clause
+| @where_pred
+;
+
+crates(
+  unique int id: @crate
+);
+
+#keyset[id]
+crate_names(
+  int id: @crate ref,
+  string name: string ref
+);
+
+#keyset[id]
+crate_versions(
+  int id: @crate ref,
+  string version: string ref
+);
+
+#keyset[id, index]
+crate_cfg_options(
+  int id: @crate ref,
+  int index: int ref,
+  string cfg_option: string ref
+);
+
+#keyset[id, index]
+crate_named_dependencies(
+  int id: @crate ref,
+  int index: int ref,
+  int named_dependency: @named_crate ref
+);
+
+missings(
+  unique int id: @missing
+);
+
+unimplementeds(
+  unique int id: @unimplemented
+);
+
+abis(
+  unique int id: @abi
+);
+
+#keyset[id]
+abi_abi_strings(
+  int id: @abi ref,
+  string abi_string: string ref
+);
+
+@addressable =
+  @item
+| @variant
+;
+
+#keyset[id]
+addressable_extended_canonical_paths(
+  int id: @addressable ref,
+  string extended_canonical_path: string ref
+);
+
+#keyset[id]
+addressable_crate_origins(
+  int id: @addressable ref,
+  string crate_origin: string ref
+);
+
+arg_lists(
+  unique int id: @arg_list
+);
+
+#keyset[id, index]
+arg_list_args(
+  int id: @arg_list ref,
+  int index: int ref,
+  int arg: @expr ref
+);
+
+asm_dir_specs(
+  unique int id: @asm_dir_spec
+);
+
+@asm_operand =
+  @asm_const
+| @asm_label
+| @asm_reg_operand
+| @asm_sym
+;
+
+asm_operand_exprs(
+  unique int id: @asm_operand_expr
+);
+
+#keyset[id]
+asm_operand_expr_in_exprs(
+  int id: @asm_operand_expr ref,
+  int in_expr: @expr ref
+);
+
+#keyset[id]
+asm_operand_expr_out_exprs(
+  int id: @asm_operand_expr ref,
+  int out_expr: @expr ref
+);
+
+asm_options(
+  unique int id: @asm_option
+);
+
+#keyset[id]
+asm_option_is_raw(
+  int id: @asm_option ref
+);
+
+@asm_piece =
+  @asm_clobber_abi
+| @asm_operand_named
+| @asm_options_list
+;
+
+asm_reg_specs(
+  unique int id: @asm_reg_spec
+);
+
+#keyset[id]
+asm_reg_spec_identifiers(
+  int id: @asm_reg_spec ref,
+  int identifier: @name_ref ref
+);
+
+@assoc_item =
+  @const
+| @function
+| @macro_call
+| @type_alias
+;
+
+assoc_item_lists(
+  unique int id: @assoc_item_list
+);
+
+#keyset[id, index]
+assoc_item_list_assoc_items(
+  int id: @assoc_item_list ref,
+  int index: int ref,
+  int assoc_item: @assoc_item ref
+);
+
+#keyset[id, index]
+assoc_item_list_attrs(
+  int id: @assoc_item_list ref,
+  int index: int ref,
+  int attr: @attr ref
+);
+
+attrs(
+  unique int id: @attr
+);
+
+#keyset[id]
+attr_meta(
+  int id: @attr ref,
+  int meta: @meta ref
+);
+
+@callable =
+  @closure_expr
+| @function
+;
+
+#keyset[id]
+callable_param_lists(
+  int id: @callable ref,
+  int param_list: @param_list ref
+);
+
+#keyset[id, index]
+callable_attrs(
+  int id: @callable ref,
+  int index: int ref,
+  int attr: @attr ref
+);
+
+closure_binders(
+  unique int id: @closure_binder
+);
+
+#keyset[id]
+closure_binder_generic_param_lists(
+  int id: @closure_binder ref,
+  int generic_param_list: @generic_param_list ref
+);
+
+@expr =
+  @array_expr_internal
+| @asm_expr
+| @await_expr
+| @become_expr
+| @binary_expr
+| @break_expr
+| @call_expr_base
+| @cast_expr
+| @closure_expr
+| @continue_expr
+| @field_expr
+| @format_args_expr
+| @if_expr
+| @index_expr
+| @labelable_expr
+| @let_expr
+| @literal_expr
+| @macro_block_expr
+| @macro_expr
+| @match_expr
+| @offset_of_expr
+| @paren_expr
+| @path_expr_base
+| @prefix_expr
+| @range_expr
+| @ref_expr
+| @return_expr
+| @struct_expr
+| @try_expr
+| @tuple_expr
+| @underscore_expr
+| @yeet_expr
+| @yield_expr
+;
+
+@extern_item =
+  @function
+| @macro_call
+| @static
+| @type_alias
+;
+
+extern_item_lists(
+  unique int id: @extern_item_list
+);
+
+#keyset[id, index]
+extern_item_list_attrs(
+  int id: @extern_item_list ref,
+  int index: int ref,
+  int attr: @attr ref
+);
+
+#keyset[id, index]
+extern_item_list_extern_items(
+  int id: @extern_item_list ref,
+  int index: int ref,
+  int extern_item: @extern_item ref
+);
+
+@field_list =
+  @struct_field_list
+| @tuple_field_list
+;
+
+format_args_args(
+  unique int id: @format_args_arg
+);
+
+#keyset[id]
+format_args_arg_exprs(
+  int id: @format_args_arg ref,
+  int expr: @expr ref
+);
+
+#keyset[id]
+format_args_arg_names(
+  int id: @format_args_arg ref,
+  int name: @name ref
+);
+
+@generic_arg =
+  @assoc_type_arg
+| @const_arg
+| @lifetime_arg
+| @type_arg
+;
+
+generic_arg_lists(
+  unique int id: @generic_arg_list
+);
+
+#keyset[id, index]
+generic_arg_list_generic_args(
+  int id: @generic_arg_list ref,
+  int index: int ref,
+  int generic_arg: @generic_arg ref
+);
+
+@generic_param =
+  @const_param
+| @lifetime_param
+| @type_param
+;
+
+generic_param_lists(
+  unique int id: @generic_param_list
+);
+
+#keyset[id, index]
+generic_param_list_generic_params(
+  int id: @generic_param_list ref,
+  int index: int ref,
+  int generic_param: @generic_param ref
+);
+
+item_lists(
+  unique int id: @item_list
+);
+
+#keyset[id, index]
+item_list_attrs(
+  int id: @item_list ref,
+  int index: int ref,
+  int attr: @attr ref
+);
+
+#keyset[id, index]
+item_list_items(
+  int id: @item_list ref,
+  int index: int ref,
+  int item: @item ref
+);
+
+labels(
+  unique int id: @label
+);
+
+#keyset[id]
+label_lifetimes(
+  int id: @label ref,
+  int lifetime: @lifetime ref
+);
+
+let_elses(
+  unique int id: @let_else
+);
+
+#keyset[id]
+let_else_block_exprs(
+  int id: @let_else ref,
+  int block_expr: @block_expr ref
+);
+
+macro_items(
+  unique int id: @macro_items
+);
+
+#keyset[id, index]
+macro_items_items(
+  int id: @macro_items ref,
+  int index: int ref,
+  int item: @item ref
+);
+
+match_arms(
+  unique int id: @match_arm
+);
+
+#keyset[id, index]
+match_arm_attrs(
+  int id: @match_arm ref,
+  int index: int ref,
+  int attr: @attr ref
+);
+
+#keyset[id]
+match_arm_exprs(
+  int id: @match_arm ref,
+  int expr: @expr ref
+);
+
+#keyset[id]
+match_arm_guards(
+  int id: @match_arm ref,
+  int guard: @match_guard ref
+);
+
+#keyset[id]
+match_arm_pats(
+  int id: @match_arm ref,
+  int pat: @pat ref
+);
+
+match_arm_lists(
+  unique int id: @match_arm_list
+);
+
+#keyset[id, index]
+match_arm_list_arms(
+  int id: @match_arm_list ref,
+  int index: int ref,
+  int arm: @match_arm ref
+);
+
+#keyset[id, index]
+match_arm_list_attrs(
+  int id: @match_arm_list ref,
+  int index: int ref,
+  int attr: @attr ref
+);
+
+match_guards(
+  unique int id: @match_guard
+);
+
+#keyset[id]
+match_guard_conditions(
+  int id: @match_guard ref,
+  int condition: @expr ref
+);
+
+meta(
+  unique int id: @meta
+);
+
+#keyset[id]
+meta_exprs(
+  int id: @meta ref,
+  int expr: @expr ref
+);
+
+#keyset[id]
+meta_is_unsafe(
+  int id: @meta ref
+);
+
+#keyset[id]
+meta_paths(
+  int id: @meta ref,
+  int path: @path ref
+);
+
+#keyset[id]
+meta_token_trees(
+  int id: @meta ref,
+  int token_tree: @token_tree ref
+);
+
+names(
+  unique int id: @name
+);
+
+#keyset[id]
+name_texts(
+  int id: @name ref,
+  string text: string ref
+);
+
+@param_base =
+  @param
+| @self_param
+;
+
+#keyset[id, index]
+param_base_attrs(
+  int id: @param_base ref,
+  int index: int ref,
+  int attr: @attr ref
+);
+
+#keyset[id]
+param_base_type_reprs(
+  int id: @param_base ref,
+  int type_repr: @type_repr ref
+);
+
+param_lists(
+  unique int id: @param_list
+);
+
+#keyset[id, index]
+param_list_params(
+  int id: @param_list ref,
+  int index: int ref,
+  int param: @param ref
+);
+
+#keyset[id]
+param_list_self_params(
+  int id: @param_list ref,
+  int self_param: @self_param ref
+);
+
+parenthesized_arg_lists(
+  unique int id: @parenthesized_arg_list
+);
+
+#keyset[id, index]
+parenthesized_arg_list_type_args(
+  int id: @parenthesized_arg_list ref,
+  int index: int ref,
+  int type_arg: @type_arg ref
+);
+
+@pat =
+  @box_pat
+| @const_block_pat
+| @ident_pat
+| @literal_pat
+| @macro_pat
+| @or_pat
+| @paren_pat
+| @path_pat
+| @range_pat
+| @ref_pat
+| @rest_pat
+| @slice_pat
+| @struct_pat
+| @tuple_pat
+| @tuple_struct_pat
+| @wildcard_pat
+;
+
+paths(
+  unique int id: @path
+);
+
+#keyset[id]
+path_qualifiers(
+  int id: @path ref,
+  int qualifier: @path ref
+);
+
+#keyset[id]
+path_segments_(
+  int id: @path ref,
+  int segment: @path_segment ref
+);
+
+path_segments(
+  unique int id: @path_segment
+);
+
+#keyset[id]
+path_segment_generic_arg_lists(
+  int id: @path_segment ref,
+  int generic_arg_list: @generic_arg_list ref
+);
+
+#keyset[id]
+path_segment_identifiers(
+  int id: @path_segment ref,
+  int identifier: @name_ref ref
+);
+
+#keyset[id]
+path_segment_parenthesized_arg_lists(
+  int id: @path_segment ref,
+  int parenthesized_arg_list: @parenthesized_arg_list ref
+);
+
+#keyset[id]
+path_segment_ret_types(
+  int id: @path_segment ref,
+  int ret_type: @ret_type_repr ref
+);
+
+#keyset[id]
+path_segment_return_type_syntaxes(
+  int id: @path_segment ref,
+  int return_type_syntax: @return_type_syntax ref
+);
+
+#keyset[id]
+path_segment_type_reprs(
+  int id: @path_segment ref,
+  int type_repr: @type_repr ref
+);
+
+#keyset[id]
+path_segment_trait_type_reprs(
+  int id: @path_segment ref,
+  int trait_type_repr: @path_type_repr ref
+);
+
+renames(
+  unique int id: @rename
+);
+
+#keyset[id]
+rename_names(
+  int id: @rename ref,
+  int name: @name ref
+);
+
+@resolvable =
+  @method_call_expr
+| @path_ast_node
+;
+
+#keyset[id]
+resolvable_resolved_paths(
+  int id: @resolvable ref,
+  string resolved_path: string ref
+);
+
+#keyset[id]
+resolvable_resolved_crate_origins(
+  int id: @resolvable ref,
+  string resolved_crate_origin: string ref
+);
+
+ret_type_reprs(
+  unique int id: @ret_type_repr
+);
+
+#keyset[id]
+ret_type_repr_type_reprs(
+  int id: @ret_type_repr ref,
+  int type_repr: @type_repr ref
+);
+
+return_type_syntaxes(
+  unique int id: @return_type_syntax
+);
+
+source_files(
+  unique int id: @source_file
+);
+
+#keyset[id, index]
+source_file_attrs(
+  int id: @source_file ref,
+  int index: int ref,
+  int attr: @attr ref
+);
+
+#keyset[id, index]
+source_file_items(
+  int id: @source_file ref,
+  int index: int ref,
+  int item: @item ref
+);
+
+@stmt =
+  @expr_stmt
+| @item
+| @let_stmt
+;
+
+stmt_lists(
+  unique int id: @stmt_list
+);
+
+#keyset[id, index]
+stmt_list_attrs(
+  int id: @stmt_list ref,
+  int index: int ref,
+  int attr: @attr ref
+);
+
+#keyset[id, index]
+stmt_list_statements(
+  int id: @stmt_list ref,
+  int index: int ref,
+  int statement: @stmt ref
+);
+
+#keyset[id]
+stmt_list_tail_exprs(
+  int id: @stmt_list ref,
+  int tail_expr: @expr ref
+);
+
+struct_expr_fields(
+  unique int id: @struct_expr_field
+);
+
+#keyset[id, index]
+struct_expr_field_attrs(
+  int id: @struct_expr_field ref,
+  int index: int ref,
+  int attr: @attr ref
+);
+
+#keyset[id]
+struct_expr_field_exprs(
+  int id: @struct_expr_field ref,
+  int expr: @expr ref
+);
+
+#keyset[id]
+struct_expr_field_identifiers(
+  int id: @struct_expr_field ref,
+  int identifier: @name_ref ref
+);
+
+struct_expr_field_lists(
+  unique int id: @struct_expr_field_list
+);
+
+#keyset[id, index]
+struct_expr_field_list_attrs(
+  int id: @struct_expr_field_list ref,
+  int index: int ref,
+  int attr: @attr ref
+);
+
+#keyset[id, index]
+struct_expr_field_list_fields(
+  int id: @struct_expr_field_list ref,
+  int index: int ref,
+  int field: @struct_expr_field ref
+);
+
+#keyset[id]
+struct_expr_field_list_spreads(
+  int id: @struct_expr_field_list ref,
+  int spread: @expr ref
+);
+
+struct_fields(
+  unique int id: @struct_field
+);
+
+#keyset[id, index]
+struct_field_attrs(
+  int id: @struct_field ref,
+  int index: int ref,
+  int attr: @attr ref
+);
+
+#keyset[id]
+struct_field_defaults(
+  int id: @struct_field ref,
+  int default: @expr ref
+);
+
+#keyset[id]
+struct_field_is_unsafe(
+  int id: @struct_field ref
+);
+
+#keyset[id]
+struct_field_names(
+  int id: @struct_field ref,
+  int name: @name ref
+);
+
+#keyset[id]
+struct_field_type_reprs(
+  int id: @struct_field ref,
+  int type_repr: @type_repr ref
+);
+
+#keyset[id]
+struct_field_visibilities(
+  int id: @struct_field ref,
+  int visibility: @visibility ref
+);
+
+struct_pat_fields(
+  unique int id: @struct_pat_field
+);
+
+#keyset[id, index]
+struct_pat_field_attrs(
+  int id: @struct_pat_field ref,
+  int index: int ref,
+  int attr: @attr ref
+);
+
+#keyset[id]
+struct_pat_field_identifiers(
+  int id: @struct_pat_field ref,
+  int identifier: @name_ref ref
+);
+
+#keyset[id]
+struct_pat_field_pats(
+  int id: @struct_pat_field ref,
+  int pat: @pat ref
+);
+
+struct_pat_field_lists(
+  unique int id: @struct_pat_field_list
+);
+
+#keyset[id, index]
+struct_pat_field_list_fields(
+  int id: @struct_pat_field_list ref,
+  int index: int ref,
+  int field: @struct_pat_field ref
+);
+
+#keyset[id]
+struct_pat_field_list_rest_pats(
+  int id: @struct_pat_field_list ref,
+  int rest_pat: @rest_pat ref
+);
+
+@token =
+  @comment
+;
+
+token_trees(
+  unique int id: @token_tree
+);
+
+tuple_fields(
+  unique int id: @tuple_field
+);
+
+#keyset[id, index]
+tuple_field_attrs(
+  int id: @tuple_field ref,
+  int index: int ref,
+  int attr: @attr ref
+);
+
+#keyset[id]
+tuple_field_type_reprs(
+  int id: @tuple_field ref,
+  int type_repr: @type_repr ref
+);
+
+#keyset[id]
+tuple_field_visibilities(
+  int id: @tuple_field ref,
+  int visibility: @visibility ref
+);
+
+type_bounds(
+  unique int id: @type_bound
+);
+
+#keyset[id]
+type_bound_is_async(
+  int id: @type_bound ref
+);
+
+#keyset[id]
+type_bound_is_const(
+  int id: @type_bound ref
+);
+
+#keyset[id]
+type_bound_lifetimes(
+  int id: @type_bound ref,
+  int lifetime: @lifetime ref
+);
+
+#keyset[id]
+type_bound_type_reprs(
+  int id: @type_bound ref,
+  int type_repr: @type_repr ref
+);
+
+#keyset[id]
+type_bound_use_bound_generic_args(
+  int id: @type_bound ref,
+  int use_bound_generic_args: @use_bound_generic_args ref
+);
+
+type_bound_lists(
+  unique int id: @type_bound_list
+);
+
+#keyset[id, index]
+type_bound_list_bounds(
+  int id: @type_bound_list ref,
+  int index: int ref,
+  int bound: @type_bound ref
+);
+
+@type_repr =
+  @array_type_repr
+| @dyn_trait_type_repr
+| @fn_ptr_type_repr
+| @for_type_repr
+| @impl_trait_type_repr
+| @infer_type_repr
+| @macro_type_repr
+| @never_type_repr
+| @paren_type_repr
+| @path_type_repr
+| @ptr_type_repr
+| @ref_type_repr
+| @slice_type_repr
+| @tuple_type_repr
+;
+
+@use_bound_generic_arg =
+  @lifetime
+| @name_ref
+;
+
+use_bound_generic_args(
+  unique int id: @use_bound_generic_args
+);
+
+#keyset[id, index]
+use_bound_generic_args_use_bound_generic_args(
+  int id: @use_bound_generic_args ref,
+  int index: int ref,
+  int use_bound_generic_arg: @use_bound_generic_arg ref
+);
+
+use_trees(
+  unique int id: @use_tree
+);
+
+#keyset[id]
+use_tree_is_glob(
+  int id: @use_tree ref
+);
+
+#keyset[id]
+use_tree_paths(
+  int id: @use_tree ref,
+  int path: @path ref
+);
+
+#keyset[id]
+use_tree_renames(
+  int id: @use_tree ref,
+  int rename: @rename ref
+);
+
+#keyset[id]
+use_tree_use_tree_lists(
+  int id: @use_tree ref,
+  int use_tree_list: @use_tree_list ref
+);
+
+use_tree_lists(
+  unique int id: @use_tree_list
+);
+
+#keyset[id, index]
+use_tree_list_use_trees(
+  int id: @use_tree_list ref,
+  int index: int ref,
+  int use_tree: @use_tree ref
+);
+
+@variant_def =
+  @struct
+| @union
+| @variant
+;
+
+variant_lists(
+  unique int id: @variant_list
+);
+
+#keyset[id, index]
+variant_list_variants(
+  int id: @variant_list ref,
+  int index: int ref,
+  int variant: @variant ref
+);
+
+visibilities(
+  unique int id: @visibility
+);
+
+#keyset[id]
+visibility_paths(
+  int id: @visibility ref,
+  int path: @path ref
+);
+
+where_clauses(
+  unique int id: @where_clause
+);
+
+#keyset[id, index]
+where_clause_predicates(
+  int id: @where_clause ref,
+  int index: int ref,
+  int predicate: @where_pred ref
+);
+
+where_preds(
+  unique int id: @where_pred
+);
+
+#keyset[id]
+where_pred_generic_param_lists(
+  int id: @where_pred ref,
+  int generic_param_list: @generic_param_list ref
+);
+
+#keyset[id]
+where_pred_lifetimes(
+  int id: @where_pred ref,
+  int lifetime: @lifetime ref
+);
+
+#keyset[id]
+where_pred_type_reprs(
+  int id: @where_pred ref,
+  int type_repr: @type_repr ref
+);
+
+#keyset[id]
+where_pred_type_bound_lists(
+  int id: @where_pred ref,
+  int type_bound_list: @type_bound_list ref
+);
+
+array_expr_internals(
+  unique int id: @array_expr_internal
+);
+
+#keyset[id, index]
+array_expr_internal_attrs(
+  int id: @array_expr_internal ref,
+  int index: int ref,
+  int attr: @attr ref
+);
+
+#keyset[id, index]
+array_expr_internal_exprs(
+  int id: @array_expr_internal ref,
+  int index: int ref,
+  int expr: @expr ref
+);
+
+#keyset[id]
+array_expr_internal_is_semicolon(
+  int id: @array_expr_internal ref
+);
+
+array_type_reprs(
+  unique int id: @array_type_repr
+);
+
+#keyset[id]
+array_type_repr_const_args(
+  int id: @array_type_repr ref,
+  int const_arg: @const_arg ref
+);
+
+#keyset[id]
+array_type_repr_element_type_reprs(
+  int id: @array_type_repr ref,
+  int element_type_repr: @type_repr ref
+);
+
+asm_clobber_abis(
+  unique int id: @asm_clobber_abi
+);
+
+asm_consts(
+  unique int id: @asm_const
+);
+
+#keyset[id]
+asm_const_exprs(
+  int id: @asm_const ref,
+  int expr: @expr ref
+);
+
+#keyset[id]
+asm_const_is_const(
+  int id: @asm_const ref
+);
+
+asm_exprs(
+  unique int id: @asm_expr
+);
+
+#keyset[id, index]
+asm_expr_asm_pieces(
+  int id: @asm_expr ref,
+  int index: int ref,
+  int asm_piece: @asm_piece ref
+);
+
+#keyset[id, index]
+asm_expr_attrs(
+  int id: @asm_expr ref,
+  int index: int ref,
+  int attr: @attr ref
+);
+
+#keyset[id, index]
+asm_expr_templates(
+  int id: @asm_expr ref,
+  int index: int ref,
+  int template: @expr ref
+);
+
+asm_labels(
+  unique int id: @asm_label
+);
+
+#keyset[id]
+asm_label_block_exprs(
+  int id: @asm_label ref,
+  int block_expr: @block_expr ref
+);
+
+asm_operand_nameds(
+  unique int id: @asm_operand_named
+);
+
+#keyset[id]
+asm_operand_named_asm_operands(
+  int id: @asm_operand_named ref,
+  int asm_operand: @asm_operand ref
+);
+
+#keyset[id]
+asm_operand_named_names(
+  int id: @asm_operand_named ref,
+  int name: @name ref
+);
+
+asm_options_lists(
+  unique int id: @asm_options_list
+);
+
+#keyset[id, index]
+asm_options_list_asm_options(
+  int id: @asm_options_list ref,
+  int index: int ref,
+  int asm_option: @asm_option ref
+);
+
+asm_reg_operands(
+  unique int id: @asm_reg_operand
+);
+
+#keyset[id]
+asm_reg_operand_asm_dir_specs(
+  int id: @asm_reg_operand ref,
+  int asm_dir_spec: @asm_dir_spec ref
+);
+
+#keyset[id]
+asm_reg_operand_asm_operand_exprs(
+  int id: @asm_reg_operand ref,
+  int asm_operand_expr: @asm_operand_expr ref
+);
+
+#keyset[id]
+asm_reg_operand_asm_reg_specs(
+  int id: @asm_reg_operand ref,
+  int asm_reg_spec: @asm_reg_spec ref
+);
+
+asm_syms(
+  unique int id: @asm_sym
+);
+
+#keyset[id]
+asm_sym_paths(
+  int id: @asm_sym ref,
+  int path: @path ref
+);
+
+assoc_type_args(
+  unique int id: @assoc_type_arg
+);
+
+#keyset[id]
+assoc_type_arg_const_args(
+  int id: @assoc_type_arg ref,
+  int const_arg: @const_arg ref
+);
+
+#keyset[id]
+assoc_type_arg_generic_arg_lists(
+  int id: @assoc_type_arg ref,
+  int generic_arg_list: @generic_arg_list ref
+);
+
+#keyset[id]
+assoc_type_arg_identifiers(
+  int id: @assoc_type_arg ref,
+  int identifier: @name_ref ref
+);
+
+#keyset[id]
+assoc_type_arg_param_lists(
+  int id: @assoc_type_arg ref,
+  int param_list: @param_list ref
+);
+
+#keyset[id]
+assoc_type_arg_ret_types(
+  int id: @assoc_type_arg ref,
+  int ret_type: @ret_type_repr ref
+);
+
+#keyset[id]
+assoc_type_arg_return_type_syntaxes(
+  int id: @assoc_type_arg ref,
+  int return_type_syntax: @return_type_syntax ref
+);
+
+#keyset[id]
+assoc_type_arg_type_reprs(
+  int id: @assoc_type_arg ref,
+  int type_repr: @type_repr ref
+);
+
+#keyset[id]
+assoc_type_arg_type_bound_lists(
+  int id: @assoc_type_arg ref,
+  int type_bound_list: @type_bound_list ref
+);
+
+await_exprs(
+  unique int id: @await_expr
+);
+
+#keyset[id, index]
+await_expr_attrs(
+  int id: @await_expr ref,
+  int index: int ref,
+  int attr: @attr ref
+);
+
+#keyset[id]
+await_expr_exprs(
+  int id: @await_expr ref,
+  int expr: @expr ref
+);
+
+become_exprs(
+  unique int id: @become_expr
+);
+
+#keyset[id, index]
+become_expr_attrs(
+  int id: @become_expr ref,
+  int index: int ref,
+  int attr: @attr ref
+);
+
+#keyset[id]
+become_expr_exprs(
+  int id: @become_expr ref,
+  int expr: @expr ref
+);
+
+binary_exprs(
+  unique int id: @binary_expr
+);
+
+#keyset[id, index]
+binary_expr_attrs(
+  int id: @binary_expr ref,
+  int index: int ref,
+  int attr: @attr ref
+);
+
+#keyset[id]
+binary_expr_lhs(
+  int id: @binary_expr ref,
+  int lhs: @expr ref
+);
+
+#keyset[id]
+binary_expr_operator_names(
+  int id: @binary_expr ref,
+  string operator_name: string ref
+);
+
+#keyset[id]
+binary_expr_rhs(
+  int id: @binary_expr ref,
+  int rhs: @expr ref
+);
+
+box_pats(
+  unique int id: @box_pat
+);
+
+#keyset[id]
+box_pat_pats(
+  int id: @box_pat ref,
+  int pat: @pat ref
+);
+
+break_exprs(
+  unique int id: @break_expr
+);
+
+#keyset[id, index]
+break_expr_attrs(
+  int id: @break_expr ref,
+  int index: int ref,
+  int attr: @attr ref
+);
+
+#keyset[id]
+break_expr_exprs(
+  int id: @break_expr ref,
+  int expr: @expr ref
+);
+
+#keyset[id]
+break_expr_lifetimes(
+  int id: @break_expr ref,
+  int lifetime: @lifetime ref
+);
+
+@call_expr_base =
+  @call_expr
+| @method_call_expr
+;
+
+#keyset[id]
+call_expr_base_arg_lists(
+  int id: @call_expr_base ref,
+  int arg_list: @arg_list ref
+);
+
+#keyset[id, index]
+call_expr_base_attrs(
+  int id: @call_expr_base ref,
+  int index: int ref,
+  int attr: @attr ref
+);
+
+cast_exprs(
+  unique int id: @cast_expr
+);
+
+#keyset[id, index]
+cast_expr_attrs(
+  int id: @cast_expr ref,
+  int index: int ref,
+  int attr: @attr ref
+);
+
+#keyset[id]
+cast_expr_exprs(
+  int id: @cast_expr ref,
+  int expr: @expr ref
+);
+
+#keyset[id]
+cast_expr_type_reprs(
+  int id: @cast_expr ref,
+  int type_repr: @type_repr ref
+);
+
+closure_exprs(
+  unique int id: @closure_expr
+);
+
+#keyset[id]
+closure_expr_bodies(
+  int id: @closure_expr ref,
+  int body: @expr ref
+);
+
+#keyset[id]
+closure_expr_closure_binders(
+  int id: @closure_expr ref,
+  int closure_binder: @closure_binder ref
+);
+
+#keyset[id]
+closure_expr_is_async(
+  int id: @closure_expr ref
+);
+
+#keyset[id]
+closure_expr_is_const(
+  int id: @closure_expr ref
+);
+
+#keyset[id]
+closure_expr_is_gen(
+  int id: @closure_expr ref
+);
+
+#keyset[id]
+closure_expr_is_move(
+  int id: @closure_expr ref
+);
+
+#keyset[id]
+closure_expr_is_static(
+  int id: @closure_expr ref
+);
+
+#keyset[id]
+closure_expr_ret_types(
+  int id: @closure_expr ref,
+  int ret_type: @ret_type_repr ref
+);
+
+comments(
+  unique int id: @comment,
+  int parent: @ast_node ref,
+  string text: string ref
+);
+
+const_args(
+  unique int id: @const_arg
+);
+
+#keyset[id]
+const_arg_exprs(
+  int id: @const_arg ref,
+  int expr: @expr ref
+);
+
+const_block_pats(
+  unique int id: @const_block_pat
+);
+
+#keyset[id]
+const_block_pat_block_exprs(
+  int id: @const_block_pat ref,
+  int block_expr: @block_expr ref
+);
+
+#keyset[id]
+const_block_pat_is_const(
+  int id: @const_block_pat ref
+);
+
+const_params(
+  unique int id: @const_param
+);
+
+#keyset[id, index]
+const_param_attrs(
+  int id: @const_param ref,
+  int index: int ref,
+  int attr: @attr ref
+);
+
+#keyset[id]
+const_param_default_vals(
+  int id: @const_param ref,
+  int default_val: @const_arg ref
+);
+
+#keyset[id]
+const_param_is_const(
+  int id: @const_param ref
+);
+
+#keyset[id]
+const_param_names(
+  int id: @const_param ref,
+  int name: @name ref
+);
+
+#keyset[id]
+const_param_type_reprs(
+  int id: @const_param ref,
+  int type_repr: @type_repr ref
+);
+
+continue_exprs(
+  unique int id: @continue_expr
+);
+
+#keyset[id, index]
+continue_expr_attrs(
+  int id: @continue_expr ref,
+  int index: int ref,
+  int attr: @attr ref
+);
+
+#keyset[id]
+continue_expr_lifetimes(
+  int id: @continue_expr ref,
+  int lifetime: @lifetime ref
+);
+
+dyn_trait_type_reprs(
+  unique int id: @dyn_trait_type_repr
+);
+
+#keyset[id]
+dyn_trait_type_repr_type_bound_lists(
+  int id: @dyn_trait_type_repr ref,
+  int type_bound_list: @type_bound_list ref
+);
+
+expr_stmts(
+  unique int id: @expr_stmt
+);
+
+#keyset[id]
+expr_stmt_exprs(
+  int id: @expr_stmt ref,
+  int expr: @expr ref
+);
+
+field_exprs(
+  unique int id: @field_expr
+);
+
+#keyset[id, index]
+field_expr_attrs(
+  int id: @field_expr ref,
+  int index: int ref,
+  int attr: @attr ref
+);
+
+#keyset[id]
+field_expr_containers(
+  int id: @field_expr ref,
+  int container: @expr ref
+);
+
+#keyset[id]
+field_expr_identifiers(
+  int id: @field_expr ref,
+  int identifier: @name_ref ref
+);
+
+fn_ptr_type_reprs(
+  unique int id: @fn_ptr_type_repr
+);
+
+#keyset[id]
+fn_ptr_type_repr_abis(
+  int id: @fn_ptr_type_repr ref,
+  int abi: @abi ref
+);
+
+#keyset[id]
+fn_ptr_type_repr_is_async(
+  int id: @fn_ptr_type_repr ref
+);
+
+#keyset[id]
+fn_ptr_type_repr_is_const(
+  int id: @fn_ptr_type_repr ref
+);
+
+#keyset[id]
+fn_ptr_type_repr_is_unsafe(
+  int id: @fn_ptr_type_repr ref
+);
+
+#keyset[id]
+fn_ptr_type_repr_param_lists(
+  int id: @fn_ptr_type_repr ref,
+  int param_list: @param_list ref
+);
+
+#keyset[id]
+fn_ptr_type_repr_ret_types(
+  int id: @fn_ptr_type_repr ref,
+  int ret_type: @ret_type_repr ref
+);
+
+for_type_reprs(
+  unique int id: @for_type_repr
+);
+
+#keyset[id]
+for_type_repr_generic_param_lists(
+  int id: @for_type_repr ref,
+  int generic_param_list: @generic_param_list ref
+);
+
+#keyset[id]
+for_type_repr_type_reprs(
+  int id: @for_type_repr ref,
+  int type_repr: @type_repr ref
+);
+
+format_args_exprs(
+  unique int id: @format_args_expr
+);
+
+#keyset[id, index]
+format_args_expr_args(
+  int id: @format_args_expr ref,
+  int index: int ref,
+  int arg: @format_args_arg ref
+);
+
+#keyset[id, index]
+format_args_expr_attrs(
+  int id: @format_args_expr ref,
+  int index: int ref,
+  int attr: @attr ref
+);
+
+#keyset[id]
+format_args_expr_templates(
+  int id: @format_args_expr ref,
+  int template: @expr ref
+);
+
+ident_pats(
+  unique int id: @ident_pat
+);
+
+#keyset[id, index]
+ident_pat_attrs(
+  int id: @ident_pat ref,
+  int index: int ref,
+  int attr: @attr ref
+);
+
+#keyset[id]
+ident_pat_is_mut(
+  int id: @ident_pat ref
+);
+
+#keyset[id]
+ident_pat_is_ref(
+  int id: @ident_pat ref
+);
+
+#keyset[id]
+ident_pat_names(
+  int id: @ident_pat ref,
+  int name: @name ref
+);
+
+#keyset[id]
+ident_pat_pats(
+  int id: @ident_pat ref,
+  int pat: @pat ref
+);
+
+if_exprs(
+  unique int id: @if_expr
+);
+
+#keyset[id, index]
+if_expr_attrs(
+  int id: @if_expr ref,
+  int index: int ref,
+  int attr: @attr ref
+);
+
+#keyset[id]
+if_expr_conditions(
+  int id: @if_expr ref,
+  int condition: @expr ref
+);
+
+#keyset[id]
+if_expr_elses(
+  int id: @if_expr ref,
+  int else: @expr ref
+);
+
+#keyset[id]
+if_expr_thens(
+  int id: @if_expr ref,
+  int then: @block_expr ref
+);
+
+impl_trait_type_reprs(
+  unique int id: @impl_trait_type_repr
+);
+
+#keyset[id]
+impl_trait_type_repr_type_bound_lists(
+  int id: @impl_trait_type_repr ref,
+  int type_bound_list: @type_bound_list ref
+);
+
+index_exprs(
+  unique int id: @index_expr
+);
+
+#keyset[id, index]
+index_expr_attrs(
+  int id: @index_expr ref,
+  int index: int ref,
+  int attr: @attr ref
+);
+
+#keyset[id]
+index_expr_bases(
+  int id: @index_expr ref,
+  int base: @expr ref
+);
+
+#keyset[id]
+index_expr_indices(
+  int id: @index_expr ref,
+  int index: @expr ref
+);
+
+infer_type_reprs(
+  unique int id: @infer_type_repr
+);
+
+@item =
+  @const
+| @enum
+| @extern_block
+| @extern_crate
+| @function
+| @impl
+| @macro_call
+| @macro_def
+| @macro_rules
+| @module
+| @static
+| @struct
+| @trait
+| @trait_alias
+| @type_alias
+| @union
+| @use
+;
+
+#keyset[id]
+item_attribute_macro_expansions(
+  int id: @item ref,
+  int attribute_macro_expansion: @macro_items ref
+);
+
+@labelable_expr =
+  @block_expr
+| @looping_expr
+;
+
+#keyset[id]
+labelable_expr_labels(
+  int id: @labelable_expr ref,
+  int label: @label ref
+);
+
+let_exprs(
+  unique int id: @let_expr
+);
+
+#keyset[id, index]
+let_expr_attrs(
+  int id: @let_expr ref,
+  int index: int ref,
+  int attr: @attr ref
+);
+
+#keyset[id]
+let_expr_scrutinees(
+  int id: @let_expr ref,
+  int scrutinee: @expr ref
+);
+
+#keyset[id]
+let_expr_pats(
+  int id: @let_expr ref,
+  int pat: @pat ref
+);
+
+let_stmts(
+  unique int id: @let_stmt
+);
+
+#keyset[id, index]
+let_stmt_attrs(
+  int id: @let_stmt ref,
+  int index: int ref,
+  int attr: @attr ref
+);
+
+#keyset[id]
+let_stmt_initializers(
+  int id: @let_stmt ref,
+  int initializer: @expr ref
+);
+
+#keyset[id]
+let_stmt_let_elses(
+  int id: @let_stmt ref,
+  int let_else: @let_else ref
+);
+
+#keyset[id]
+let_stmt_pats(
+  int id: @let_stmt ref,
+  int pat: @pat ref
+);
+
+#keyset[id]
+let_stmt_type_reprs(
+  int id: @let_stmt ref,
+  int type_repr: @type_repr ref
+);
+
+lifetimes(
+  unique int id: @lifetime
+);
+
+#keyset[id]
+lifetime_texts(
+  int id: @lifetime ref,
+  string text: string ref
+);
+
+lifetime_args(
+  unique int id: @lifetime_arg
+);
+
+#keyset[id]
+lifetime_arg_lifetimes(
+  int id: @lifetime_arg ref,
+  int lifetime: @lifetime ref
+);
+
+lifetime_params(
+  unique int id: @lifetime_param
+);
+
+#keyset[id, index]
+lifetime_param_attrs(
+  int id: @lifetime_param ref,
+  int index: int ref,
+  int attr: @attr ref
+);
+
+#keyset[id]
+lifetime_param_lifetimes(
+  int id: @lifetime_param ref,
+  int lifetime: @lifetime ref
+);
+
+#keyset[id]
+lifetime_param_type_bound_lists(
+  int id: @lifetime_param ref,
+  int type_bound_list: @type_bound_list ref
+);
+
+literal_exprs(
+  unique int id: @literal_expr
+);
+
+#keyset[id, index]
+literal_expr_attrs(
+  int id: @literal_expr ref,
+  int index: int ref,
+  int attr: @attr ref
+);
+
+#keyset[id]
+literal_expr_text_values(
+  int id: @literal_expr ref,
+  string text_value: string ref
+);
+
+literal_pats(
+  unique int id: @literal_pat
+);
+
+#keyset[id]
+literal_pat_literals(
+  int id: @literal_pat ref,
+  int literal: @literal_expr ref
+);
+
+macro_block_exprs(
+  unique int id: @macro_block_expr
+);
+
+#keyset[id]
+macro_block_expr_tail_exprs(
+  int id: @macro_block_expr ref,
+  int tail_expr: @expr ref
+);
+
+#keyset[id, index]
+macro_block_expr_statements(
+  int id: @macro_block_expr ref,
+  int index: int ref,
+  int statement: @stmt ref
+);
+
+macro_exprs(
+  unique int id: @macro_expr
+);
+
+#keyset[id]
+macro_expr_macro_calls(
+  int id: @macro_expr ref,
+  int macro_call: @macro_call ref
+);
+
+macro_pats(
+  unique int id: @macro_pat
+);
+
+#keyset[id]
+macro_pat_macro_calls(
+  int id: @macro_pat ref,
+  int macro_call: @macro_call ref
+);
+
+macro_type_reprs(
+  unique int id: @macro_type_repr
+);
+
+#keyset[id]
+macro_type_repr_macro_calls(
+  int id: @macro_type_repr ref,
+  int macro_call: @macro_call ref
+);
+
+match_exprs(
+  unique int id: @match_expr
+);
+
+#keyset[id, index]
+match_expr_attrs(
+  int id: @match_expr ref,
+  int index: int ref,
+  int attr: @attr ref
+);
+
+#keyset[id]
+match_expr_scrutinees(
+  int id: @match_expr ref,
+  int scrutinee: @expr ref
+);
+
+#keyset[id]
+match_expr_match_arm_lists(
+  int id: @match_expr ref,
+  int match_arm_list: @match_arm_list ref
+);
+
+name_refs(
+  unique int id: @name_ref
+);
+
+#keyset[id]
+name_ref_texts(
+  int id: @name_ref ref,
+  string text: string ref
+);
+
+never_type_reprs(
+  unique int id: @never_type_repr
+);
+
+offset_of_exprs(
+  unique int id: @offset_of_expr
+);
+
+#keyset[id, index]
+offset_of_expr_attrs(
+  int id: @offset_of_expr ref,
+  int index: int ref,
+  int attr: @attr ref
+);
+
+#keyset[id, index]
+offset_of_expr_fields(
+  int id: @offset_of_expr ref,
+  int index: int ref,
+  int field: @name_ref ref
+);
+
+#keyset[id]
+offset_of_expr_type_reprs(
+  int id: @offset_of_expr ref,
+  int type_repr: @type_repr ref
+);
+
+or_pats(
+  unique int id: @or_pat
+);
+
+#keyset[id, index]
+or_pat_pats(
+  int id: @or_pat ref,
+  int index: int ref,
+  int pat: @pat ref
+);
+
+params(
+  unique int id: @param
+);
+
+#keyset[id]
+param_pats(
+  int id: @param ref,
+  int pat: @pat ref
+);
+
+paren_exprs(
+  unique int id: @paren_expr
+);
+
+#keyset[id, index]
+paren_expr_attrs(
+  int id: @paren_expr ref,
+  int index: int ref,
+  int attr: @attr ref
+);
+
+#keyset[id]
+paren_expr_exprs(
+  int id: @paren_expr ref,
+  int expr: @expr ref
+);
+
+paren_pats(
+  unique int id: @paren_pat
+);
+
+#keyset[id]
+paren_pat_pats(
+  int id: @paren_pat ref,
+  int pat: @pat ref
+);
+
+paren_type_reprs(
+  unique int id: @paren_type_repr
+);
+
+#keyset[id]
+paren_type_repr_type_reprs(
+  int id: @paren_type_repr ref,
+  int type_repr: @type_repr ref
+);
+
+@path_ast_node =
+  @path_expr
+| @path_pat
+| @struct_expr
+| @struct_pat
+| @tuple_struct_pat
+;
+
+#keyset[id]
+path_ast_node_paths(
+  int id: @path_ast_node ref,
+  int path: @path ref
+);
+
+@path_expr_base =
+  @path_expr
+;
+
+path_type_reprs(
+  unique int id: @path_type_repr
+);
+
+#keyset[id]
+path_type_repr_paths(
+  int id: @path_type_repr ref,
+  int path: @path ref
+);
+
+prefix_exprs(
+  unique int id: @prefix_expr
+);
+
+#keyset[id, index]
+prefix_expr_attrs(
+  int id: @prefix_expr ref,
+  int index: int ref,
+  int attr: @attr ref
+);
+
+#keyset[id]
+prefix_expr_exprs(
+  int id: @prefix_expr ref,
+  int expr: @expr ref
+);
+
+#keyset[id]
+prefix_expr_operator_names(
+  int id: @prefix_expr ref,
+  string operator_name: string ref
+);
+
+ptr_type_reprs(
+  unique int id: @ptr_type_repr
+);
+
+#keyset[id]
+ptr_type_repr_is_const(
+  int id: @ptr_type_repr ref
+);
+
+#keyset[id]
+ptr_type_repr_is_mut(
+  int id: @ptr_type_repr ref
+);
+
+#keyset[id]
+ptr_type_repr_type_reprs(
+  int id: @ptr_type_repr ref,
+  int type_repr: @type_repr ref
+);
+
+range_exprs(
+  unique int id: @range_expr
+);
+
+#keyset[id, index]
+range_expr_attrs(
+  int id: @range_expr ref,
+  int index: int ref,
+  int attr: @attr ref
+);
+
+#keyset[id]
+range_expr_ends(
+  int id: @range_expr ref,
+  int end: @expr ref
+);
+
+#keyset[id]
+range_expr_operator_names(
+  int id: @range_expr ref,
+  string operator_name: string ref
+);
+
+#keyset[id]
+range_expr_starts(
+  int id: @range_expr ref,
+  int start: @expr ref
+);
+
+range_pats(
+  unique int id: @range_pat
+);
+
+#keyset[id]
+range_pat_ends(
+  int id: @range_pat ref,
+  int end: @pat ref
+);
+
+#keyset[id]
+range_pat_operator_names(
+  int id: @range_pat ref,
+  string operator_name: string ref
+);
+
+#keyset[id]
+range_pat_starts(
+  int id: @range_pat ref,
+  int start: @pat ref
+);
+
+ref_exprs(
+  unique int id: @ref_expr
+);
+
+#keyset[id, index]
+ref_expr_attrs(
+  int id: @ref_expr ref,
+  int index: int ref,
+  int attr: @attr ref
+);
+
+#keyset[id]
+ref_expr_exprs(
+  int id: @ref_expr ref,
+  int expr: @expr ref
+);
+
+#keyset[id]
+ref_expr_is_const(
+  int id: @ref_expr ref
+);
+
+#keyset[id]
+ref_expr_is_mut(
+  int id: @ref_expr ref
+);
+
+#keyset[id]
+ref_expr_is_raw(
+  int id: @ref_expr ref
+);
+
+ref_pats(
+  unique int id: @ref_pat
+);
+
+#keyset[id]
+ref_pat_is_mut(
+  int id: @ref_pat ref
+);
+
+#keyset[id]
+ref_pat_pats(
+  int id: @ref_pat ref,
+  int pat: @pat ref
+);
+
+ref_type_reprs(
+  unique int id: @ref_type_repr
+);
+
+#keyset[id]
+ref_type_repr_is_mut(
+  int id: @ref_type_repr ref
+);
+
+#keyset[id]
+ref_type_repr_lifetimes(
+  int id: @ref_type_repr ref,
+  int lifetime: @lifetime ref
+);
+
+#keyset[id]
+ref_type_repr_type_reprs(
+  int id: @ref_type_repr ref,
+  int type_repr: @type_repr ref
+);
+
+rest_pats(
+  unique int id: @rest_pat
+);
+
+#keyset[id, index]
+rest_pat_attrs(
+  int id: @rest_pat ref,
+  int index: int ref,
+  int attr: @attr ref
+);
+
+return_exprs(
+  unique int id: @return_expr
+);
+
+#keyset[id, index]
+return_expr_attrs(
+  int id: @return_expr ref,
+  int index: int ref,
+  int attr: @attr ref
+);
+
+#keyset[id]
+return_expr_exprs(
+  int id: @return_expr ref,
+  int expr: @expr ref
+);
+
+self_params(
+  unique int id: @self_param
+);
+
+#keyset[id]
+self_param_is_ref(
+  int id: @self_param ref
+);
+
+#keyset[id]
+self_param_is_mut(
+  int id: @self_param ref
+);
+
+#keyset[id]
+self_param_lifetimes(
+  int id: @self_param ref,
+  int lifetime: @lifetime ref
+);
+
+#keyset[id]
+self_param_names(
+  int id: @self_param ref,
+  int name: @name ref
+);
+
+slice_pats(
+  unique int id: @slice_pat
+);
+
+#keyset[id, index]
+slice_pat_pats(
+  int id: @slice_pat ref,
+  int index: int ref,
+  int pat: @pat ref
+);
+
+slice_type_reprs(
+  unique int id: @slice_type_repr
+);
+
+#keyset[id]
+slice_type_repr_type_reprs(
+  int id: @slice_type_repr ref,
+  int type_repr: @type_repr ref
+);
+
+struct_field_lists(
+  unique int id: @struct_field_list
+);
+
+#keyset[id, index]
+struct_field_list_fields(
+  int id: @struct_field_list ref,
+  int index: int ref,
+  int field: @struct_field ref
+);
+
+try_exprs(
+  unique int id: @try_expr
+);
+
+#keyset[id, index]
+try_expr_attrs(
+  int id: @try_expr ref,
+  int index: int ref,
+  int attr: @attr ref
+);
+
+#keyset[id]
+try_expr_exprs(
+  int id: @try_expr ref,
+  int expr: @expr ref
+);
+
+tuple_exprs(
+  unique int id: @tuple_expr
+);
+
+#keyset[id, index]
+tuple_expr_attrs(
+  int id: @tuple_expr ref,
+  int index: int ref,
+  int attr: @attr ref
+);
+
+#keyset[id, index]
+tuple_expr_fields(
+  int id: @tuple_expr ref,
+  int index: int ref,
+  int field: @expr ref
+);
+
+tuple_field_lists(
+  unique int id: @tuple_field_list
+);
+
+#keyset[id, index]
+tuple_field_list_fields(
+  int id: @tuple_field_list ref,
+  int index: int ref,
+  int field: @tuple_field ref
+);
+
+tuple_pats(
+  unique int id: @tuple_pat
+);
+
+#keyset[id, index]
+tuple_pat_fields(
+  int id: @tuple_pat ref,
+  int index: int ref,
+  int field: @pat ref
+);
+
+tuple_type_reprs(
+  unique int id: @tuple_type_repr
+);
+
+#keyset[id, index]
+tuple_type_repr_fields(
+  int id: @tuple_type_repr ref,
+  int index: int ref,
+  int field: @type_repr ref
+);
+
+type_args(
+  unique int id: @type_arg
+);
+
+#keyset[id]
+type_arg_type_reprs(
+  int id: @type_arg ref,
+  int type_repr: @type_repr ref
+);
+
+type_params(
+  unique int id: @type_param
+);
+
+#keyset[id, index]
+type_param_attrs(
+  int id: @type_param ref,
+  int index: int ref,
+  int attr: @attr ref
+);
+
+#keyset[id]
+type_param_default_types(
+  int id: @type_param ref,
+  int default_type: @type_repr ref
+);
+
+#keyset[id]
+type_param_names(
+  int id: @type_param ref,
+  int name: @name ref
+);
+
+#keyset[id]
+type_param_type_bound_lists(
+  int id: @type_param ref,
+  int type_bound_list: @type_bound_list ref
+);
+
+underscore_exprs(
+  unique int id: @underscore_expr
+);
+
+#keyset[id, index]
+underscore_expr_attrs(
+  int id: @underscore_expr ref,
+  int index: int ref,
+  int attr: @attr ref
+);
+
+variants(
+  unique int id: @variant
+);
+
+#keyset[id, index]
+variant_attrs(
+  int id: @variant ref,
+  int index: int ref,
+  int attr: @attr ref
+);
+
+#keyset[id]
+variant_discriminants(
+  int id: @variant ref,
+  int discriminant: @expr ref
+);
+
+#keyset[id]
+variant_field_lists(
+  int id: @variant ref,
+  int field_list: @field_list ref
+);
+
+#keyset[id]
+variant_names(
+  int id: @variant ref,
+  int name: @name ref
+);
+
+#keyset[id]
+variant_visibilities(
+  int id: @variant ref,
+  int visibility: @visibility ref
+);
+
+wildcard_pats(
+  unique int id: @wildcard_pat
+);
+
+yeet_exprs(
+  unique int id: @yeet_expr
+);
+
+#keyset[id, index]
+yeet_expr_attrs(
+  int id: @yeet_expr ref,
+  int index: int ref,
+  int attr: @attr ref
+);
+
+#keyset[id]
+yeet_expr_exprs(
+  int id: @yeet_expr ref,
+  int expr: @expr ref
+);
+
+yield_exprs(
+  unique int id: @yield_expr
+);
+
+#keyset[id, index]
+yield_expr_attrs(
+  int id: @yield_expr ref,
+  int index: int ref,
+  int attr: @attr ref
+);
+
+#keyset[id]
+yield_expr_exprs(
+  int id: @yield_expr ref,
+  int expr: @expr ref
+);
+
+block_exprs(
+  unique int id: @block_expr
+);
+
+#keyset[id, index]
+block_expr_attrs(
+  int id: @block_expr ref,
+  int index: int ref,
+  int attr: @attr ref
+);
+
+#keyset[id]
+block_expr_is_async(
+  int id: @block_expr ref
+);
+
+#keyset[id]
+block_expr_is_const(
+  int id: @block_expr ref
+);
+
+#keyset[id]
+block_expr_is_gen(
+  int id: @block_expr ref
+);
+
+#keyset[id]
+block_expr_is_move(
+  int id: @block_expr ref
+);
+
+#keyset[id]
+block_expr_is_try(
+  int id: @block_expr ref
+);
+
+#keyset[id]
+block_expr_is_unsafe(
+  int id: @block_expr ref
+);
+
+#keyset[id]
+block_expr_stmt_lists(
+  int id: @block_expr ref,
+  int stmt_list: @stmt_list ref
+);
+
+call_exprs(
+  unique int id: @call_expr
+);
+
+#keyset[id]
+call_expr_functions(
+  int id: @call_expr ref,
+  int function: @expr ref
+);
+
+consts(
+  unique int id: @const
+);
+
+#keyset[id, index]
+const_attrs(
+  int id: @const ref,
+  int index: int ref,
+  int attr: @attr ref
+);
+
+#keyset[id]
+const_bodies(
+  int id: @const ref,
+  int body: @expr ref
+);
+
+#keyset[id]
+const_is_const(
+  int id: @const ref
+);
+
+#keyset[id]
+const_is_default(
+  int id: @const ref
+);
+
+#keyset[id]
+const_names(
+  int id: @const ref,
+  int name: @name ref
+);
+
+#keyset[id]
+const_type_reprs(
+  int id: @const ref,
+  int type_repr: @type_repr ref
+);
+
+#keyset[id]
+const_visibilities(
+  int id: @const ref,
+  int visibility: @visibility ref
+);
+
+enums(
+  unique int id: @enum
+);
+
+#keyset[id, index]
+enum_attrs(
+  int id: @enum ref,
+  int index: int ref,
+  int attr: @attr ref
+);
+
+#keyset[id]
+enum_generic_param_lists(
+  int id: @enum ref,
+  int generic_param_list: @generic_param_list ref
+);
+
+#keyset[id]
+enum_names(
+  int id: @enum ref,
+  int name: @name ref
+);
+
+#keyset[id]
+enum_variant_lists(
+  int id: @enum ref,
+  int variant_list: @variant_list ref
+);
+
+#keyset[id]
+enum_visibilities(
+  int id: @enum ref,
+  int visibility: @visibility ref
+);
+
+#keyset[id]
+enum_where_clauses(
+  int id: @enum ref,
+  int where_clause: @where_clause ref
+);
+
+extern_blocks(
+  unique int id: @extern_block
+);
+
+#keyset[id]
+extern_block_abis(
+  int id: @extern_block ref,
+  int abi: @abi ref
+);
+
+#keyset[id, index]
+extern_block_attrs(
+  int id: @extern_block ref,
+  int index: int ref,
+  int attr: @attr ref
+);
+
+#keyset[id]
+extern_block_extern_item_lists(
+  int id: @extern_block ref,
+  int extern_item_list: @extern_item_list ref
+);
+
+#keyset[id]
+extern_block_is_unsafe(
+  int id: @extern_block ref
+);
+
+extern_crates(
+  unique int id: @extern_crate
+);
+
+#keyset[id, index]
+extern_crate_attrs(
+  int id: @extern_crate ref,
+  int index: int ref,
+  int attr: @attr ref
+);
+
+#keyset[id]
+extern_crate_identifiers(
+  int id: @extern_crate ref,
+  int identifier: @name_ref ref
+);
+
+#keyset[id]
+extern_crate_renames(
+  int id: @extern_crate ref,
+  int rename: @rename ref
+);
+
+#keyset[id]
+extern_crate_visibilities(
+  int id: @extern_crate ref,
+  int visibility: @visibility ref
+);
+
+functions(
+  unique int id: @function
+);
+
+#keyset[id]
+function_abis(
+  int id: @function ref,
+  int abi: @abi ref
+);
+
+#keyset[id]
+function_bodies(
+  int id: @function ref,
+  int body: @block_expr ref
+);
+
+#keyset[id]
+function_generic_param_lists(
+  int id: @function ref,
+  int generic_param_list: @generic_param_list ref
+);
+
+#keyset[id]
+function_is_async(
+  int id: @function ref
+);
+
+#keyset[id]
+function_is_const(
+  int id: @function ref
+);
+
+#keyset[id]
+function_is_default(
+  int id: @function ref
+);
+
+#keyset[id]
+function_is_gen(
+  int id: @function ref
+);
+
+#keyset[id]
+function_is_unsafe(
+  int id: @function ref
+);
+
+#keyset[id]
+function_names(
+  int id: @function ref,
+  int name: @name ref
+);
+
+#keyset[id]
+function_ret_types(
+  int id: @function ref,
+  int ret_type: @ret_type_repr ref
+);
+
+#keyset[id]
+function_visibilities(
+  int id: @function ref,
+  int visibility: @visibility ref
+);
+
+#keyset[id]
+function_where_clauses(
+  int id: @function ref,
+  int where_clause: @where_clause ref
+);
+
+impls(
+  unique int id: @impl
+);
+
+#keyset[id]
+impl_assoc_item_lists(
+  int id: @impl ref,
+  int assoc_item_list: @assoc_item_list ref
+);
+
+#keyset[id, index]
+impl_attrs(
+  int id: @impl ref,
+  int index: int ref,
+  int attr: @attr ref
+);
+
+#keyset[id]
+impl_generic_param_lists(
+  int id: @impl ref,
+  int generic_param_list: @generic_param_list ref
+);
+
+#keyset[id]
+impl_is_const(
+  int id: @impl ref
+);
+
+#keyset[id]
+impl_is_default(
+  int id: @impl ref
+);
+
+#keyset[id]
+impl_is_unsafe(
+  int id: @impl ref
+);
+
+#keyset[id]
+impl_self_ties(
+  int id: @impl ref,
+  int self_ty: @type_repr ref
+);
+
+#keyset[id]
+impl_traits(
+  int id: @impl ref,
+  int trait: @type_repr ref
+);
+
+#keyset[id]
+impl_visibilities(
+  int id: @impl ref,
+  int visibility: @visibility ref
+);
+
+#keyset[id]
+impl_where_clauses(
+  int id: @impl ref,
+  int where_clause: @where_clause ref
+);
+
+@looping_expr =
+  @for_expr
+| @loop_expr
+| @while_expr
+;
+
+#keyset[id]
+looping_expr_loop_bodies(
+  int id: @looping_expr ref,
+  int loop_body: @block_expr ref
+);
+
+macro_calls(
+  unique int id: @macro_call
+);
+
+#keyset[id, index]
+macro_call_attrs(
+  int id: @macro_call ref,
+  int index: int ref,
+  int attr: @attr ref
+);
+
+#keyset[id]
+macro_call_paths(
+  int id: @macro_call ref,
+  int path: @path ref
+);
+
+#keyset[id]
+macro_call_token_trees(
+  int id: @macro_call ref,
+  int token_tree: @token_tree ref
+);
+
+#keyset[id]
+macro_call_macro_call_expansions(
+  int id: @macro_call ref,
+  int macro_call_expansion: @ast_node ref
+);
+
+macro_defs(
+  unique int id: @macro_def
+);
+
+#keyset[id]
+macro_def_args(
+  int id: @macro_def ref,
+  int args: @token_tree ref
+);
+
+#keyset[id, index]
+macro_def_attrs(
+  int id: @macro_def ref,
+  int index: int ref,
+  int attr: @attr ref
+);
+
+#keyset[id]
+macro_def_bodies(
+  int id: @macro_def ref,
+  int body: @token_tree ref
+);
+
+#keyset[id]
+macro_def_names(
+  int id: @macro_def ref,
+  int name: @name ref
+);
+
+#keyset[id]
+macro_def_visibilities(
+  int id: @macro_def ref,
+  int visibility: @visibility ref
+);
+
+macro_rules(
+  unique int id: @macro_rules
+);
+
+#keyset[id, index]
+macro_rules_attrs(
+  int id: @macro_rules ref,
+  int index: int ref,
+  int attr: @attr ref
+);
+
+#keyset[id]
+macro_rules_names(
+  int id: @macro_rules ref,
+  int name: @name ref
+);
+
+#keyset[id]
+macro_rules_token_trees(
+  int id: @macro_rules ref,
+  int token_tree: @token_tree ref
+);
+
+#keyset[id]
+macro_rules_visibilities(
+  int id: @macro_rules ref,
+  int visibility: @visibility ref
+);
+
+method_call_exprs(
+  unique int id: @method_call_expr
+);
+
+#keyset[id]
+method_call_expr_generic_arg_lists(
+  int id: @method_call_expr ref,
+  int generic_arg_list: @generic_arg_list ref
+);
+
+#keyset[id]
+method_call_expr_identifiers(
+  int id: @method_call_expr ref,
+  int identifier: @name_ref ref
+);
+
+#keyset[id]
+method_call_expr_receivers(
+  int id: @method_call_expr ref,
+  int receiver: @expr ref
+);
+
+modules(
+  unique int id: @module
+);
+
+#keyset[id, index]
+module_attrs(
+  int id: @module ref,
+  int index: int ref,
+  int attr: @attr ref
+);
+
+#keyset[id]
+module_item_lists(
+  int id: @module ref,
+  int item_list: @item_list ref
+);
+
+#keyset[id]
+module_names(
+  int id: @module ref,
+  int name: @name ref
+);
+
+#keyset[id]
+module_visibilities(
+  int id: @module ref,
+  int visibility: @visibility ref
+);
+
+path_exprs(
+  unique int id: @path_expr
+);
+
+#keyset[id, index]
+path_expr_attrs(
+  int id: @path_expr ref,
+  int index: int ref,
+  int attr: @attr ref
+);
+
+path_pats(
+  unique int id: @path_pat
+);
+
+statics(
+  unique int id: @static
+);
+
+#keyset[id, index]
+static_attrs(
+  int id: @static ref,
+  int index: int ref,
+  int attr: @attr ref
+);
+
+#keyset[id]
+static_bodies(
+  int id: @static ref,
+  int body: @expr ref
+);
+
+#keyset[id]
+static_is_mut(
+  int id: @static ref
+);
+
+#keyset[id]
+static_is_static(
+  int id: @static ref
+);
+
+#keyset[id]
+static_is_unsafe(
+  int id: @static ref
+);
+
+#keyset[id]
+static_names(
+  int id: @static ref,
+  int name: @name ref
+);
+
+#keyset[id]
+static_type_reprs(
+  int id: @static ref,
+  int type_repr: @type_repr ref
+);
+
+#keyset[id]
+static_visibilities(
+  int id: @static ref,
+  int visibility: @visibility ref
+);
+
+structs(
+  unique int id: @struct
+);
+
+#keyset[id, index]
+struct_attrs(
+  int id: @struct ref,
+  int index: int ref,
+  int attr: @attr ref
+);
+
+#keyset[id]
+struct_field_lists_(
+  int id: @struct ref,
+  int field_list: @field_list ref
+);
+
+#keyset[id]
+struct_generic_param_lists(
+  int id: @struct ref,
+  int generic_param_list: @generic_param_list ref
+);
+
+#keyset[id]
+struct_names(
+  int id: @struct ref,
+  int name: @name ref
+);
+
+#keyset[id]
+struct_visibilities(
+  int id: @struct ref,
+  int visibility: @visibility ref
+);
+
+#keyset[id]
+struct_where_clauses(
+  int id: @struct ref,
+  int where_clause: @where_clause ref
+);
+
+struct_exprs(
+  unique int id: @struct_expr
+);
+
+#keyset[id]
+struct_expr_struct_expr_field_lists(
+  int id: @struct_expr ref,
+  int struct_expr_field_list: @struct_expr_field_list ref
+);
+
+struct_pats(
+  unique int id: @struct_pat
+);
+
+#keyset[id]
+struct_pat_struct_pat_field_lists(
+  int id: @struct_pat ref,
+  int struct_pat_field_list: @struct_pat_field_list ref
+);
+
+traits(
+  unique int id: @trait
+);
+
+#keyset[id]
+trait_assoc_item_lists(
+  int id: @trait ref,
+  int assoc_item_list: @assoc_item_list ref
+);
+
+#keyset[id, index]
+trait_attrs(
+  int id: @trait ref,
+  int index: int ref,
+  int attr: @attr ref
+);
+
+#keyset[id]
+trait_generic_param_lists(
+  int id: @trait ref,
+  int generic_param_list: @generic_param_list ref
+);
+
+#keyset[id]
+trait_is_auto(
+  int id: @trait ref
+);
+
+#keyset[id]
+trait_is_unsafe(
+  int id: @trait ref
+);
+
+#keyset[id]
+trait_names(
+  int id: @trait ref,
+  int name: @name ref
+);
+
+#keyset[id]
+trait_type_bound_lists(
+  int id: @trait ref,
+  int type_bound_list: @type_bound_list ref
+);
+
+#keyset[id]
+trait_visibilities(
+  int id: @trait ref,
+  int visibility: @visibility ref
+);
+
+#keyset[id]
+trait_where_clauses(
+  int id: @trait ref,
+  int where_clause: @where_clause ref
+);
+
+trait_aliases(
+  unique int id: @trait_alias
+);
+
+#keyset[id, index]
+trait_alias_attrs(
+  int id: @trait_alias ref,
+  int index: int ref,
+  int attr: @attr ref
+);
+
+#keyset[id]
+trait_alias_generic_param_lists(
+  int id: @trait_alias ref,
+  int generic_param_list: @generic_param_list ref
+);
+
+#keyset[id]
+trait_alias_names(
+  int id: @trait_alias ref,
+  int name: @name ref
+);
+
+#keyset[id]
+trait_alias_type_bound_lists(
+  int id: @trait_alias ref,
+  int type_bound_list: @type_bound_list ref
+);
+
+#keyset[id]
+trait_alias_visibilities(
+  int id: @trait_alias ref,
+  int visibility: @visibility ref
+);
+
+#keyset[id]
+trait_alias_where_clauses(
+  int id: @trait_alias ref,
+  int where_clause: @where_clause ref
+);
+
+tuple_struct_pats(
+  unique int id: @tuple_struct_pat
+);
+
+#keyset[id, index]
+tuple_struct_pat_fields(
+  int id: @tuple_struct_pat ref,
+  int index: int ref,
+  int field: @pat ref
+);
+
+type_aliases(
+  unique int id: @type_alias
+);
+
+#keyset[id, index]
+type_alias_attrs(
+  int id: @type_alias ref,
+  int index: int ref,
+  int attr: @attr ref
+);
+
+#keyset[id]
+type_alias_generic_param_lists(
+  int id: @type_alias ref,
+  int generic_param_list: @generic_param_list ref
+);
+
+#keyset[id]
+type_alias_is_default(
+  int id: @type_alias ref
+);
+
+#keyset[id]
+type_alias_names(
+  int id: @type_alias ref,
+  int name: @name ref
+);
+
+#keyset[id]
+type_alias_type_reprs(
+  int id: @type_alias ref,
+  int type_repr: @type_repr ref
+);
+
+#keyset[id]
+type_alias_type_bound_lists(
+  int id: @type_alias ref,
+  int type_bound_list: @type_bound_list ref
+);
+
+#keyset[id]
+type_alias_visibilities(
+  int id: @type_alias ref,
+  int visibility: @visibility ref
+);
+
+#keyset[id]
+type_alias_where_clauses(
+  int id: @type_alias ref,
+  int where_clause: @where_clause ref
+);
+
+unions(
+  unique int id: @union
+);
+
+#keyset[id, index]
+union_attrs(
+  int id: @union ref,
+  int index: int ref,
+  int attr: @attr ref
+);
+
+#keyset[id]
+union_generic_param_lists(
+  int id: @union ref,
+  int generic_param_list: @generic_param_list ref
+);
+
+#keyset[id]
+union_names(
+  int id: @union ref,
+  int name: @name ref
+);
+
+#keyset[id]
+union_struct_field_lists(
+  int id: @union ref,
+  int struct_field_list: @struct_field_list ref
+);
+
+#keyset[id]
+union_visibilities(
+  int id: @union ref,
+  int visibility: @visibility ref
+);
+
+#keyset[id]
+union_where_clauses(
+  int id: @union ref,
+  int where_clause: @where_clause ref
+);
+
+uses(
+  unique int id: @use
+);
+
+#keyset[id, index]
+use_attrs(
+  int id: @use ref,
+  int index: int ref,
+  int attr: @attr ref
+);
+
+#keyset[id]
+use_use_trees(
+  int id: @use ref,
+  int use_tree: @use_tree ref
+);
+
+#keyset[id]
+use_visibilities(
+  int id: @use ref,
+  int visibility: @visibility ref
+);
+
+for_exprs(
+  unique int id: @for_expr
+);
+
+#keyset[id, index]
+for_expr_attrs(
+  int id: @for_expr ref,
+  int index: int ref,
+  int attr: @attr ref
+);
+
+#keyset[id]
+for_expr_iterables(
+  int id: @for_expr ref,
+  int iterable: @expr ref
+);
+
+#keyset[id]
+for_expr_pats(
+  int id: @for_expr ref,
+  int pat: @pat ref
+);
+
+loop_exprs(
+  unique int id: @loop_expr
+);
+
+#keyset[id, index]
+loop_expr_attrs(
+  int id: @loop_expr ref,
+  int index: int ref,
+  int attr: @attr ref
+);
+
+while_exprs(
+  unique int id: @while_expr
+);
+
+#keyset[id, index]
+while_expr_attrs(
+  int id: @while_expr ref,
+  int index: int ref,
+  int attr: @attr ref
+);
+
+#keyset[id]
+while_expr_conditions(
+  int id: @while_expr ref,
+  int condition: @expr ref
+);
diff --git a/rust/downgrades/aa9a0bda17c76b804ad9e108d43da15f6beaf2a7/upgrade.properties b/rust/downgrades/aa9a0bda17c76b804ad9e108d43da15f6beaf2a7/upgrade.properties
new file mode 100644
index 00000000000..5ae01660cb9
--- /dev/null
+++ b/rust/downgrades/aa9a0bda17c76b804ad9e108d43da15f6beaf2a7/upgrade.properties
@@ -0,0 +1,5 @@
+description: Remove `function_has_implementation` and `const_has_implementation` tables
+compatibility: full
+
+function_has_implementation.rel: delete
+const_has_implementation.rel: delete
diff --git a/rust/extractor/src/generated/.generated.list b/rust/extractor/src/generated/.generated.list
index cb687e1bff0..121c5b5a7aa 100644
--- a/rust/extractor/src/generated/.generated.list
+++ b/rust/extractor/src/generated/.generated.list
@@ -1,2 +1,2 @@
 mod.rs 4bcb9def847469aae9d8649461546b7c21ec97cf6e63d3cf394e339915ce65d7 4bcb9def847469aae9d8649461546b7c21ec97cf6e63d3cf394e339915ce65d7
-top.rs 7f8a694078bc0cde1ce420544d0cf5b83bb297dd29ee4f9d7bcbb1572f0e815a 7f8a694078bc0cde1ce420544d0cf5b83bb297dd29ee4f9d7bcbb1572f0e815a
+top.rs 69c1fcaf0efea87feb898f32fdb7bcb842a22119b69ecedd61c2d946eb7e67de 69c1fcaf0efea87feb898f32fdb7bcb842a22119b69ecedd61c2d946eb7e67de
diff --git a/rust/extractor/src/generated/top.rs b/rust/extractor/src/generated/top.rs
index 6cece591734..fd9b0ca6b91 100644
--- a/rust/extractor/src/generated/top.rs
+++ b/rust/extractor/src/generated/top.rs
@@ -9084,6 +9084,12 @@ impl trap::TrapEntry for Const {
     }
 }
 
+impl Const {
+    pub fn emit_has_implementation(id: trap::Label<Self>, out: &mut trap::Writer) {
+        out.add_tuple("const_has_implementation", vec![id.into()]);
+    }
+}
+
 impl trap::TrapClass for Const {
     fn class_name() -> &'static str { "Const" }
 }
@@ -9497,6 +9503,12 @@ impl trap::TrapEntry for Function {
     }
 }
 
+impl Function {
+    pub fn emit_has_implementation(id: trap::Label<Self>, out: &mut trap::Writer) {
+        out.add_tuple("function_has_implementation", vec![id.into()]);
+    }
+}
+
 impl trap::TrapClass for Function {
     fn class_name() -> &'static str { "Function" }
 }
diff --git a/rust/extractor/src/translate/base.rs b/rust/extractor/src/translate/base.rs
index 8d971900497..9e9123c4570 100644
--- a/rust/extractor/src/translate/base.rs
+++ b/rust/extractor/src/translate/base.rs
@@ -16,7 +16,7 @@ use ra_ap_ide_db::RootDatabase;
 use ra_ap_ide_db::line_index::{LineCol, LineIndex};
 use ra_ap_parser::SyntaxKind;
 use ra_ap_span::TextSize;
-use ra_ap_syntax::ast::{Const, Fn, HasName, Param, Static};
+use ra_ap_syntax::ast::HasName;
 use ra_ap_syntax::{
     AstNode, NodeOrToken, SyntaxElementChildren, SyntaxError, SyntaxNode, SyntaxToken, TextRange,
     ast,
@@ -38,6 +38,7 @@ macro_rules! post_emit {
         $self.extract_macro_call_expanded($node, $label);
     };
     (Function, $self:ident, $node:ident, $label:ident) => {
+        $self.emit_function_has_implementation($node, $label);
         $self.extract_canonical_origin($node, $label.into());
     };
     (Trait, $self:ident, $node:ident, $label:ident) => {
@@ -83,6 +84,9 @@ macro_rules! post_emit {
     (PathSegment, $self:ident, $node:ident, $label:ident) => {
         $self.extract_types_from_path_segment($node, $label.into());
     };
+    (Const, $self:ident, $node:ident, $label:ident) => {
+        $self.emit_const_has_implementation($node, $label);
+    };
     ($($_:tt)*) => {};
 }
 
@@ -644,7 +648,7 @@ impl<'a> Translator<'a> {
         })();
     }
 
-    pub(crate) fn should_be_excluded_attrs(&self, item: &impl ast::HasAttrs) -> bool {
+    pub(crate) fn should_be_excluded(&self, item: &impl ast::HasAttrs) -> bool {
         self.semantics.is_some_and(|sema| {
             item.attrs().any(|attr| {
                 attr.as_simple_call().is_some_and(|(name, tokens)| {
@@ -654,46 +658,8 @@ impl<'a> Translator<'a> {
         })
     }
 
-    pub(crate) fn should_be_excluded(&self, item: &impl ast::AstNode) -> bool {
-        if self.source_kind == SourceKind::Library {
-            let syntax = item.syntax();
-            if syntax
-                .parent()
-                .and_then(Fn::cast)
-                .and_then(|x| x.body())
-                .is_some_and(|body| body.syntax() == syntax)
-            {
-                return true;
-            }
-            if syntax
-                .parent()
-                .and_then(Const::cast)
-                .and_then(|x| x.body())
-                .is_some_and(|body| body.syntax() == syntax)
-            {
-                return true;
-            }
-            if syntax
-                .parent()
-                .and_then(Static::cast)
-                .and_then(|x| x.body())
-                .is_some_and(|body| body.syntax() == syntax)
-            {
-                return true;
-            }
-            if syntax
-                .parent()
-                .and_then(Param::cast)
-                .and_then(|x| x.pat())
-                .is_some_and(|pat| pat.syntax() == syntax)
-            {
-                return true;
-            }
-            if syntax.kind() == SyntaxKind::TOKEN_TREE {
-                return true;
-            }
-        }
-        false
+    pub(crate) fn should_skip_bodies(&self) -> bool {
+        self.source_kind == SourceKind::Library
     }
 
     pub(crate) fn extract_types_from_path_segment(
@@ -799,4 +765,24 @@ impl<'a> Translator<'a> {
             generated::Item::emit_attribute_macro_expansion(label, expanded, &mut self.trap.writer);
         }
     }
+
+    pub(crate) fn emit_function_has_implementation(
+        &mut self,
+        node: &ast::Fn,
+        label: Label<generated::Function>,
+    ) {
+        if node.body().is_some() {
+            generated::Function::emit_has_implementation(label, &mut self.trap.writer);
+        }
+    }
+
+    pub(crate) fn emit_const_has_implementation(
+        &mut self,
+        node: &ast::Const,
+        label: Label<generated::Const>,
+    ) {
+        if node.body().is_some() {
+            generated::Const::emit_has_implementation(label, &mut self.trap.writer);
+        }
+    }
 }
diff --git a/rust/extractor/src/translate/generated.rs b/rust/extractor/src/translate/generated.rs
index cd0c2f9a9d9..be8f23f9cfb 100644
--- a/rust/extractor/src/translate/generated.rs
+++ b/rust/extractor/src/translate/generated.rs
@@ -256,9 +256,6 @@ impl Translator<'_> {
     }
     pub(crate) fn emit_abi(&mut self, node: &ast::Abi) -> Option<Label<generated::Abi>> {
         pre_emit!(Abi, self, node);
-        if self.should_be_excluded(node) {
-            return None;
-        }
         let abi_string = node.try_get_text();
         let label = self.trap.emit(generated::Abi {
             id: TrapId::Star,
@@ -274,9 +271,6 @@ impl Translator<'_> {
         node: &ast::ArgList,
     ) -> Option<Label<generated::ArgList>> {
         pre_emit!(ArgList, self, node);
-        if self.should_be_excluded(node) {
-            return None;
-        }
         let args = node.args().filter_map(|x| self.emit_expr(&x)).collect();
         let label = self.trap.emit(generated::ArgList {
             id: TrapId::Star,
@@ -295,9 +289,6 @@ impl Translator<'_> {
         if self.should_be_excluded(node) {
             return None;
         }
-        if self.should_be_excluded_attrs(node) {
-            return None;
-        }
         let attrs = node.attrs().filter_map(|x| self.emit_attr(&x)).collect();
         let exprs = node.exprs().filter_map(|x| self.emit_expr(&x)).collect();
         let is_semicolon = node.semicolon_token().is_some();
@@ -317,9 +308,6 @@ impl Translator<'_> {
         node: &ast::ArrayType,
     ) -> Option<Label<generated::ArrayTypeRepr>> {
         pre_emit!(ArrayTypeRepr, self, node);
-        if self.should_be_excluded(node) {
-            return None;
-        }
         let const_arg = node.const_arg().and_then(|x| self.emit_const_arg(&x));
         let element_type_repr = node.ty().and_then(|x| self.emit_type(&x));
         let label = self.trap.emit(generated::ArrayTypeRepr {
@@ -337,9 +325,6 @@ impl Translator<'_> {
         node: &ast::AsmClobberAbi,
     ) -> Option<Label<generated::AsmClobberAbi>> {
         pre_emit!(AsmClobberAbi, self, node);
-        if self.should_be_excluded(node) {
-            return None;
-        }
         let label = self
             .trap
             .emit(generated::AsmClobberAbi { id: TrapId::Star });
@@ -353,9 +338,6 @@ impl Translator<'_> {
         node: &ast::AsmConst,
     ) -> Option<Label<generated::AsmConst>> {
         pre_emit!(AsmConst, self, node);
-        if self.should_be_excluded(node) {
-            return None;
-        }
         let expr = node.expr().and_then(|x| self.emit_expr(&x));
         let is_const = node.const_token().is_some();
         let label = self.trap.emit(generated::AsmConst {
@@ -373,9 +355,6 @@ impl Translator<'_> {
         node: &ast::AsmDirSpec,
     ) -> Option<Label<generated::AsmDirSpec>> {
         pre_emit!(AsmDirSpec, self, node);
-        if self.should_be_excluded(node) {
-            return None;
-        }
         let label = self.trap.emit(generated::AsmDirSpec { id: TrapId::Star });
         self.emit_location(label, node);
         post_emit!(AsmDirSpec, self, node, label);
@@ -390,9 +369,6 @@ impl Translator<'_> {
         if self.should_be_excluded(node) {
             return None;
         }
-        if self.should_be_excluded_attrs(node) {
-            return None;
-        }
         let asm_pieces = node
             .asm_pieces()
             .filter_map(|x| self.emit_asm_piece(&x))
@@ -415,9 +391,6 @@ impl Translator<'_> {
         node: &ast::AsmLabel,
     ) -> Option<Label<generated::AsmLabel>> {
         pre_emit!(AsmLabel, self, node);
-        if self.should_be_excluded(node) {
-            return None;
-        }
         let block_expr = node.block_expr().and_then(|x| self.emit_block_expr(&x));
         let label = self.trap.emit(generated::AsmLabel {
             id: TrapId::Star,
@@ -433,9 +406,6 @@ impl Translator<'_> {
         node: &ast::AsmOperandExpr,
     ) -> Option<Label<generated::AsmOperandExpr>> {
         pre_emit!(AsmOperandExpr, self, node);
-        if self.should_be_excluded(node) {
-            return None;
-        }
         let in_expr = node.in_expr().and_then(|x| self.emit_expr(&x));
         let out_expr = node.out_expr().and_then(|x| self.emit_expr(&x));
         let label = self.trap.emit(generated::AsmOperandExpr {
@@ -453,9 +423,6 @@ impl Translator<'_> {
         node: &ast::AsmOperandNamed,
     ) -> Option<Label<generated::AsmOperandNamed>> {
         pre_emit!(AsmOperandNamed, self, node);
-        if self.should_be_excluded(node) {
-            return None;
-        }
         let asm_operand = node.asm_operand().and_then(|x| self.emit_asm_operand(&x));
         let name = node.name().and_then(|x| self.emit_name(&x));
         let label = self.trap.emit(generated::AsmOperandNamed {
@@ -473,9 +440,6 @@ impl Translator<'_> {
         node: &ast::AsmOption,
     ) -> Option<Label<generated::AsmOption>> {
         pre_emit!(AsmOption, self, node);
-        if self.should_be_excluded(node) {
-            return None;
-        }
         let is_raw = node.raw_token().is_some();
         let label = self.trap.emit(generated::AsmOption {
             id: TrapId::Star,
@@ -491,9 +455,6 @@ impl Translator<'_> {
         node: &ast::AsmOptions,
     ) -> Option<Label<generated::AsmOptionsList>> {
         pre_emit!(AsmOptionsList, self, node);
-        if self.should_be_excluded(node) {
-            return None;
-        }
         let asm_options = node
             .asm_options()
             .filter_map(|x| self.emit_asm_option(&x))
@@ -512,9 +473,6 @@ impl Translator<'_> {
         node: &ast::AsmRegOperand,
     ) -> Option<Label<generated::AsmRegOperand>> {
         pre_emit!(AsmRegOperand, self, node);
-        if self.should_be_excluded(node) {
-            return None;
-        }
         let asm_dir_spec = node.asm_dir_spec().and_then(|x| self.emit_asm_dir_spec(&x));
         let asm_operand_expr = node
             .asm_operand_expr()
@@ -536,9 +494,6 @@ impl Translator<'_> {
         node: &ast::AsmRegSpec,
     ) -> Option<Label<generated::AsmRegSpec>> {
         pre_emit!(AsmRegSpec, self, node);
-        if self.should_be_excluded(node) {
-            return None;
-        }
         let identifier = node.name_ref().and_then(|x| self.emit_name_ref(&x));
         let label = self.trap.emit(generated::AsmRegSpec {
             id: TrapId::Star,
@@ -551,9 +506,6 @@ impl Translator<'_> {
     }
     pub(crate) fn emit_asm_sym(&mut self, node: &ast::AsmSym) -> Option<Label<generated::AsmSym>> {
         pre_emit!(AsmSym, self, node);
-        if self.should_be_excluded(node) {
-            return None;
-        }
         let path = node.path().and_then(|x| self.emit_path(&x));
         let label = self.trap.emit(generated::AsmSym {
             id: TrapId::Star,
@@ -572,9 +524,6 @@ impl Translator<'_> {
         if self.should_be_excluded(node) {
             return None;
         }
-        if self.should_be_excluded_attrs(node) {
-            return None;
-        }
         let assoc_items = node
             .assoc_items()
             .filter_map(|x| self.emit_assoc_item(&x))
@@ -595,9 +544,6 @@ impl Translator<'_> {
         node: &ast::AssocTypeArg,
     ) -> Option<Label<generated::AssocTypeArg>> {
         pre_emit!(AssocTypeArg, self, node);
-        if self.should_be_excluded(node) {
-            return None;
-        }
         let const_arg = node.const_arg().and_then(|x| self.emit_const_arg(&x));
         let generic_arg_list = node
             .generic_arg_list()
@@ -630,9 +576,6 @@ impl Translator<'_> {
     }
     pub(crate) fn emit_attr(&mut self, node: &ast::Attr) -> Option<Label<generated::Attr>> {
         pre_emit!(Attr, self, node);
-        if self.should_be_excluded(node) {
-            return None;
-        }
         let meta = node.meta().and_then(|x| self.emit_meta(&x));
         let label = self.trap.emit(generated::Attr {
             id: TrapId::Star,
@@ -651,9 +594,6 @@ impl Translator<'_> {
         if self.should_be_excluded(node) {
             return None;
         }
-        if self.should_be_excluded_attrs(node) {
-            return None;
-        }
         let attrs = node.attrs().filter_map(|x| self.emit_attr(&x)).collect();
         let expr = node.expr().and_then(|x| self.emit_expr(&x));
         let label = self.trap.emit(generated::AwaitExpr {
@@ -674,9 +614,6 @@ impl Translator<'_> {
         if self.should_be_excluded(node) {
             return None;
         }
-        if self.should_be_excluded_attrs(node) {
-            return None;
-        }
         let attrs = node.attrs().filter_map(|x| self.emit_attr(&x)).collect();
         let expr = node.expr().and_then(|x| self.emit_expr(&x));
         let label = self.trap.emit(generated::BecomeExpr {
@@ -697,9 +634,6 @@ impl Translator<'_> {
         if self.should_be_excluded(node) {
             return None;
         }
-        if self.should_be_excluded_attrs(node) {
-            return None;
-        }
         let attrs = node.attrs().filter_map(|x| self.emit_attr(&x)).collect();
         let lhs = node.lhs().and_then(|x| self.emit_expr(&x));
         let operator_name = node.try_get_text();
@@ -724,9 +658,6 @@ impl Translator<'_> {
         if self.should_be_excluded(node) {
             return None;
         }
-        if self.should_be_excluded_attrs(node) {
-            return None;
-        }
         let attrs = node.attrs().filter_map(|x| self.emit_attr(&x)).collect();
         let is_async = node.async_token().is_some();
         let is_const = node.const_token().is_some();
@@ -755,9 +686,6 @@ impl Translator<'_> {
     }
     pub(crate) fn emit_box_pat(&mut self, node: &ast::BoxPat) -> Option<Label<generated::BoxPat>> {
         pre_emit!(BoxPat, self, node);
-        if self.should_be_excluded(node) {
-            return None;
-        }
         let pat = node.pat().and_then(|x| self.emit_pat(&x));
         let label = self.trap.emit(generated::BoxPat {
             id: TrapId::Star,
@@ -776,9 +704,6 @@ impl Translator<'_> {
         if self.should_be_excluded(node) {
             return None;
         }
-        if self.should_be_excluded_attrs(node) {
-            return None;
-        }
         let attrs = node.attrs().filter_map(|x| self.emit_attr(&x)).collect();
         let expr = node.expr().and_then(|x| self.emit_expr(&x));
         let lifetime = node.lifetime().and_then(|x| self.emit_lifetime(&x));
@@ -801,9 +726,6 @@ impl Translator<'_> {
         if self.should_be_excluded(node) {
             return None;
         }
-        if self.should_be_excluded_attrs(node) {
-            return None;
-        }
         let arg_list = node.arg_list().and_then(|x| self.emit_arg_list(&x));
         let attrs = node.attrs().filter_map(|x| self.emit_attr(&x)).collect();
         let function = node.expr().and_then(|x| self.emit_expr(&x));
@@ -826,9 +748,6 @@ impl Translator<'_> {
         if self.should_be_excluded(node) {
             return None;
         }
-        if self.should_be_excluded_attrs(node) {
-            return None;
-        }
         let attrs = node.attrs().filter_map(|x| self.emit_attr(&x)).collect();
         let expr = node.expr().and_then(|x| self.emit_expr(&x));
         let type_repr = node.ty().and_then(|x| self.emit_type(&x));
@@ -848,9 +767,6 @@ impl Translator<'_> {
         node: &ast::ClosureBinder,
     ) -> Option<Label<generated::ClosureBinder>> {
         pre_emit!(ClosureBinder, self, node);
-        if self.should_be_excluded(node) {
-            return None;
-        }
         let generic_param_list = node
             .generic_param_list()
             .and_then(|x| self.emit_generic_param_list(&x));
@@ -871,9 +787,6 @@ impl Translator<'_> {
         if self.should_be_excluded(node) {
             return None;
         }
-        if self.should_be_excluded_attrs(node) {
-            return None;
-        }
         let attrs = node.attrs().filter_map(|x| self.emit_attr(&x)).collect();
         let body = node.body().and_then(|x| self.emit_expr(&x));
         let closure_binder = node
@@ -909,11 +822,12 @@ impl Translator<'_> {
         if self.should_be_excluded(node) {
             return None;
         }
-        if self.should_be_excluded_attrs(node) {
-            return None;
-        }
         let attrs = node.attrs().filter_map(|x| self.emit_attr(&x)).collect();
-        let body = node.body().and_then(|x| self.emit_expr(&x));
+        let body = if self.should_skip_bodies() {
+            None
+        } else {
+            node.body().and_then(|x| self.emit_expr(&x))
+        };
         let is_const = node.const_token().is_some();
         let is_default = node.default_token().is_some();
         let name = node.name().and_then(|x| self.emit_name(&x));
@@ -939,9 +853,6 @@ impl Translator<'_> {
         node: &ast::ConstArg,
     ) -> Option<Label<generated::ConstArg>> {
         pre_emit!(ConstArg, self, node);
-        if self.should_be_excluded(node) {
-            return None;
-        }
         let expr = node.expr().and_then(|x| self.emit_expr(&x));
         let label = self.trap.emit(generated::ConstArg {
             id: TrapId::Star,
@@ -957,9 +868,6 @@ impl Translator<'_> {
         node: &ast::ConstBlockPat,
     ) -> Option<Label<generated::ConstBlockPat>> {
         pre_emit!(ConstBlockPat, self, node);
-        if self.should_be_excluded(node) {
-            return None;
-        }
         let block_expr = node.block_expr().and_then(|x| self.emit_block_expr(&x));
         let is_const = node.const_token().is_some();
         let label = self.trap.emit(generated::ConstBlockPat {
@@ -980,9 +888,6 @@ impl Translator<'_> {
         if self.should_be_excluded(node) {
             return None;
         }
-        if self.should_be_excluded_attrs(node) {
-            return None;
-        }
         let attrs = node.attrs().filter_map(|x| self.emit_attr(&x)).collect();
         let default_val = node.default_val().and_then(|x| self.emit_const_arg(&x));
         let is_const = node.const_token().is_some();
@@ -1009,9 +914,6 @@ impl Translator<'_> {
         if self.should_be_excluded(node) {
             return None;
         }
-        if self.should_be_excluded_attrs(node) {
-            return None;
-        }
         let attrs = node.attrs().filter_map(|x| self.emit_attr(&x)).collect();
         let lifetime = node.lifetime().and_then(|x| self.emit_lifetime(&x));
         let label = self.trap.emit(generated::ContinueExpr {
@@ -1029,9 +931,6 @@ impl Translator<'_> {
         node: &ast::DynTraitType,
     ) -> Option<Label<generated::DynTraitTypeRepr>> {
         pre_emit!(DynTraitTypeRepr, self, node);
-        if self.should_be_excluded(node) {
-            return None;
-        }
         let type_bound_list = node
             .type_bound_list()
             .and_then(|x| self.emit_type_bound_list(&x));
@@ -1049,9 +948,6 @@ impl Translator<'_> {
         if self.should_be_excluded(node) {
             return None;
         }
-        if self.should_be_excluded_attrs(node) {
-            return None;
-        }
         let attrs = node.attrs().filter_map(|x| self.emit_attr(&x)).collect();
         let generic_param_list = node
             .generic_param_list()
@@ -1079,9 +975,6 @@ impl Translator<'_> {
         node: &ast::ExprStmt,
     ) -> Option<Label<generated::ExprStmt>> {
         pre_emit!(ExprStmt, self, node);
-        if self.should_be_excluded(node) {
-            return None;
-        }
         let expr = node.expr().and_then(|x| self.emit_expr(&x));
         let label = self.trap.emit(generated::ExprStmt {
             id: TrapId::Star,
@@ -1100,9 +993,6 @@ impl Translator<'_> {
         if self.should_be_excluded(node) {
             return None;
         }
-        if self.should_be_excluded_attrs(node) {
-            return None;
-        }
         let abi = node.abi().and_then(|x| self.emit_abi(&x));
         let attrs = node.attrs().filter_map(|x| self.emit_attr(&x)).collect();
         let extern_item_list = node
@@ -1129,9 +1019,6 @@ impl Translator<'_> {
         if self.should_be_excluded(node) {
             return None;
         }
-        if self.should_be_excluded_attrs(node) {
-            return None;
-        }
         let attrs = node.attrs().filter_map(|x| self.emit_attr(&x)).collect();
         let identifier = node.name_ref().and_then(|x| self.emit_name_ref(&x));
         let rename = node.rename().and_then(|x| self.emit_rename(&x));
@@ -1156,9 +1043,6 @@ impl Translator<'_> {
         if self.should_be_excluded(node) {
             return None;
         }
-        if self.should_be_excluded_attrs(node) {
-            return None;
-        }
         let attrs = node.attrs().filter_map(|x| self.emit_attr(&x)).collect();
         let extern_items = node
             .extern_items()
@@ -1182,9 +1066,6 @@ impl Translator<'_> {
         if self.should_be_excluded(node) {
             return None;
         }
-        if self.should_be_excluded_attrs(node) {
-            return None;
-        }
         let attrs = node.attrs().filter_map(|x| self.emit_attr(&x)).collect();
         let container = node.expr().and_then(|x| self.emit_expr(&x));
         let identifier = node.name_ref().and_then(|x| self.emit_name_ref(&x));
@@ -1204,12 +1085,13 @@ impl Translator<'_> {
         if self.should_be_excluded(node) {
             return None;
         }
-        if self.should_be_excluded_attrs(node) {
-            return None;
-        }
         let abi = node.abi().and_then(|x| self.emit_abi(&x));
         let attrs = node.attrs().filter_map(|x| self.emit_attr(&x)).collect();
-        let body = node.body().and_then(|x| self.emit_block_expr(&x));
+        let body = if self.should_skip_bodies() {
+            None
+        } else {
+            node.body().and_then(|x| self.emit_block_expr(&x))
+        };
         let generic_param_list = node
             .generic_param_list()
             .and_then(|x| self.emit_generic_param_list(&x));
@@ -1250,9 +1132,6 @@ impl Translator<'_> {
         node: &ast::FnPtrType,
     ) -> Option<Label<generated::FnPtrTypeRepr>> {
         pre_emit!(FnPtrTypeRepr, self, node);
-        if self.should_be_excluded(node) {
-            return None;
-        }
         let abi = node.abi().and_then(|x| self.emit_abi(&x));
         let is_async = node.async_token().is_some();
         let is_const = node.const_token().is_some();
@@ -1281,9 +1160,6 @@ impl Translator<'_> {
         if self.should_be_excluded(node) {
             return None;
         }
-        if self.should_be_excluded_attrs(node) {
-            return None;
-        }
         let attrs = node.attrs().filter_map(|x| self.emit_attr(&x)).collect();
         let iterable = node.iterable().and_then(|x| self.emit_expr(&x));
         let label = node.label().and_then(|x| self.emit_label(&x));
@@ -1307,9 +1183,6 @@ impl Translator<'_> {
         node: &ast::ForType,
     ) -> Option<Label<generated::ForTypeRepr>> {
         pre_emit!(ForTypeRepr, self, node);
-        if self.should_be_excluded(node) {
-            return None;
-        }
         let generic_param_list = node
             .generic_param_list()
             .and_then(|x| self.emit_generic_param_list(&x));
@@ -1329,9 +1202,6 @@ impl Translator<'_> {
         node: &ast::FormatArgsArg,
     ) -> Option<Label<generated::FormatArgsArg>> {
         pre_emit!(FormatArgsArg, self, node);
-        if self.should_be_excluded(node) {
-            return None;
-        }
         let expr = node.expr().and_then(|x| self.emit_expr(&x));
         let name = node.name().and_then(|x| self.emit_name(&x));
         let label = self.trap.emit(generated::FormatArgsArg {
@@ -1352,9 +1222,6 @@ impl Translator<'_> {
         if self.should_be_excluded(node) {
             return None;
         }
-        if self.should_be_excluded_attrs(node) {
-            return None;
-        }
         let args = node
             .args()
             .filter_map(|x| self.emit_format_args_arg(&x))
@@ -1377,9 +1244,6 @@ impl Translator<'_> {
         node: &ast::GenericArgList,
     ) -> Option<Label<generated::GenericArgList>> {
         pre_emit!(GenericArgList, self, node);
-        if self.should_be_excluded(node) {
-            return None;
-        }
         let generic_args = node
             .generic_args()
             .filter_map(|x| self.emit_generic_arg(&x))
@@ -1398,9 +1262,6 @@ impl Translator<'_> {
         node: &ast::GenericParamList,
     ) -> Option<Label<generated::GenericParamList>> {
         pre_emit!(GenericParamList, self, node);
-        if self.should_be_excluded(node) {
-            return None;
-        }
         let generic_params = node
             .generic_params()
             .filter_map(|x| self.emit_generic_param(&x))
@@ -1422,9 +1283,6 @@ impl Translator<'_> {
         if self.should_be_excluded(node) {
             return None;
         }
-        if self.should_be_excluded_attrs(node) {
-            return None;
-        }
         let attrs = node.attrs().filter_map(|x| self.emit_attr(&x)).collect();
         let is_mut = node.mut_token().is_some();
         let is_ref = node.ref_token().is_some();
@@ -1448,9 +1306,6 @@ impl Translator<'_> {
         if self.should_be_excluded(node) {
             return None;
         }
-        if self.should_be_excluded_attrs(node) {
-            return None;
-        }
         let attrs = node.attrs().filter_map(|x| self.emit_attr(&x)).collect();
         let condition = node.condition().and_then(|x| self.emit_expr(&x));
         let else_ = node.else_branch().and_then(|x| self.emit_else_branch(&x));
@@ -1472,9 +1327,6 @@ impl Translator<'_> {
         if self.should_be_excluded(node) {
             return None;
         }
-        if self.should_be_excluded_attrs(node) {
-            return None;
-        }
         let assoc_item_list = node
             .assoc_item_list()
             .and_then(|x| self.emit_assoc_item_list(&x));
@@ -1512,9 +1364,6 @@ impl Translator<'_> {
         node: &ast::ImplTraitType,
     ) -> Option<Label<generated::ImplTraitTypeRepr>> {
         pre_emit!(ImplTraitTypeRepr, self, node);
-        if self.should_be_excluded(node) {
-            return None;
-        }
         let type_bound_list = node
             .type_bound_list()
             .and_then(|x| self.emit_type_bound_list(&x));
@@ -1535,9 +1384,6 @@ impl Translator<'_> {
         if self.should_be_excluded(node) {
             return None;
         }
-        if self.should_be_excluded_attrs(node) {
-            return None;
-        }
         let attrs = node.attrs().filter_map(|x| self.emit_attr(&x)).collect();
         let base = node.base().and_then(|x| self.emit_expr(&x));
         let index = node.index().and_then(|x| self.emit_expr(&x));
@@ -1557,9 +1403,6 @@ impl Translator<'_> {
         node: &ast::InferType,
     ) -> Option<Label<generated::InferTypeRepr>> {
         pre_emit!(InferTypeRepr, self, node);
-        if self.should_be_excluded(node) {
-            return None;
-        }
         let label = self
             .trap
             .emit(generated::InferTypeRepr { id: TrapId::Star });
@@ -1576,9 +1419,6 @@ impl Translator<'_> {
         if self.should_be_excluded(node) {
             return None;
         }
-        if self.should_be_excluded_attrs(node) {
-            return None;
-        }
         let attrs = node.attrs().filter_map(|x| self.emit_attr(&x)).collect();
         let items = node.items().filter_map(|x| self.emit_item(&x)).collect();
         let label = self.trap.emit(generated::ItemList {
@@ -1593,9 +1433,6 @@ impl Translator<'_> {
     }
     pub(crate) fn emit_label(&mut self, node: &ast::Label) -> Option<Label<generated::Label>> {
         pre_emit!(Label, self, node);
-        if self.should_be_excluded(node) {
-            return None;
-        }
         let lifetime = node.lifetime().and_then(|x| self.emit_lifetime(&x));
         let label = self.trap.emit(generated::Label {
             id: TrapId::Star,
@@ -1611,9 +1448,6 @@ impl Translator<'_> {
         node: &ast::LetElse,
     ) -> Option<Label<generated::LetElse>> {
         pre_emit!(LetElse, self, node);
-        if self.should_be_excluded(node) {
-            return None;
-        }
         let block_expr = node.block_expr().and_then(|x| self.emit_block_expr(&x));
         let label = self.trap.emit(generated::LetElse {
             id: TrapId::Star,
@@ -1632,9 +1466,6 @@ impl Translator<'_> {
         if self.should_be_excluded(node) {
             return None;
         }
-        if self.should_be_excluded_attrs(node) {
-            return None;
-        }
         let attrs = node.attrs().filter_map(|x| self.emit_attr(&x)).collect();
         let scrutinee = node.expr().and_then(|x| self.emit_expr(&x));
         let pat = node.pat().and_then(|x| self.emit_pat(&x));
@@ -1657,9 +1488,6 @@ impl Translator<'_> {
         if self.should_be_excluded(node) {
             return None;
         }
-        if self.should_be_excluded_attrs(node) {
-            return None;
-        }
         let attrs = node.attrs().filter_map(|x| self.emit_attr(&x)).collect();
         let initializer = node.initializer().and_then(|x| self.emit_expr(&x));
         let let_else = node.let_else().and_then(|x| self.emit_let_else(&x));
@@ -1683,9 +1511,6 @@ impl Translator<'_> {
         node: &ast::Lifetime,
     ) -> Option<Label<generated::Lifetime>> {
         pre_emit!(Lifetime, self, node);
-        if self.should_be_excluded(node) {
-            return None;
-        }
         let text = node.try_get_text();
         let label = self.trap.emit(generated::Lifetime {
             id: TrapId::Star,
@@ -1701,9 +1526,6 @@ impl Translator<'_> {
         node: &ast::LifetimeArg,
     ) -> Option<Label<generated::LifetimeArg>> {
         pre_emit!(LifetimeArg, self, node);
-        if self.should_be_excluded(node) {
-            return None;
-        }
         let lifetime = node.lifetime().and_then(|x| self.emit_lifetime(&x));
         let label = self.trap.emit(generated::LifetimeArg {
             id: TrapId::Star,
@@ -1722,9 +1544,6 @@ impl Translator<'_> {
         if self.should_be_excluded(node) {
             return None;
         }
-        if self.should_be_excluded_attrs(node) {
-            return None;
-        }
         let attrs = node.attrs().filter_map(|x| self.emit_attr(&x)).collect();
         let lifetime = node.lifetime().and_then(|x| self.emit_lifetime(&x));
         let type_bound_list = node
@@ -1749,9 +1568,6 @@ impl Translator<'_> {
         if self.should_be_excluded(node) {
             return None;
         }
-        if self.should_be_excluded_attrs(node) {
-            return None;
-        }
         let attrs = node.attrs().filter_map(|x| self.emit_attr(&x)).collect();
         let text_value = node.try_get_text();
         let label = self.trap.emit(generated::LiteralExpr {
@@ -1769,9 +1585,6 @@ impl Translator<'_> {
         node: &ast::LiteralPat,
     ) -> Option<Label<generated::LiteralPat>> {
         pre_emit!(LiteralPat, self, node);
-        if self.should_be_excluded(node) {
-            return None;
-        }
         let literal = node.literal().and_then(|x| self.emit_literal(&x));
         let label = self.trap.emit(generated::LiteralPat {
             id: TrapId::Star,
@@ -1790,9 +1603,6 @@ impl Translator<'_> {
         if self.should_be_excluded(node) {
             return None;
         }
-        if self.should_be_excluded_attrs(node) {
-            return None;
-        }
         let attrs = node.attrs().filter_map(|x| self.emit_attr(&x)).collect();
         let label = node.label().and_then(|x| self.emit_label(&x));
         let loop_body = node.loop_body().and_then(|x| self.emit_block_expr(&x));
@@ -1815,12 +1625,13 @@ impl Translator<'_> {
         if self.should_be_excluded(node) {
             return None;
         }
-        if self.should_be_excluded_attrs(node) {
-            return None;
-        }
         let attrs = node.attrs().filter_map(|x| self.emit_attr(&x)).collect();
         let path = node.path().and_then(|x| self.emit_path(&x));
-        let token_tree = node.token_tree().and_then(|x| self.emit_token_tree(&x));
+        let token_tree = if self.should_skip_bodies() {
+            None
+        } else {
+            node.token_tree().and_then(|x| self.emit_token_tree(&x))
+        };
         let label = self.trap.emit(generated::MacroCall {
             id: TrapId::Star,
             attrs,
@@ -1840,12 +1651,17 @@ impl Translator<'_> {
         if self.should_be_excluded(node) {
             return None;
         }
-        if self.should_be_excluded_attrs(node) {
-            return None;
-        }
-        let args = node.args().and_then(|x| self.emit_token_tree(&x));
+        let args = if self.should_skip_bodies() {
+            None
+        } else {
+            node.args().and_then(|x| self.emit_token_tree(&x))
+        };
         let attrs = node.attrs().filter_map(|x| self.emit_attr(&x)).collect();
-        let body = node.body().and_then(|x| self.emit_token_tree(&x));
+        let body = if self.should_skip_bodies() {
+            None
+        } else {
+            node.body().and_then(|x| self.emit_token_tree(&x))
+        };
         let name = node.name().and_then(|x| self.emit_name(&x));
         let visibility = node.visibility().and_then(|x| self.emit_visibility(&x));
         let label = self.trap.emit(generated::MacroDef {
@@ -1866,9 +1682,6 @@ impl Translator<'_> {
         node: &ast::MacroExpr,
     ) -> Option<Label<generated::MacroExpr>> {
         pre_emit!(MacroExpr, self, node);
-        if self.should_be_excluded(node) {
-            return None;
-        }
         let macro_call = node.macro_call().and_then(|x| self.emit_macro_call(&x));
         let label = self.trap.emit(generated::MacroExpr {
             id: TrapId::Star,
@@ -1884,9 +1697,6 @@ impl Translator<'_> {
         node: &ast::MacroItems,
     ) -> Option<Label<generated::MacroItems>> {
         pre_emit!(MacroItems, self, node);
-        if self.should_be_excluded(node) {
-            return None;
-        }
         let items = node.items().filter_map(|x| self.emit_item(&x)).collect();
         let label = self.trap.emit(generated::MacroItems {
             id: TrapId::Star,
@@ -1902,9 +1712,6 @@ impl Translator<'_> {
         node: &ast::MacroPat,
     ) -> Option<Label<generated::MacroPat>> {
         pre_emit!(MacroPat, self, node);
-        if self.should_be_excluded(node) {
-            return None;
-        }
         let macro_call = node.macro_call().and_then(|x| self.emit_macro_call(&x));
         let label = self.trap.emit(generated::MacroPat {
             id: TrapId::Star,
@@ -1923,9 +1730,6 @@ impl Translator<'_> {
         if self.should_be_excluded(node) {
             return None;
         }
-        if self.should_be_excluded_attrs(node) {
-            return None;
-        }
         let attrs = node.attrs().filter_map(|x| self.emit_attr(&x)).collect();
         let name = node.name().and_then(|x| self.emit_name(&x));
         let token_tree = node.token_tree().and_then(|x| self.emit_token_tree(&x));
@@ -1947,9 +1751,6 @@ impl Translator<'_> {
         node: &ast::MacroStmts,
     ) -> Option<Label<generated::MacroBlockExpr>> {
         pre_emit!(MacroBlockExpr, self, node);
-        if self.should_be_excluded(node) {
-            return None;
-        }
         let tail_expr = node.expr().and_then(|x| self.emit_expr(&x));
         let statements = node
             .statements()
@@ -1970,9 +1771,6 @@ impl Translator<'_> {
         node: &ast::MacroType,
     ) -> Option<Label<generated::MacroTypeRepr>> {
         pre_emit!(MacroTypeRepr, self, node);
-        if self.should_be_excluded(node) {
-            return None;
-        }
         let macro_call = node.macro_call().and_then(|x| self.emit_macro_call(&x));
         let label = self.trap.emit(generated::MacroTypeRepr {
             id: TrapId::Star,
@@ -1991,9 +1789,6 @@ impl Translator<'_> {
         if self.should_be_excluded(node) {
             return None;
         }
-        if self.should_be_excluded_attrs(node) {
-            return None;
-        }
         let attrs = node.attrs().filter_map(|x| self.emit_attr(&x)).collect();
         let expr = node.expr().and_then(|x| self.emit_expr(&x));
         let guard = node.guard().and_then(|x| self.emit_match_guard(&x));
@@ -2018,9 +1813,6 @@ impl Translator<'_> {
         if self.should_be_excluded(node) {
             return None;
         }
-        if self.should_be_excluded_attrs(node) {
-            return None;
-        }
         let arms = node
             .arms()
             .filter_map(|x| self.emit_match_arm(&x))
@@ -2044,9 +1836,6 @@ impl Translator<'_> {
         if self.should_be_excluded(node) {
             return None;
         }
-        if self.should_be_excluded_attrs(node) {
-            return None;
-        }
         let attrs = node.attrs().filter_map(|x| self.emit_attr(&x)).collect();
         let scrutinee = node.expr().and_then(|x| self.emit_expr(&x));
         let match_arm_list = node
@@ -2068,9 +1857,6 @@ impl Translator<'_> {
         node: &ast::MatchGuard,
     ) -> Option<Label<generated::MatchGuard>> {
         pre_emit!(MatchGuard, self, node);
-        if self.should_be_excluded(node) {
-            return None;
-        }
         let condition = node.condition().and_then(|x| self.emit_expr(&x));
         let label = self.trap.emit(generated::MatchGuard {
             id: TrapId::Star,
@@ -2083,9 +1869,6 @@ impl Translator<'_> {
     }
     pub(crate) fn emit_meta(&mut self, node: &ast::Meta) -> Option<Label<generated::Meta>> {
         pre_emit!(Meta, self, node);
-        if self.should_be_excluded(node) {
-            return None;
-        }
         let expr = node.expr().and_then(|x| self.emit_expr(&x));
         let is_unsafe = node.unsafe_token().is_some();
         let path = node.path().and_then(|x| self.emit_path(&x));
@@ -2110,9 +1893,6 @@ impl Translator<'_> {
         if self.should_be_excluded(node) {
             return None;
         }
-        if self.should_be_excluded_attrs(node) {
-            return None;
-        }
         let arg_list = node.arg_list().and_then(|x| self.emit_arg_list(&x));
         let attrs = node.attrs().filter_map(|x| self.emit_attr(&x)).collect();
         let generic_arg_list = node
@@ -2138,9 +1918,6 @@ impl Translator<'_> {
         if self.should_be_excluded(node) {
             return None;
         }
-        if self.should_be_excluded_attrs(node) {
-            return None;
-        }
         let attrs = node.attrs().filter_map(|x| self.emit_attr(&x)).collect();
         let item_list = node.item_list().and_then(|x| self.emit_item_list(&x));
         let name = node.name().and_then(|x| self.emit_name(&x));
@@ -2159,9 +1936,6 @@ impl Translator<'_> {
     }
     pub(crate) fn emit_name(&mut self, node: &ast::Name) -> Option<Label<generated::Name>> {
         pre_emit!(Name, self, node);
-        if self.should_be_excluded(node) {
-            return None;
-        }
         let text = node.try_get_text();
         let label = self.trap.emit(generated::Name {
             id: TrapId::Star,
@@ -2177,9 +1951,6 @@ impl Translator<'_> {
         node: &ast::NameRef,
     ) -> Option<Label<generated::NameRef>> {
         pre_emit!(NameRef, self, node);
-        if self.should_be_excluded(node) {
-            return None;
-        }
         let text = node.try_get_text();
         let label = self.trap.emit(generated::NameRef {
             id: TrapId::Star,
@@ -2195,9 +1966,6 @@ impl Translator<'_> {
         node: &ast::NeverType,
     ) -> Option<Label<generated::NeverTypeRepr>> {
         pre_emit!(NeverTypeRepr, self, node);
-        if self.should_be_excluded(node) {
-            return None;
-        }
         let label = self
             .trap
             .emit(generated::NeverTypeRepr { id: TrapId::Star });
@@ -2214,9 +1982,6 @@ impl Translator<'_> {
         if self.should_be_excluded(node) {
             return None;
         }
-        if self.should_be_excluded_attrs(node) {
-            return None;
-        }
         let attrs = node.attrs().filter_map(|x| self.emit_attr(&x)).collect();
         let fields = node
             .fields()
@@ -2236,9 +2001,6 @@ impl Translator<'_> {
     }
     pub(crate) fn emit_or_pat(&mut self, node: &ast::OrPat) -> Option<Label<generated::OrPat>> {
         pre_emit!(OrPat, self, node);
-        if self.should_be_excluded(node) {
-            return None;
-        }
         let pats = node.pats().filter_map(|x| self.emit_pat(&x)).collect();
         let label = self.trap.emit(generated::OrPat {
             id: TrapId::Star,
@@ -2254,11 +2016,12 @@ impl Translator<'_> {
         if self.should_be_excluded(node) {
             return None;
         }
-        if self.should_be_excluded_attrs(node) {
-            return None;
-        }
         let attrs = node.attrs().filter_map(|x| self.emit_attr(&x)).collect();
-        let pat = node.pat().and_then(|x| self.emit_pat(&x));
+        let pat = if self.should_skip_bodies() {
+            None
+        } else {
+            node.pat().and_then(|x| self.emit_pat(&x))
+        };
         let type_repr = node.ty().and_then(|x| self.emit_type(&x));
         let label = self.trap.emit(generated::Param {
             id: TrapId::Star,
@@ -2276,9 +2039,6 @@ impl Translator<'_> {
         node: &ast::ParamList,
     ) -> Option<Label<generated::ParamList>> {
         pre_emit!(ParamList, self, node);
-        if self.should_be_excluded(node) {
-            return None;
-        }
         let params = node.params().filter_map(|x| self.emit_param(&x)).collect();
         let self_param = node.self_param().and_then(|x| self.emit_self_param(&x));
         let label = self.trap.emit(generated::ParamList {
@@ -2299,9 +2059,6 @@ impl Translator<'_> {
         if self.should_be_excluded(node) {
             return None;
         }
-        if self.should_be_excluded_attrs(node) {
-            return None;
-        }
         let attrs = node.attrs().filter_map(|x| self.emit_attr(&x)).collect();
         let expr = node.expr().and_then(|x| self.emit_expr(&x));
         let label = self.trap.emit(generated::ParenExpr {
@@ -2319,9 +2076,6 @@ impl Translator<'_> {
         node: &ast::ParenPat,
     ) -> Option<Label<generated::ParenPat>> {
         pre_emit!(ParenPat, self, node);
-        if self.should_be_excluded(node) {
-            return None;
-        }
         let pat = node.pat().and_then(|x| self.emit_pat(&x));
         let label = self.trap.emit(generated::ParenPat {
             id: TrapId::Star,
@@ -2337,9 +2091,6 @@ impl Translator<'_> {
         node: &ast::ParenType,
     ) -> Option<Label<generated::ParenTypeRepr>> {
         pre_emit!(ParenTypeRepr, self, node);
-        if self.should_be_excluded(node) {
-            return None;
-        }
         let type_repr = node.ty().and_then(|x| self.emit_type(&x));
         let label = self.trap.emit(generated::ParenTypeRepr {
             id: TrapId::Star,
@@ -2355,9 +2106,6 @@ impl Translator<'_> {
         node: &ast::ParenthesizedArgList,
     ) -> Option<Label<generated::ParenthesizedArgList>> {
         pre_emit!(ParenthesizedArgList, self, node);
-        if self.should_be_excluded(node) {
-            return None;
-        }
         let type_args = node
             .type_args()
             .filter_map(|x| self.emit_type_arg(&x))
@@ -2373,9 +2121,6 @@ impl Translator<'_> {
     }
     pub(crate) fn emit_path(&mut self, node: &ast::Path) -> Option<Label<generated::Path>> {
         pre_emit!(Path, self, node);
-        if self.should_be_excluded(node) {
-            return None;
-        }
         let qualifier = node.qualifier().and_then(|x| self.emit_path(&x));
         let segment = node.segment().and_then(|x| self.emit_path_segment(&x));
         let label = self.trap.emit(generated::Path {
@@ -2396,9 +2141,6 @@ impl Translator<'_> {
         if self.should_be_excluded(node) {
             return None;
         }
-        if self.should_be_excluded_attrs(node) {
-            return None;
-        }
         let attrs = node.attrs().filter_map(|x| self.emit_attr(&x)).collect();
         let path = node.path().and_then(|x| self.emit_path(&x));
         let label = self.trap.emit(generated::PathExpr {
@@ -2416,9 +2158,6 @@ impl Translator<'_> {
         node: &ast::PathPat,
     ) -> Option<Label<generated::PathPat>> {
         pre_emit!(PathPat, self, node);
-        if self.should_be_excluded(node) {
-            return None;
-        }
         let path = node.path().and_then(|x| self.emit_path(&x));
         let label = self.trap.emit(generated::PathPat {
             id: TrapId::Star,
@@ -2434,9 +2173,6 @@ impl Translator<'_> {
         node: &ast::PathSegment,
     ) -> Option<Label<generated::PathSegment>> {
         pre_emit!(PathSegment, self, node);
-        if self.should_be_excluded(node) {
-            return None;
-        }
         let generic_arg_list = node
             .generic_arg_list()
             .and_then(|x| self.emit_generic_arg_list(&x));
@@ -2466,9 +2202,6 @@ impl Translator<'_> {
         node: &ast::PathType,
     ) -> Option<Label<generated::PathTypeRepr>> {
         pre_emit!(PathTypeRepr, self, node);
-        if self.should_be_excluded(node) {
-            return None;
-        }
         let path = node.path().and_then(|x| self.emit_path(&x));
         let label = self.trap.emit(generated::PathTypeRepr {
             id: TrapId::Star,
@@ -2487,9 +2220,6 @@ impl Translator<'_> {
         if self.should_be_excluded(node) {
             return None;
         }
-        if self.should_be_excluded_attrs(node) {
-            return None;
-        }
         let attrs = node.attrs().filter_map(|x| self.emit_attr(&x)).collect();
         let expr = node.expr().and_then(|x| self.emit_expr(&x));
         let operator_name = node.try_get_text();
@@ -2509,9 +2239,6 @@ impl Translator<'_> {
         node: &ast::PtrType,
     ) -> Option<Label<generated::PtrTypeRepr>> {
         pre_emit!(PtrTypeRepr, self, node);
-        if self.should_be_excluded(node) {
-            return None;
-        }
         let is_const = node.const_token().is_some();
         let is_mut = node.mut_token().is_some();
         let type_repr = node.ty().and_then(|x| self.emit_type(&x));
@@ -2534,9 +2261,6 @@ impl Translator<'_> {
         if self.should_be_excluded(node) {
             return None;
         }
-        if self.should_be_excluded_attrs(node) {
-            return None;
-        }
         let attrs = node.attrs().filter_map(|x| self.emit_attr(&x)).collect();
         let end = node.end().and_then(|x| self.emit_expr(&x));
         let operator_name = node.try_get_text();
@@ -2558,9 +2282,6 @@ impl Translator<'_> {
         node: &ast::RangePat,
     ) -> Option<Label<generated::RangePat>> {
         pre_emit!(RangePat, self, node);
-        if self.should_be_excluded(node) {
-            return None;
-        }
         let end = node.end().and_then(|x| self.emit_pat(&x));
         let operator_name = node.try_get_text();
         let start = node.start().and_then(|x| self.emit_pat(&x));
@@ -2580,9 +2301,6 @@ impl Translator<'_> {
         node: &ast::RecordExpr,
     ) -> Option<Label<generated::StructExpr>> {
         pre_emit!(StructExpr, self, node);
-        if self.should_be_excluded(node) {
-            return None;
-        }
         let path = node.path().and_then(|x| self.emit_path(&x));
         let struct_expr_field_list = node
             .record_expr_field_list()
@@ -2605,9 +2323,6 @@ impl Translator<'_> {
         if self.should_be_excluded(node) {
             return None;
         }
-        if self.should_be_excluded_attrs(node) {
-            return None;
-        }
         let attrs = node.attrs().filter_map(|x| self.emit_attr(&x)).collect();
         let expr = node.expr().and_then(|x| self.emit_expr(&x));
         let identifier = node.name_ref().and_then(|x| self.emit_name_ref(&x));
@@ -2630,9 +2345,6 @@ impl Translator<'_> {
         if self.should_be_excluded(node) {
             return None;
         }
-        if self.should_be_excluded_attrs(node) {
-            return None;
-        }
         let attrs = node.attrs().filter_map(|x| self.emit_attr(&x)).collect();
         let fields = node
             .fields()
@@ -2658,9 +2370,6 @@ impl Translator<'_> {
         if self.should_be_excluded(node) {
             return None;
         }
-        if self.should_be_excluded_attrs(node) {
-            return None;
-        }
         let attrs = node.attrs().filter_map(|x| self.emit_attr(&x)).collect();
         let default = node.expr().and_then(|x| self.emit_expr(&x));
         let is_unsafe = node.unsafe_token().is_some();
@@ -2686,9 +2395,6 @@ impl Translator<'_> {
         node: &ast::RecordFieldList,
     ) -> Option<Label<generated::StructFieldList>> {
         pre_emit!(StructFieldList, self, node);
-        if self.should_be_excluded(node) {
-            return None;
-        }
         let fields = node
             .fields()
             .filter_map(|x| self.emit_record_field(&x))
@@ -2707,9 +2413,6 @@ impl Translator<'_> {
         node: &ast::RecordPat,
     ) -> Option<Label<generated::StructPat>> {
         pre_emit!(StructPat, self, node);
-        if self.should_be_excluded(node) {
-            return None;
-        }
         let path = node.path().and_then(|x| self.emit_path(&x));
         let struct_pat_field_list = node
             .record_pat_field_list()
@@ -2732,9 +2435,6 @@ impl Translator<'_> {
         if self.should_be_excluded(node) {
             return None;
         }
-        if self.should_be_excluded_attrs(node) {
-            return None;
-        }
         let attrs = node.attrs().filter_map(|x| self.emit_attr(&x)).collect();
         let identifier = node.name_ref().and_then(|x| self.emit_name_ref(&x));
         let pat = node.pat().and_then(|x| self.emit_pat(&x));
@@ -2754,9 +2454,6 @@ impl Translator<'_> {
         node: &ast::RecordPatFieldList,
     ) -> Option<Label<generated::StructPatFieldList>> {
         pre_emit!(StructPatFieldList, self, node);
-        if self.should_be_excluded(node) {
-            return None;
-        }
         let fields = node
             .fields()
             .filter_map(|x| self.emit_record_pat_field(&x))
@@ -2780,9 +2477,6 @@ impl Translator<'_> {
         if self.should_be_excluded(node) {
             return None;
         }
-        if self.should_be_excluded_attrs(node) {
-            return None;
-        }
         let attrs = node.attrs().filter_map(|x| self.emit_attr(&x)).collect();
         let expr = node.expr().and_then(|x| self.emit_expr(&x));
         let is_const = node.const_token().is_some();
@@ -2803,9 +2497,6 @@ impl Translator<'_> {
     }
     pub(crate) fn emit_ref_pat(&mut self, node: &ast::RefPat) -> Option<Label<generated::RefPat>> {
         pre_emit!(RefPat, self, node);
-        if self.should_be_excluded(node) {
-            return None;
-        }
         let is_mut = node.mut_token().is_some();
         let pat = node.pat().and_then(|x| self.emit_pat(&x));
         let label = self.trap.emit(generated::RefPat {
@@ -2823,9 +2514,6 @@ impl Translator<'_> {
         node: &ast::RefType,
     ) -> Option<Label<generated::RefTypeRepr>> {
         pre_emit!(RefTypeRepr, self, node);
-        if self.should_be_excluded(node) {
-            return None;
-        }
         let is_mut = node.mut_token().is_some();
         let lifetime = node.lifetime().and_then(|x| self.emit_lifetime(&x));
         let type_repr = node.ty().and_then(|x| self.emit_type(&x));
@@ -2842,9 +2530,6 @@ impl Translator<'_> {
     }
     pub(crate) fn emit_rename(&mut self, node: &ast::Rename) -> Option<Label<generated::Rename>> {
         pre_emit!(Rename, self, node);
-        if self.should_be_excluded(node) {
-            return None;
-        }
         let name = node.name().and_then(|x| self.emit_name(&x));
         let label = self.trap.emit(generated::Rename {
             id: TrapId::Star,
@@ -2863,9 +2548,6 @@ impl Translator<'_> {
         if self.should_be_excluded(node) {
             return None;
         }
-        if self.should_be_excluded_attrs(node) {
-            return None;
-        }
         let attrs = node.attrs().filter_map(|x| self.emit_attr(&x)).collect();
         let label = self.trap.emit(generated::RestPat {
             id: TrapId::Star,
@@ -2881,9 +2563,6 @@ impl Translator<'_> {
         node: &ast::RetType,
     ) -> Option<Label<generated::RetTypeRepr>> {
         pre_emit!(RetTypeRepr, self, node);
-        if self.should_be_excluded(node) {
-            return None;
-        }
         let type_repr = node.ty().and_then(|x| self.emit_type(&x));
         let label = self.trap.emit(generated::RetTypeRepr {
             id: TrapId::Star,
@@ -2902,9 +2581,6 @@ impl Translator<'_> {
         if self.should_be_excluded(node) {
             return None;
         }
-        if self.should_be_excluded_attrs(node) {
-            return None;
-        }
         let attrs = node.attrs().filter_map(|x| self.emit_attr(&x)).collect();
         let expr = node.expr().and_then(|x| self.emit_expr(&x));
         let label = self.trap.emit(generated::ReturnExpr {
@@ -2922,9 +2598,6 @@ impl Translator<'_> {
         node: &ast::ReturnTypeSyntax,
     ) -> Option<Label<generated::ReturnTypeSyntax>> {
         pre_emit!(ReturnTypeSyntax, self, node);
-        if self.should_be_excluded(node) {
-            return None;
-        }
         let label = self
             .trap
             .emit(generated::ReturnTypeSyntax { id: TrapId::Star });
@@ -2941,9 +2614,6 @@ impl Translator<'_> {
         if self.should_be_excluded(node) {
             return None;
         }
-        if self.should_be_excluded_attrs(node) {
-            return None;
-        }
         let attrs = node.attrs().filter_map(|x| self.emit_attr(&x)).collect();
         let is_ref = node.amp_token().is_some();
         let is_mut = node.mut_token().is_some();
@@ -2969,9 +2639,6 @@ impl Translator<'_> {
         node: &ast::SlicePat,
     ) -> Option<Label<generated::SlicePat>> {
         pre_emit!(SlicePat, self, node);
-        if self.should_be_excluded(node) {
-            return None;
-        }
         let pats = node.pats().filter_map(|x| self.emit_pat(&x)).collect();
         let label = self.trap.emit(generated::SlicePat {
             id: TrapId::Star,
@@ -2987,9 +2654,6 @@ impl Translator<'_> {
         node: &ast::SliceType,
     ) -> Option<Label<generated::SliceTypeRepr>> {
         pre_emit!(SliceTypeRepr, self, node);
-        if self.should_be_excluded(node) {
-            return None;
-        }
         let type_repr = node.ty().and_then(|x| self.emit_type(&x));
         let label = self.trap.emit(generated::SliceTypeRepr {
             id: TrapId::Star,
@@ -3008,9 +2672,6 @@ impl Translator<'_> {
         if self.should_be_excluded(node) {
             return None;
         }
-        if self.should_be_excluded_attrs(node) {
-            return None;
-        }
         let attrs = node.attrs().filter_map(|x| self.emit_attr(&x)).collect();
         let items = node.items().filter_map(|x| self.emit_item(&x)).collect();
         let label = self.trap.emit(generated::SourceFile {
@@ -3028,11 +2689,12 @@ impl Translator<'_> {
         if self.should_be_excluded(node) {
             return None;
         }
-        if self.should_be_excluded_attrs(node) {
-            return None;
-        }
         let attrs = node.attrs().filter_map(|x| self.emit_attr(&x)).collect();
-        let body = node.body().and_then(|x| self.emit_expr(&x));
+        let body = if self.should_skip_bodies() {
+            None
+        } else {
+            node.body().and_then(|x| self.emit_expr(&x))
+        };
         let is_mut = node.mut_token().is_some();
         let is_static = node.static_token().is_some();
         let is_unsafe = node.unsafe_token().is_some();
@@ -3063,9 +2725,6 @@ impl Translator<'_> {
         if self.should_be_excluded(node) {
             return None;
         }
-        if self.should_be_excluded_attrs(node) {
-            return None;
-        }
         let attrs = node.attrs().filter_map(|x| self.emit_attr(&x)).collect();
         let statements = node
             .statements()
@@ -3088,9 +2747,6 @@ impl Translator<'_> {
         if self.should_be_excluded(node) {
             return None;
         }
-        if self.should_be_excluded_attrs(node) {
-            return None;
-        }
         let attrs = node.attrs().filter_map(|x| self.emit_attr(&x)).collect();
         let field_list = node.field_list().and_then(|x| self.emit_field_list(&x));
         let generic_param_list = node
@@ -3118,9 +2774,6 @@ impl Translator<'_> {
         node: &ast::TokenTree,
     ) -> Option<Label<generated::TokenTree>> {
         pre_emit!(TokenTree, self, node);
-        if self.should_be_excluded(node) {
-            return None;
-        }
         let label = self.trap.emit(generated::TokenTree { id: TrapId::Star });
         self.emit_location(label, node);
         post_emit!(TokenTree, self, node, label);
@@ -3132,9 +2785,6 @@ impl Translator<'_> {
         if self.should_be_excluded(node) {
             return None;
         }
-        if self.should_be_excluded_attrs(node) {
-            return None;
-        }
         let assoc_item_list = node
             .assoc_item_list()
             .and_then(|x| self.emit_assoc_item_list(&x));
@@ -3175,9 +2825,6 @@ impl Translator<'_> {
         if self.should_be_excluded(node) {
             return None;
         }
-        if self.should_be_excluded_attrs(node) {
-            return None;
-        }
         let attrs = node.attrs().filter_map(|x| self.emit_attr(&x)).collect();
         let generic_param_list = node
             .generic_param_list()
@@ -3210,9 +2857,6 @@ impl Translator<'_> {
         if self.should_be_excluded(node) {
             return None;
         }
-        if self.should_be_excluded_attrs(node) {
-            return None;
-        }
         let attrs = node.attrs().filter_map(|x| self.emit_attr(&x)).collect();
         let expr = node.expr().and_then(|x| self.emit_expr(&x));
         let label = self.trap.emit(generated::TryExpr {
@@ -3233,9 +2877,6 @@ impl Translator<'_> {
         if self.should_be_excluded(node) {
             return None;
         }
-        if self.should_be_excluded_attrs(node) {
-            return None;
-        }
         let attrs = node.attrs().filter_map(|x| self.emit_attr(&x)).collect();
         let fields = node.fields().filter_map(|x| self.emit_expr(&x)).collect();
         let label = self.trap.emit(generated::TupleExpr {
@@ -3256,9 +2897,6 @@ impl Translator<'_> {
         if self.should_be_excluded(node) {
             return None;
         }
-        if self.should_be_excluded_attrs(node) {
-            return None;
-        }
         let attrs = node.attrs().filter_map(|x| self.emit_attr(&x)).collect();
         let type_repr = node.ty().and_then(|x| self.emit_type(&x));
         let visibility = node.visibility().and_then(|x| self.emit_visibility(&x));
@@ -3278,9 +2916,6 @@ impl Translator<'_> {
         node: &ast::TupleFieldList,
     ) -> Option<Label<generated::TupleFieldList>> {
         pre_emit!(TupleFieldList, self, node);
-        if self.should_be_excluded(node) {
-            return None;
-        }
         let fields = node
             .fields()
             .filter_map(|x| self.emit_tuple_field(&x))
@@ -3299,9 +2934,6 @@ impl Translator<'_> {
         node: &ast::TuplePat,
     ) -> Option<Label<generated::TuplePat>> {
         pre_emit!(TuplePat, self, node);
-        if self.should_be_excluded(node) {
-            return None;
-        }
         let fields = node.fields().filter_map(|x| self.emit_pat(&x)).collect();
         let label = self.trap.emit(generated::TuplePat {
             id: TrapId::Star,
@@ -3317,9 +2949,6 @@ impl Translator<'_> {
         node: &ast::TupleStructPat,
     ) -> Option<Label<generated::TupleStructPat>> {
         pre_emit!(TupleStructPat, self, node);
-        if self.should_be_excluded(node) {
-            return None;
-        }
         let fields = node.fields().filter_map(|x| self.emit_pat(&x)).collect();
         let path = node.path().and_then(|x| self.emit_path(&x));
         let label = self.trap.emit(generated::TupleStructPat {
@@ -3337,9 +2966,6 @@ impl Translator<'_> {
         node: &ast::TupleType,
     ) -> Option<Label<generated::TupleTypeRepr>> {
         pre_emit!(TupleTypeRepr, self, node);
-        if self.should_be_excluded(node) {
-            return None;
-        }
         let fields = node.fields().filter_map(|x| self.emit_type(&x)).collect();
         let label = self.trap.emit(generated::TupleTypeRepr {
             id: TrapId::Star,
@@ -3358,9 +2984,6 @@ impl Translator<'_> {
         if self.should_be_excluded(node) {
             return None;
         }
-        if self.should_be_excluded_attrs(node) {
-            return None;
-        }
         let attrs = node.attrs().filter_map(|x| self.emit_attr(&x)).collect();
         let generic_param_list = node
             .generic_param_list()
@@ -3394,9 +3017,6 @@ impl Translator<'_> {
         node: &ast::TypeArg,
     ) -> Option<Label<generated::TypeArg>> {
         pre_emit!(TypeArg, self, node);
-        if self.should_be_excluded(node) {
-            return None;
-        }
         let type_repr = node.ty().and_then(|x| self.emit_type(&x));
         let label = self.trap.emit(generated::TypeArg {
             id: TrapId::Star,
@@ -3412,9 +3032,6 @@ impl Translator<'_> {
         node: &ast::TypeBound,
     ) -> Option<Label<generated::TypeBound>> {
         pre_emit!(TypeBound, self, node);
-        if self.should_be_excluded(node) {
-            return None;
-        }
         let is_async = node.async_token().is_some();
         let is_const = node.const_token().is_some();
         let lifetime = node.lifetime().and_then(|x| self.emit_lifetime(&x));
@@ -3440,9 +3057,6 @@ impl Translator<'_> {
         node: &ast::TypeBoundList,
     ) -> Option<Label<generated::TypeBoundList>> {
         pre_emit!(TypeBoundList, self, node);
-        if self.should_be_excluded(node) {
-            return None;
-        }
         let bounds = node
             .bounds()
             .filter_map(|x| self.emit_type_bound(&x))
@@ -3464,9 +3078,6 @@ impl Translator<'_> {
         if self.should_be_excluded(node) {
             return None;
         }
-        if self.should_be_excluded_attrs(node) {
-            return None;
-        }
         let attrs = node.attrs().filter_map(|x| self.emit_attr(&x)).collect();
         let default_type = node.default_type().and_then(|x| self.emit_type(&x));
         let name = node.name().and_then(|x| self.emit_name(&x));
@@ -3493,9 +3104,6 @@ impl Translator<'_> {
         if self.should_be_excluded(node) {
             return None;
         }
-        if self.should_be_excluded_attrs(node) {
-            return None;
-        }
         let attrs = node.attrs().filter_map(|x| self.emit_attr(&x)).collect();
         let label = self.trap.emit(generated::UnderscoreExpr {
             id: TrapId::Star,
@@ -3511,9 +3119,6 @@ impl Translator<'_> {
         if self.should_be_excluded(node) {
             return None;
         }
-        if self.should_be_excluded_attrs(node) {
-            return None;
-        }
         let attrs = node.attrs().filter_map(|x| self.emit_attr(&x)).collect();
         let generic_param_list = node
             .generic_param_list()
@@ -3543,9 +3148,6 @@ impl Translator<'_> {
         if self.should_be_excluded(node) {
             return None;
         }
-        if self.should_be_excluded_attrs(node) {
-            return None;
-        }
         let attrs = node.attrs().filter_map(|x| self.emit_attr(&x)).collect();
         let use_tree = node.use_tree().and_then(|x| self.emit_use_tree(&x));
         let visibility = node.visibility().and_then(|x| self.emit_visibility(&x));
@@ -3565,9 +3167,6 @@ impl Translator<'_> {
         node: &ast::UseBoundGenericArgs,
     ) -> Option<Label<generated::UseBoundGenericArgs>> {
         pre_emit!(UseBoundGenericArgs, self, node);
-        if self.should_be_excluded(node) {
-            return None;
-        }
         let use_bound_generic_args = node
             .use_bound_generic_args()
             .filter_map(|x| self.emit_use_bound_generic_arg(&x))
@@ -3586,9 +3185,6 @@ impl Translator<'_> {
         node: &ast::UseTree,
     ) -> Option<Label<generated::UseTree>> {
         pre_emit!(UseTree, self, node);
-        if self.should_be_excluded(node) {
-            return None;
-        }
         let is_glob = node.star_token().is_some();
         let path = node.path().and_then(|x| self.emit_path(&x));
         let rename = node.rename().and_then(|x| self.emit_rename(&x));
@@ -3612,9 +3208,6 @@ impl Translator<'_> {
         node: &ast::UseTreeList,
     ) -> Option<Label<generated::UseTreeList>> {
         pre_emit!(UseTreeList, self, node);
-        if self.should_be_excluded(node) {
-            return None;
-        }
         let use_trees = node
             .use_trees()
             .filter_map(|x| self.emit_use_tree(&x))
@@ -3636,9 +3229,6 @@ impl Translator<'_> {
         if self.should_be_excluded(node) {
             return None;
         }
-        if self.should_be_excluded_attrs(node) {
-            return None;
-        }
         let attrs = node.attrs().filter_map(|x| self.emit_attr(&x)).collect();
         let discriminant = node.expr().and_then(|x| self.emit_expr(&x));
         let field_list = node.field_list().and_then(|x| self.emit_field_list(&x));
@@ -3662,9 +3252,6 @@ impl Translator<'_> {
         node: &ast::VariantList,
     ) -> Option<Label<generated::VariantList>> {
         pre_emit!(VariantList, self, node);
-        if self.should_be_excluded(node) {
-            return None;
-        }
         let variants = node
             .variants()
             .filter_map(|x| self.emit_variant(&x))
@@ -3683,9 +3270,6 @@ impl Translator<'_> {
         node: &ast::Visibility,
     ) -> Option<Label<generated::Visibility>> {
         pre_emit!(Visibility, self, node);
-        if self.should_be_excluded(node) {
-            return None;
-        }
         let path = node.path().and_then(|x| self.emit_path(&x));
         let label = self.trap.emit(generated::Visibility {
             id: TrapId::Star,
@@ -3701,9 +3285,6 @@ impl Translator<'_> {
         node: &ast::WhereClause,
     ) -> Option<Label<generated::WhereClause>> {
         pre_emit!(WhereClause, self, node);
-        if self.should_be_excluded(node) {
-            return None;
-        }
         let predicates = node
             .predicates()
             .filter_map(|x| self.emit_where_pred(&x))
@@ -3722,9 +3303,6 @@ impl Translator<'_> {
         node: &ast::WherePred,
     ) -> Option<Label<generated::WherePred>> {
         pre_emit!(WherePred, self, node);
-        if self.should_be_excluded(node) {
-            return None;
-        }
         let generic_param_list = node
             .generic_param_list()
             .and_then(|x| self.emit_generic_param_list(&x));
@@ -3753,9 +3331,6 @@ impl Translator<'_> {
         if self.should_be_excluded(node) {
             return None;
         }
-        if self.should_be_excluded_attrs(node) {
-            return None;
-        }
         let attrs = node.attrs().filter_map(|x| self.emit_attr(&x)).collect();
         let condition = node.condition().and_then(|x| self.emit_expr(&x));
         let label = node.label().and_then(|x| self.emit_label(&x));
@@ -3777,9 +3352,6 @@ impl Translator<'_> {
         node: &ast::WildcardPat,
     ) -> Option<Label<generated::WildcardPat>> {
         pre_emit!(WildcardPat, self, node);
-        if self.should_be_excluded(node) {
-            return None;
-        }
         let label = self.trap.emit(generated::WildcardPat { id: TrapId::Star });
         self.emit_location(label, node);
         post_emit!(WildcardPat, self, node, label);
@@ -3794,9 +3366,6 @@ impl Translator<'_> {
         if self.should_be_excluded(node) {
             return None;
         }
-        if self.should_be_excluded_attrs(node) {
-            return None;
-        }
         let attrs = node.attrs().filter_map(|x| self.emit_attr(&x)).collect();
         let expr = node.expr().and_then(|x| self.emit_expr(&x));
         let label = self.trap.emit(generated::YeetExpr {
@@ -3817,9 +3386,6 @@ impl Translator<'_> {
         if self.should_be_excluded(node) {
             return None;
         }
-        if self.should_be_excluded_attrs(node) {
-            return None;
-        }
         let attrs = node.attrs().filter_map(|x| self.emit_attr(&x)).collect();
         let expr = node.expr().and_then(|x| self.emit_expr(&x));
         let label = self.trap.emit(generated::YieldExpr {
diff --git a/rust/misc/bulk_generation_targets.json b/rust/misc/bulk_generation_targets.json
deleted file mode 100644
index 274d5dc5b36..00000000000
--- a/rust/misc/bulk_generation_targets.json
+++ /dev/null
@@ -1,75 +0,0 @@
-{
-    "strategy": "repo",
-    "language": "rust",
-    "targets": [
-        {
-            "name": "libc",
-            "git_repo": "https://github.com/rust-lang/libc",
-            "git_tag": "0.2.172"
-        },
-        {
-            "name": "log",
-            "git_repo": "https://github.com/rust-lang/log",
-            "git_tag": "0.4.27"
-        },
-        {
-            "name": "memchr",
-            "git_repo": "https://github.com/BurntSushi/memchr",
-            "git_tag": "2.7.4"
-        },
-        {
-            "name": "once_cell",
-            "git_repo": "https://github.com/matklad/once_cell",
-            "git_tag": "v1.21.3"
-        },
-        {
-            "name": "rand",
-            "git_repo": "https://github.com/rust-random/rand",
-            "git_tag": "0.9.1"
-        },
-        {
-            "name": "smallvec",
-            "git_repo": "https://github.com/servo/rust-smallvec",
-            "git_tag": "v1.15.0"
-        },
-        {
-            "name": "serde",
-            "git_repo": "https://github.com/serde-rs/serde",
-            "git_tag": "v1.0.219"
-        },
-        {
-            "name": "tokio",
-            "git_repo": "https://github.com/tokio-rs/tokio",
-            "git_tag": "tokio-1.45.0"
-        },
-        {
-            "name": "reqwest",
-            "git_repo": "https://github.com/seanmonstar/reqwest",
-            "git_tag": "v0.12.15"
-        },
-        {
-            "name": "rocket",
-            "git_repo": "https://github.com/SergioBenitez/Rocket",
-            "git_tag": "v0.5.1"
-        },
-        {
-            "name": "actix-web",
-            "git_repo": "https://github.com/actix/actix-web",
-            "git_tag": "web-v4.11.0"
-        },
-        {
-            "name": "hyper",
-            "git_repo": "https://github.com/hyperium/hyper",
-            "git_tag": "v1.6.0"
-        },
-        {
-            "name": "clap",
-            "git_repo": "https://github.com/clap-rs/clap",
-            "git_tag": "v4.5.38"
-        }
-    ],
-    "destination": "rust/ql/lib/ext/generated",
-    "extractor_options": [
-        "cargo_features='*'"
-    ]
-}
\ No newline at end of file
diff --git a/rust/ql/.generated.list b/rust/ql/.generated.list
index eb60dccb3e6..7c60da3abb7 100644
--- a/rust/ql/.generated.list
+++ b/rust/ql/.generated.list
@@ -1,4 +1,4 @@
-lib/codeql/rust/controlflow/internal/generated/CfgNodes.qll bd01b4d17625ee8c0da93231cf2291deb7e57db2c8aaa2c37968553c3144c47e 6e6ac58e09b84d02f461699a25ee80798a1bdc51c1836d9d75f5b52e93ae7ba6
+lib/codeql/rust/controlflow/internal/generated/CfgNodes.qll 6a103a6d04c951ca2f0c2989bed737cdbac56dd5ea9432b858da3416412bbf79 cf2bc67b65a1555de58bbd0a35b834b8867112a2f7c1951307c9416400ce70d0
 lib/codeql/rust/elements/Abi.qll 485a2e79f6f7bfd1c02a6e795a71e62dede3c3e150149d5f8f18b761253b7208 6159ba175e7ead0dd2e3f2788f49516c306ee11b1a443bd4bdc00b7017d559bd
 lib/codeql/rust/elements/Addressable.qll 13011bfd2e1556694c3d440cc34af8527da4df49ad92b62f2939d3699ff2cea5 ddb25935f7553a1a384b1abe2e4b4fa90ab50b952dadec32fd867afcb054f4be
 lib/codeql/rust/elements/ArgList.qll 3d2f6f5542340b80a4c6e944ac17aba0d00727588bb66e501453ac0f80c82f83 afd52700bf5a337f19827846667cd0fb1fea5abbbcbc353828e292a727ea58c9
@@ -33,7 +33,7 @@ lib/codeql/rust/elements/BoxPat.qll 1b2c3fff171aa6aa238c9460b122f26c79e04577cea6
 lib/codeql/rust/elements/BreakExpr.qll 7ca3807a20e9a9a988d1fd7abebf240325ed422fcb45c719ba46272f031f94db dffb7379d3f3ba220acfbd05eb7bb6cfd9cfda211e9c8b1f5240ca5fa61be3fc
 lib/codeql/rust/elements/CallExpr.qll f336500ca7a611b164d48b90e80edb0c0d3816792b0ececce659ac1ff1ffeb3e f99a9c55466418ef53860c44d9f2d6161af4b492178ddd9e5870dff742b70ae5
 lib/codeql/rust/elements/CallExprBase.qll 2846202b5208b541977500286951d96487bf555838c6c16cdd006a71e383745a c789d412bf099c624329379e0c7d94fa0d23ae2edea7a25a2ea0f3c0042ccf62
-lib/codeql/rust/elements/Callable.qll e1ed21a7e6bd2426f6ccd0e46cee506d8ebf90a6fdc4dca0979157da439853aa 02f6c09710116ce82157aec9a5ec706983c38e4d85cc631327baf8d409b018c6
+lib/codeql/rust/elements/Callable.qll 0f7f78c3bfabbe24962f6232b0440d27e51f06d2b8d341fc623ffbfbff173f47 5fd13aaa0eaf76ea0b47fa0641bd23eea20a069f0b3cbc1ee4e290e88321008a
 lib/codeql/rust/elements/CastExpr.qll 2fe1f36ba31fa29de309baf0a665cfcae67b61c73345e8f9bbd41e8c235fec45 c5b4c1e9dc24eb2357799defcb2df25989075e3a80e8663b74204a1c1b70e29a
 lib/codeql/rust/elements/ClosureBinder.qll 02c8e83bf07deaf7bf0233b76623ec7f1837be8b77fe7e1c23544edc7d85e3c4 2b114d9a6dede694324aebe3dac80a802d139cfacd39beb0f12b5b0a46ee6390
 lib/codeql/rust/elements/ClosureExpr.qll 67e2a106e9154c90367b129987e574d2a9ecf5b297536627e43706675d35eaed d6a381132ddd589c5a7ce174f50f9620041ddf690e15a65ebfb05ff7e7c02de7
@@ -240,7 +240,6 @@ lib/codeql/rust/elements/internal/BlockExprImpl.qll 36ac09e4a6eeeec22919b62b1d00
 lib/codeql/rust/elements/internal/BoxPatConstructor.qll 153f110ba25fd6c889092bfd16f73bb610fa60d6e0c8965d5f44d2446fcd48a2 9324cf0d8aa29945551bf8ab64801d598f57aab8cd4e19bcd4e9ef8a4a4e06eb
 lib/codeql/rust/elements/internal/BreakExprConstructor.qll 356be043c28e0b34fdf925a119c945632ee883c6f5ebb9a27003c6a8d250afd9 bb77e66b04bb9489340e7506931559b94285c6904b6f9d2f83b214cba4f3cfd5
 lib/codeql/rust/elements/internal/CallExprConstructor.qll 742b38e862e2cf82fd1ecc4d4fc5b4782a9c7c07f031452b2bae7aa59d5aa13a cad6e0a8be21d91b20ac2ec16cab9c30eae810b452c0f1992ed87d5c7f4144dc
-lib/codeql/rust/elements/internal/CallableImpl.qll 917a7d298583e15246428f32fba4cde6fc57a1790262731be27a96baddd8cf5e c5c0848024e0fe3fbb775e7750cf1a2c2dfa454a5aef0df55fec3d0a6fe99190
 lib/codeql/rust/elements/internal/CastExprConstructor.qll f3d6e10c4731f38a384675aeab3fba47d17b9e15648293787092bb3247ed808d d738a7751dbadb70aa1dcffcf8af7fa61d4cf8029798369a7e8620013afff4ed
 lib/codeql/rust/elements/internal/ClosureBinderConstructor.qll 6e376ab9d40308e95bcdaf1cc892472c92099d477720192cd382d2c4e0d9c8a1 60a0efe50203ad5bb97bdfc06d602182edcc48ac9670f2d27a9675bd9fd8e19f
 lib/codeql/rust/elements/internal/ClosureBinderImpl.qll 9f6ce7068b5c17df44f00037ebb42e6c8fdbbbd09bf89951221fb04f378fbdf1 6e6e372e151fe0b0f17a5ea0ed774553b6ed0bf53e1d377e5ed24a0f98529735
@@ -492,13 +491,13 @@ lib/codeql/rust/elements/internal/generated/BlockExpr.qll 5a5ddbe34bc478a7bd9b0d
 lib/codeql/rust/elements/internal/generated/BoxPat.qll 597bed52f7489e0addce3266f7bee5be7c53d2d1263eceec3a252d041ca0908f b8ccf363ca5f1a988547caf1fd266a55aec7cbf8623578deea99765d264b0151
 lib/codeql/rust/elements/internal/generated/BreakExpr.qll 0f428a8b2f4209b134c2ffc3e1c93c30bc6b0e9c9172f140cefa88c1f77d8690 957b39f38ff6befe9061f55bc0b403c2f1c366dd0cf63b874bae6f8216576d76
 lib/codeql/rust/elements/internal/generated/CallExpr.qll f1b8dae487077cc9d1dccf8c3cd61fd17afe860585f17ce8b860be4859be7ca4 6034fc03778e38802cdf3a6e460364b74e92912622581b31e6179951022bbbd6
-lib/codeql/rust/elements/internal/generated/CallExprBase.qll cce796e36847249f416629bacf3ea146313084de3374587412e66c10d2917b83 c219aa2174321c161a4a742ca0605521687ca9a5ca32db453a5c62db6f7784cc
-lib/codeql/rust/elements/internal/generated/Callable.qll b0502b5263b7bcd18e740f284f992c0e600e37d68556e3e0ba54a2ac42b94934 bda3e1eea11cacf5a9b932cd72efc2de6105103e8c575880fcd0cd89daadf068
+lib/codeql/rust/elements/internal/generated/CallExprBase.qll 2268e01d65015014c05166161bb28e5a1e78164d525ca16fc1e3106866cf231d b2f9b912153ba4d3e3612df4f74ac0e83077c31d5b31383bd277974081417a56
+lib/codeql/rust/elements/internal/generated/Callable.qll 9a8661aa018fd90a21529760c1dbc46c1ad3649e17b030e59ced0683fbf83f8a 8b573adfc23ec0ac91949da415e6a0c988fa02cbce9534d45ac98a5512d7b1ca
 lib/codeql/rust/elements/internal/generated/CastExpr.qll ddc20054b0b339ad4d40298f3461490d25d00af87c876da5ffbc6a11c0832295 f4247307afcd74d80e926f29f8c57e78c50800984483e6b6003a44681e4a71f3
 lib/codeql/rust/elements/internal/generated/ClosureBinder.qll ab199df96f525a083a0762fd654cd098802033c79700a593bb204a9a0c69ec01 86b33543e0886715830cfcdaca43b555a242a4f12a4caa18b88732d5afb584bd
 lib/codeql/rust/elements/internal/generated/ClosureExpr.qll 34149bf82f107591e65738221e1407ec1dc9cc0dfb10ae7f761116fda45162de fd2fbc9a87fc0773c940db64013cf784d5e4137515cc1020e2076da329f5a952
 lib/codeql/rust/elements/internal/generated/Comment.qll cd1ef861e3803618f9f78a4ac00516d50ecfecdca1c1d14304dc5327cbe07a3b 8b67345aeb15beb5895212228761ea3496297846c93fd2127b417406ae87c201
-lib/codeql/rust/elements/internal/generated/Const.qll ab494351d5807321114620194c54ebf6b5bacf322b710edf7558b3ee092967ae 057d6a13b6a479bd69a2f291a6718a97747a20f517b16060223a412bbadc6083
+lib/codeql/rust/elements/internal/generated/Const.qll 6300d7150d03f6bc2f0b29bb7d4a7bc1381c377644b0c61860733be685bac646 f5299a799a33fa28ca5b6d198f43a80696556144236df39124784211a1ad8285
 lib/codeql/rust/elements/internal/generated/ConstArg.qll c52bf746f2dc89b8d71b8419736707bfcbb09cca424c3ba76e888e2add415bf6 89309a9df4fde23cfd3d8492908ccec4d90cc8457d35c507ef81371a369941b4
 lib/codeql/rust/elements/internal/generated/ConstBlockPat.qll 7526d83ee9565d74776f42db58b1a2efff6fb324cfc7137f51f2206fee815d79 0ab3c22908ff790e7092e576a5df3837db33c32a7922a513a0f5e495729c1ac5
 lib/codeql/rust/elements/internal/generated/ConstParam.qll 2e24198f636e4932c79f28c324f395ae5f61f713795ed4543e920913898e2815 5abe6d3df395c679c28a7720479bad455c53bc5ade9133f1ff113ea54dc66c11
@@ -524,7 +523,7 @@ lib/codeql/rust/elements/internal/generated/FormatArgsArg.qll c762a4af8609472e28
 lib/codeql/rust/elements/internal/generated/FormatArgsExpr.qll 8aed8715a27d3af3de56ded4610c6792a25216b1544eb7e57c8b0b37c14bd9c1 590a2b0063d2ecd00bbbd1ce29603c8fd69972e34e6daddf309c915ce4ec1375
 lib/codeql/rust/elements/internal/generated/FormatArgument.qll cd05153276e63e689c95d5537fbc7d892615f62e110323759ef02e23a7587407 be2a4531b498f01625effa4c631d51ee8857698b00cfb829074120a0f2696d57
 lib/codeql/rust/elements/internal/generated/FormatTemplateVariableAccess.qll a6175214fad445df9234b3ee9bf5147da75baf82473fb8d384b455e3add0dac1 a928db0ff126b2e54a18f5c488232abd1bd6c5eda24591d3c3bb80c6ee71c770
-lib/codeql/rust/elements/internal/generated/Function.qll 6c04fffdc9de54cd01ff76f93aef5fcd3f2f779a2735523c9b1a859d394cefc9 af3c0f05c05ecd74560ab7b128a4a8e9822aa3cb80eddf304d51ea44725ac706
+lib/codeql/rust/elements/internal/generated/Function.qll befc4220bef166531e52625b08642f129115ae918a70021d69874dc794e41be7 e6433f67000eb5f3e02b209d7ee8018fea30abed9e7c491fa1fbbd9d998e98ae
 lib/codeql/rust/elements/internal/generated/GenericArg.qll 908dadf36a631bc9f4423ab473d1344ed882c7f3f85ac169d82e0099ff6337d4 c6ef5358db3a0318987962a51cbe6b77ae9c0e39c1312a059306e40e86db7eb8
 lib/codeql/rust/elements/internal/generated/GenericArgList.qll b8cd936bba6f28344e28c98acf38acb8ef43af6ecf8367d79ed487e5b9da17cb 8b14331261e49d004807285b02fca190aafd62bfb9378b05c7d9c1e95525fe7b
 lib/codeql/rust/elements/internal/generated/GenericParam.qll 85ac027a42b3300febc9f7ede1098d3ffae7bac571cba6391bc00f9061780324 806cb9d1b0e93442bef180e362c4abc055ab31867ff34bac734b89d32bd82aa1
@@ -578,7 +577,7 @@ lib/codeql/rust/elements/internal/generated/ParamList.qll eaa0cd4402d3665013d47e
 lib/codeql/rust/elements/internal/generated/ParenExpr.qll 812d2ff65079277f39f15c084657a955a960a7c1c0e96dd60472a58d56b945eb eb8c607f43e1fcbb41f37a10de203a1db806690e10ff4f04d48ed874189cb0eb
 lib/codeql/rust/elements/internal/generated/ParenPat.qll 24f9dc7fce75827d6fddb856cd48f80168143151b27295c0bab6db5a06567a09 ebadbc6f5498e9ed754b39893ce0763840409a0721036a25b56e1ead7dcc09aa
 lib/codeql/rust/elements/internal/generated/ParenTypeRepr.qll 03f5c5b96a37adeb845352d7fcea3e098da9050e534972d14ac0f70d60a2d776 ed3d6e5d02086523087adebce4e89e35461eb95f2a66d1d4100fe23fc691b126
-lib/codeql/rust/elements/internal/generated/ParentChild.qll e2c6aaaa1735113f160c0e178d682bff8e9ebc627632f73c0dd2d1f4f9d692a8 61cf70eb649f241e2fcd5e0ba34df63f3a14f07032811b9ae151721783a0fd20
+lib/codeql/rust/elements/internal/generated/ParentChild.qll 5278b74de04d54708f078fd813d83ae5f934fa12d420b188c1334e3a7c3b8324 61cf70eb649f241e2fcd5e0ba34df63f3a14f07032811b9ae151721783a0fd20
 lib/codeql/rust/elements/internal/generated/ParenthesizedArgList.qll d901fdc8142a5b8847cc98fc2afcfd16428b8ace4fbffb457e761b5fd3901a77 5dbb0aea5a13f937da666ccb042494af8f11e776ade1459d16b70a4dd193f9fb
 lib/codeql/rust/elements/internal/generated/Pat.qll 3605ac062be2f294ee73336e9669027b8b655f4ad55660e1eab35266275154ee 7f9400db2884d336dd1d21df2a8093759c2a110be9bf6482ce8e80ae0fd74ed4
 lib/codeql/rust/elements/internal/generated/Path.qll 9b12afb46fc5a9ad3a811b05472621bbecccb900c47504feb7f29d96b28421ca bcacbffc36fb3e0c9b26523b5963af0ffa9fd6b19f00a2a31bdb2316071546bd
@@ -593,7 +592,7 @@ lib/codeql/rust/elements/internal/generated/PtrTypeRepr.qll 8d0ea4f6c7f8203340bf
 lib/codeql/rust/elements/internal/generated/PureSynthConstructors.qll e5b8e69519012bbaae29dcb82d53f7f7ecce368c0358ec27ef6180b228a0057f e5b8e69519012bbaae29dcb82d53f7f7ecce368c0358ec27ef6180b228a0057f
 lib/codeql/rust/elements/internal/generated/RangeExpr.qll 23cca03bf43535f33b22a38894f70d669787be4e4f5b8fe5c8f7b964d30e9027 18624cef6c6b679eeace2a98737e472432e0ead354cca02192b4d45330f047c9
 lib/codeql/rust/elements/internal/generated/RangePat.qll 80826a6a6868a803aa2372e31c52a03e1811a3f1f2abdb469f91ca0bfdd9ecb6 34ee1e208c1690cba505dff2c588837c0cd91e185e2a87d1fe673191962276a9
-lib/codeql/rust/elements/internal/generated/Raw.qll 55ec0031a67964805e9dfb8d3190385e101178d1bcce1c4efd53d8f58d1cf0be d34faae700e7c2cb9e6eb2183244ff900a270c761676491d3ffe6a939903edd7
+lib/codeql/rust/elements/internal/generated/Raw.qll b6e439cc24f8c02fe73301cd2bc16d59dfd28e2a8a201388d8318c43937309e2 62139c3df2f6c4dca1c897b1384233ff0151b7e5fb1c41a178c5e8e41b5e7f05
 lib/codeql/rust/elements/internal/generated/RefExpr.qll 7d995884e3dc1c25fc719f5d7253179344d63650e217e9ff6530285fe7a57f64 f2c3c12551deea4964b66553fb9b6423ee16fec53bd63db4796191aa60dc6c66
 lib/codeql/rust/elements/internal/generated/RefPat.qll 456ede39837463ee22a630ec7ab6c8630d3664a8ea206fcc6e4f199e92fa564c 5622062765f32930465ba6b170e986706f159f6070f48adee3c20e24e8df4e05
 lib/codeql/rust/elements/internal/generated/RefTypeRepr.qll 5b0663a6d234572fb3e467e276d019415caa95ef006438cc59b7af4e1783161e 0e27c8a8f0e323c0e4d6db01fca821bf07c0864d293cdf96fa891b10820c1e4b
@@ -730,7 +729,8 @@ test/extractor-tests/generated/BreakExpr/BreakExpr.ql cdde2855d98f658187c60b9edc
 test/extractor-tests/generated/BreakExpr/BreakExpr_getAttr.ql c7690a9aab1923bf3c2fb06f0a1d441d480b3c91ee1df3a868bbbd96c4042053 c592dd077fb6e22b2d6ddcaec37da2c5a26ba92d84f5d1ae4c78a615b9013765
 test/extractor-tests/generated/BreakExpr/BreakExpr_getExpr.ql 0358f4fe6a66da56177703cf0e991042729c5e34ae8b6dccbb827f95fe936c72 1cb2dd778c50e19fe04c5fdf3a08a502635ea8303e71ff38d03aa7dc53213986
 test/extractor-tests/generated/BreakExpr/BreakExpr_getLifetime.ql ad83cc0db3c0f959fef6bb7ce0938d241a877e8cf84d15fb63879be2fe47238c 240b2fe2156b763d3a82fc64159615872db65b65ffb9ba2f3fd5d1ebd6c60f34
-test/extractor-tests/generated/CallExpr/CallExpr.ql ffb0cf1cb359a6dcbdf792a570c281e2d300779dca2dbc0f324990652adb972f 978a9e6c82758f9e8b334a682a02d6b893a6bf1db3cd85e9535839a9696b09b4
+test/extractor-tests/generated/CallExpr/CallExpr.ql cd38ec018b1afe9ae32ef94feca62295ad37c770c38b48a47bfb09697e7ee531 f6b0f2128cd5e63715f630c581d07b83678c298f7a7c56e38815e0d2c49ee36e
+test/extractor-tests/generated/CallExpr/CallExpr_getArg.ql 7d8d53ee4a0642f85d6bbfee6912fead699b5d117534d2b1803a670550894484 1782b33724b72afc9b7d99e3a52cacd4431ce1e12a7e43a7ac9872aad769b4ee
 test/extractor-tests/generated/CallExpr/CallExpr_getArgList.ql b022e7b6b6db9932e787e37b7760c6a09c91140a0368940374a2c919688e0488 c20849c96b53c96f6f717efff5e8b4c0e900c0ef5d715cfbaf7101c7056ad8f4
 test/extractor-tests/generated/CallExpr/CallExpr_getAttr.ql 1ace458070875b9ff2c671c2ee18392ea7bf6e51b68ee98d412c8606e8eb8d33 4c35da8255d2975cef4adee15623662441bb8f2e1d73582e4c193d1bc11cc1b5
 test/extractor-tests/generated/CallExpr/CallExpr_getFunction.ql 060a6c8b5b85c839b14fe96f9e50291a7a0e5662a945f4f337070f782ec76715 e9a1e44433936146d87be939aa160848b9a7d7333c36da601fb7d1a66d71eb59
@@ -740,14 +740,15 @@ test/extractor-tests/generated/CastExpr/CastExpr_getExpr.ql c37186b8f3e3dab8ae28
 test/extractor-tests/generated/CastExpr/CastExpr_getTypeRepr.ql ab6b0a61adc404c89c0e2e1962236a8e703fdc5092512bb4a5d9995af8e13c7b 4e7f6b6f58a1ef34ed45e31e35154dd8dc59054ebedcaa87200c84cc727ef1dd
 test/extractor-tests/generated/ClosureBinder/ClosureBinder.ql 42516df87ac28c814d65f6739b2ede6eaa41c505d64756a3b8c7e0ca79895230 8b840f92ec033a4ef5edbe52bed909d8be0fffddf6d3e4bfaf9a8bc174fa2f2c
 test/extractor-tests/generated/ClosureBinder/ClosureBinder_getGenericParamList.ql 71010c43a78a7abe8e63c94353f4b7eb97aca011755d200e7087467c1e3b7a68 2c834328f783ec5032544a692f7e23975bac0228b52b9f8fde46ef46a5f22a5f
-test/extractor-tests/generated/ClosureExpr/ClosureExpr.ql f25f9b32e5c0cd61e4b75053a5af4640a08b115ea5a4310ab95df450f6dfe1c4 9b731218857fa16776e29bce084c2ec1526b24e15f46d4f24047917d77d4646a
+test/extractor-tests/generated/ClosureExpr/ClosureExpr.ql 4d5f40935d07b0b24d77b93f56e9cea47666c5a3de84744641f9a4cb5d8d1319 b9a235c0a2d6a254d15f1fd1d0c8fdb6a7af51487b3826f26d8ca7a3b6cbc9b2
 test/extractor-tests/generated/ClosureExpr/ClosureExpr_getAttr.ql f7f803afa4e2a5976c911fdf8a91ec607c2f998e22531b9c69a63d85579e34c3 1296acd0fb97e1484aa3f1d5ba09d18088001186f3ba5821eb3218a931ca0d54
 test/extractor-tests/generated/ClosureExpr/ClosureExpr_getBody.ql 22a973a61274e87620e38338b29beef395818b95a88e2261fff197f7a78a8f76 bd28ed426e4d07823044db869aa8022dc81e8599d156e3e0e7cd49be914a1f36
 test/extractor-tests/generated/ClosureExpr/ClosureExpr_getClosureBinder.ql cbfcf89b8efb5cb9b7bfbea26b5a78b3d4c7994cbf03d5ca60b61ee1b5cb4be5 621431277732ef79c585cb0b7199c49b14c597ee6b594a70d9e6966a09d40a9f
+test/extractor-tests/generated/ClosureExpr/ClosureExpr_getParam.ql c87b61e80dd62e031e8b310d8a4b781a468ecf2e5e81662be400f18bf33c5862 22abbc976a0e6f33c32c0e93cd0dd567cead13d82d561b9214275ea01b4a0573
 test/extractor-tests/generated/ClosureExpr/ClosureExpr_getParamList.ql 68ce501516094512dd5bfed42a785474583a91312f704087cba801b02ba7b834 eacbf89d63159e7decfd84c2a1dc5c067dfce56a8157fbb52bc133e9702d266d
 test/extractor-tests/generated/ClosureExpr/ClosureExpr_getRetType.ql c95bc7306b2d77aa05a6501b6321e6f1e7a48b7ad422ba082635ab20014288ae fe72d44c9819b42fff49b9092a9fb2bfafde6d3b9e4967547fb5298822f30bc3
 test/extractor-tests/generated/Comment/Comment.ql 5428b8417a737f88f0d55d87de45c4693d81f03686f03da11dc5369e163d977b 8948c1860cde198d49cff7c74741f554a9e89f8af97bb94de80f3c62e1e29244
-test/extractor-tests/generated/Const/Const.ql 6794d0056060a82258d1e832ad265e2eb276206f0224a3f0eb9221e225370066 0a6134fb5a849ce9bd1a28de783460301cafca5773bd7caa4fb1f774f81b476a
+test/extractor-tests/generated/Const/Const.ql 7f9c9ce5b04391ff8f0d419a62972292b1d9811a978cceb129ef5a0f68a02fab c6c1dfa688248310cadd2d6d71d1a70a2b48f5b29ea2078f4dd51db59a0021c0
 test/extractor-tests/generated/Const/Const_getAttr.ql bd6296dab00065db39663db8d09fe62146838875206ff9d8595d06d6439f5043 34cb55ca6d1f44e27d82a8b624f16f9408bae2485c85da94cc76327eed168577
 test/extractor-tests/generated/Const/Const_getAttributeMacroExpansion.ql 82e86399d5cd72621dc8d9cd9f310d3dc7f2ecf208149dab0d202047ccbbd2f8 33df8c5b5044f49ec244e183c61c3b81fabd987f590ba6da4e18e08231343dc8
 test/extractor-tests/generated/Const/Const_getBody.ql f50f79b7f42bb1043b79ec96f999fa4740c8014e6969a25812d5d023d7a5a5d8 90e5060ba9757f1021429ed4ec4913bc78747f3fc415456ef7e7fc284b8a0026
@@ -833,7 +834,7 @@ test/extractor-tests/generated/FormatArgsExpr/FormatTemplateVariableAccess.ql 27
 test/extractor-tests/generated/FormatArgsExpr/Format_getArgumentRef.ql 634efdffaae4199aa9d95652cf081a8dc26e88224e24678845f8a67dc24ce090 d0302fee5c50403214771d5c6b896ba7c6e52be10c9bea59720ef2bb954e6f40
 test/extractor-tests/generated/FormatArgsExpr/Format_getPrecisionArgument.ql 0d2140f84d0220b0c72c48c6bd272f4cfe1863d1797eddd16a6e238552a61e4d f4fe9b29697041e30764fa3dea44f125546bfb648f32c3474a1e922a4255c534
 test/extractor-tests/generated/FormatArgsExpr/Format_getWidthArgument.ql 01ef27dd0bfab273e1ddc57ada0e079ece8a2bfd195ce413261006964b444093 acd0161f86010759417015c5b58044467a7f760f288ec4e8525458c54ae9a715
-test/extractor-tests/generated/Function/Function.ql 2efae1916e8f501668b3dbb2237cda788243fdd643683eda41b108dfdc578a90 6ec948518963985ec41b66e2b3b2b953e1da872dcd052a6d8c8f61c25bf09600
+test/extractor-tests/generated/Function/Function.ql 66e6a81a80cdf30652f00fae1b060e93b9d7c61b08cb3d3c1cac16cad445e769 97ace9f51b9ae933c79484b06b92355164ff3582cadfc6e3bac5c00072cdeff3
 test/extractor-tests/generated/Function/Function_getAbi.ql e5c9c97de036ddd51cae5d99d41847c35c6b2eabbbd145f4467cb501edc606d8 0b81511528bd0ef9e63b19edfc3cb638d8af43eb87d018fad69d6ef8f8221454
 test/extractor-tests/generated/Function/Function_getAttr.ql 44067ee11bdec8e91774ff10de0704a8c5c1b60816d587378e86bf3d82e1f660 b4bebf9441bda1f2d1e34e9261e07a7468cbabf53cf8047384f3c8b11869f04e
 test/extractor-tests/generated/Function/Function_getAttributeMacroExpansion.ql 17a346a9e5d28af99522520d1af3852db4cae01fb3d290a65c5f84d8d039c345 36fb06b55370828d9bc379cf5fad7f383cdb6f6db6f7377660276943ab0e1ec8
@@ -842,6 +843,7 @@ test/extractor-tests/generated/Function/Function_getCrateOrigin.ql acec761c56b38
 test/extractor-tests/generated/Function/Function_getExtendedCanonicalPath.ql 0bcdca25bb92424007cea950409d73ba681e3ffbea53e0508f1d630fccfa8bed ff28c3349f5fc007d5f144e549579bd04870973c0fabef4198edce0fba0ef421
 test/extractor-tests/generated/Function/Function_getGenericParamList.ql 0b255791c153b7cb03a64f1b9ab5beccc832984251f37516e1d06ce311e71c2b d200f90d4dd6f8dfd22ce49203423715d5bef27436c56ee553097c668e71c5a1
 test/extractor-tests/generated/Function/Function_getName.ql 3d9e0518075d161213485389efe0adf8a9e6352dd1c6233ef0403a9abbcc7ed1 841e644ecefff7e9a82f458bcf14d9976d6a6dbe9191755ead88374d7c086375
+test/extractor-tests/generated/Function/Function_getParam.ql ef0b46453512fef08fbcc2a15bc14ae319bbc4810a4e4ce03a5ca3b1e8859ca7 ce36d3974059c1cd63eb1d6b76111985087f40dd4fe0c716a00aa9a178c712c4
 test/extractor-tests/generated/Function/Function_getParamList.ql f888802ab00defb58de59cc39d1e0518e3884db7eaf845f39dfa55befdda58b2 ba0d1a07676f1c987b820a3d126a563ecf9a3d53ac1115b87a5af487a8a03c3e
 test/extractor-tests/generated/Function/Function_getRetType.ql b3a1ab90c8ebf0543e5db6a415896e44a02f984321f49bc409aec2657298942b cdfa37772e5026febb19c9bcd0d325688b0fbf2f6e7bba424b73eca38b9b3e38
 test/extractor-tests/generated/Function/Function_getVisibility.ql 490b0a369c809a757d4835b97becf617b0399f16a63a2b06258c9a227d5cc415 25ceff15d3cd03821e1cb2c04cb8894bcd101eeca62b66b54d1751b628107818
@@ -965,7 +967,8 @@ test/extractor-tests/generated/Meta/Meta.ql 16f163f00ba2bbaa0a8c6f3f6710c860a8f6
 test/extractor-tests/generated/Meta/Meta_getExpr.ql ec9ec61f5be7d65c32775fb5c068daea04f9db7d875293ed99cc1b2481db041f 77a0c52f1cb6ddc8fdb294d637f9eda1b7301ffa3067f0fca6272d894f57d3ee
 test/extractor-tests/generated/Meta/Meta_getPath.ql aa9d4145a4e613c51b6e4637d57e3b7d0f66e0bb88f4ce959d598870814c06bb 2087e00686d502c0e2e89c88eae0fb354463576a9ae4101320981d3fd79b9078
 test/extractor-tests/generated/Meta/Meta_getTokenTree.ql 1051c27ffd0d9a20436d684fde529b9ff55abe30d50e1d575b0318951e75bd34 983975672d928fb907676628384c949731da9807bf0c781bb7ec749d25733d2d
-test/extractor-tests/generated/MethodCallExpr/MethodCallExpr.ql d141f5a2ef95019aa64e8cb384ab4a45e7a93c941b84ef2e14c13377f159e4db 47a68fc874af6cc9a4b278a5aab1633a9db17300fd7dbd6dbe193d48d99144bc
+test/extractor-tests/generated/MethodCallExpr/MethodCallExpr.ql 85d3b8c794167f87840469e03d21aa00daf0998c28028f1c8848c7c4bd895db4 fa368ce4543c2544ecd2e636ade8d92849741226599290f59e0138a4a479357c
+test/extractor-tests/generated/MethodCallExpr/MethodCallExpr_getArg.ql 10a88c3bf63dfb26f43b9cd1ed7fceef0f436ce2eff4b5a816da369bf5b775d2 ee3b5043719591b4048ec32e21bb5fb3a9f83f0420ef18c338fc0ac28d0e3240
 test/extractor-tests/generated/MethodCallExpr/MethodCallExpr_getArgList.ql 180e0b1715f5cd2be0de01bff3d3a45594b495b8250748d40ff7108d6c85923d bdadcdbecca5891287a47b6dd6b2fda62e07457718aef39212503ab63bc17783
 test/extractor-tests/generated/MethodCallExpr/MethodCallExpr_getAttr.ql 2ce876a04a159efce83b863dffc47fbb714b95daea2b91fa6fbb623d28eed9ec 7bca1cd0e8fbceec0e640afb6800e1780eff5b5b402e71b9b169c0ba26966f96
 test/extractor-tests/generated/MethodCallExpr/MethodCallExpr_getGenericArgList.ql 655db9a0501b1ef20d604cc4cd9d708371781291443e8dec97b70ec2914601d2 2fc7df0eca22dcef2f9f5c86d37ee43452d372a4c0f9f4da0194828c82ba93e0
diff --git a/rust/ql/.gitattributes b/rust/ql/.gitattributes
index 3326912c0ca..65c3aae0e9e 100644
--- a/rust/ql/.gitattributes
+++ b/rust/ql/.gitattributes
@@ -242,7 +242,6 @@
 /lib/codeql/rust/elements/internal/BoxPatConstructor.qll linguist-generated
 /lib/codeql/rust/elements/internal/BreakExprConstructor.qll linguist-generated
 /lib/codeql/rust/elements/internal/CallExprConstructor.qll linguist-generated
-/lib/codeql/rust/elements/internal/CallableImpl.qll linguist-generated
 /lib/codeql/rust/elements/internal/CastExprConstructor.qll linguist-generated
 /lib/codeql/rust/elements/internal/ClosureBinderConstructor.qll linguist-generated
 /lib/codeql/rust/elements/internal/ClosureBinderImpl.qll linguist-generated
@@ -733,6 +732,7 @@
 /test/extractor-tests/generated/BreakExpr/BreakExpr_getExpr.ql linguist-generated
 /test/extractor-tests/generated/BreakExpr/BreakExpr_getLifetime.ql linguist-generated
 /test/extractor-tests/generated/CallExpr/CallExpr.ql linguist-generated
+/test/extractor-tests/generated/CallExpr/CallExpr_getArg.ql linguist-generated
 /test/extractor-tests/generated/CallExpr/CallExpr_getArgList.ql linguist-generated
 /test/extractor-tests/generated/CallExpr/CallExpr_getAttr.ql linguist-generated
 /test/extractor-tests/generated/CallExpr/CallExpr_getFunction.ql linguist-generated
@@ -746,6 +746,7 @@
 /test/extractor-tests/generated/ClosureExpr/ClosureExpr_getAttr.ql linguist-generated
 /test/extractor-tests/generated/ClosureExpr/ClosureExpr_getBody.ql linguist-generated
 /test/extractor-tests/generated/ClosureExpr/ClosureExpr_getClosureBinder.ql linguist-generated
+/test/extractor-tests/generated/ClosureExpr/ClosureExpr_getParam.ql linguist-generated
 /test/extractor-tests/generated/ClosureExpr/ClosureExpr_getParamList.ql linguist-generated
 /test/extractor-tests/generated/ClosureExpr/ClosureExpr_getRetType.ql linguist-generated
 /test/extractor-tests/generated/Comment/Comment.ql linguist-generated
@@ -844,6 +845,7 @@
 /test/extractor-tests/generated/Function/Function_getExtendedCanonicalPath.ql linguist-generated
 /test/extractor-tests/generated/Function/Function_getGenericParamList.ql linguist-generated
 /test/extractor-tests/generated/Function/Function_getName.ql linguist-generated
+/test/extractor-tests/generated/Function/Function_getParam.ql linguist-generated
 /test/extractor-tests/generated/Function/Function_getParamList.ql linguist-generated
 /test/extractor-tests/generated/Function/Function_getRetType.ql linguist-generated
 /test/extractor-tests/generated/Function/Function_getVisibility.ql linguist-generated
@@ -968,6 +970,7 @@
 /test/extractor-tests/generated/Meta/Meta_getPath.ql linguist-generated
 /test/extractor-tests/generated/Meta/Meta_getTokenTree.ql linguist-generated
 /test/extractor-tests/generated/MethodCallExpr/MethodCallExpr.ql linguist-generated
+/test/extractor-tests/generated/MethodCallExpr/MethodCallExpr_getArg.ql linguist-generated
 /test/extractor-tests/generated/MethodCallExpr/MethodCallExpr_getArgList.ql linguist-generated
 /test/extractor-tests/generated/MethodCallExpr/MethodCallExpr_getAttr.ql linguist-generated
 /test/extractor-tests/generated/MethodCallExpr/MethodCallExpr_getGenericArgList.ql linguist-generated
diff --git a/rust/ql/lib/codeql/rust/controlflow/CfgNodes.qll b/rust/ql/lib/codeql/rust/controlflow/CfgNodes.qll
index a118cf6b472..0c4ce51f619 100644
--- a/rust/ql/lib/codeql/rust/controlflow/CfgNodes.qll
+++ b/rust/ql/lib/codeql/rust/controlflow/CfgNodes.qll
@@ -4,6 +4,7 @@
  */
 
 private import rust
+private import codeql.rust.elements.Call
 private import ControlFlowGraph
 private import internal.ControlFlowGraphImpl as CfgImpl
 private import internal.CfgNodes
@@ -162,6 +163,30 @@ final class CallExprBaseCfgNode extends Nodes::CallExprBaseCfgNode {
  */
 final class MethodCallExprCfgNode extends CallExprBaseCfgNode, Nodes::MethodCallExprCfgNode { }
 
+/**
+ * A CFG node that calls a function.
+ *
+ * This class abstract over the different ways in which a function can be called in Rust.
+ */
+final class CallCfgNode extends ExprCfgNode {
+  private Call node;
+
+  CallCfgNode() { node = this.getAstNode() }
+
+  /** Gets the underlying `Call`. */
+  Call getCall() { result = node }
+
+  /** Gets the receiver of this call if it is a method call. */
+  ExprCfgNode getReceiver() {
+    any(ChildMapping mapping).hasCfgChild(node, node.getReceiver(), this, result)
+  }
+
+  /** Gets the `i`th argument of this call, if any. */
+  ExprCfgNode getArgument(int i) {
+    any(ChildMapping mapping).hasCfgChild(node, node.getArgument(i), this, result)
+  }
+}
+
 /**
  * A function call expression. For example:
  * ```rust
diff --git a/rust/ql/lib/codeql/rust/controlflow/internal/CfgNodes.qll b/rust/ql/lib/codeql/rust/controlflow/internal/CfgNodes.qll
index e3202888511..dc08c0d32a7 100644
--- a/rust/ql/lib/codeql/rust/controlflow/internal/CfgNodes.qll
+++ b/rust/ql/lib/codeql/rust/controlflow/internal/CfgNodes.qll
@@ -59,7 +59,7 @@ class BreakExprTargetChildMapping extends ParentAstNode, Expr {
 }
 
 class CallExprBaseChildMapping extends ParentAstNode, CallExprBase {
-  override predicate relevantChild(AstNode child) { child = this.getArgList().getAnArg() }
+  override predicate relevantChild(AstNode child) { child = this.getAnArg() }
 }
 
 class StructExprChildMapping extends ParentAstNode, StructExpr {
diff --git a/rust/ql/lib/codeql/rust/controlflow/internal/ControlFlowGraphImpl.qll b/rust/ql/lib/codeql/rust/controlflow/internal/ControlFlowGraphImpl.qll
index 522eaf59fe6..58cb9f6a95f 100644
--- a/rust/ql/lib/codeql/rust/controlflow/internal/ControlFlowGraphImpl.qll
+++ b/rust/ql/lib/codeql/rust/controlflow/internal/ControlFlowGraphImpl.qll
@@ -87,7 +87,7 @@ class CallableScopeTree extends StandardTree, PreOrderTree, PostOrderTree, Scope
     i = 0 and
     result = this.getParamList().getSelfParam()
     or
-    result = this.getParamList().getParam(i - 1)
+    result = this.getParam(i - 1)
     or
     i = this.getParamList().getNumberOfParams() + 1 and
     result = this.getBody()
@@ -543,7 +543,7 @@ module ExprTrees {
 
   class MethodCallExprTree extends StandardPostOrderTree, MethodCallExpr {
     override AstNode getChildNode(int i) {
-      if i = 0 then result = this.getReceiver() else result = this.getArgList().getArg(i - 1)
+      if i = 0 then result = this.getReceiver() else result = this.getArg(i - 1)
     }
   }
 
diff --git a/rust/ql/lib/codeql/rust/controlflow/internal/generated/CfgNodes.qll b/rust/ql/lib/codeql/rust/controlflow/internal/generated/CfgNodes.qll
index cfa37ed4539..36dd0fb304f 100644
--- a/rust/ql/lib/codeql/rust/controlflow/internal/generated/CfgNodes.qll
+++ b/rust/ql/lib/codeql/rust/controlflow/internal/generated/CfgNodes.qll
@@ -722,6 +722,21 @@ module MakeCfgNodes<LocationSig Loc, InputSig<Loc> Input> {
        * Gets the number of attrs of this call expression base.
        */
       int getNumberOfAttrs() { result = count(int i | exists(this.getAttr(i))) }
+
+      /**
+       * Gets the `index`th argument of this call expression base (0-based).
+       */
+      Expr getArg(int index) { result = node.getArg(index) }
+
+      /**
+       * Gets any of the arguments of this call expression base.
+       */
+      Expr getAnArg() { result = this.getArg(_) }
+
+      /**
+       * Gets the number of arguments of this call expression base.
+       */
+      int getNumberOfArgs() { result = count(int i | exists(this.getArg(i))) }
     }
 
     final private class ParentCastExpr extends ParentAstNode, CastExpr {
diff --git a/rust/ql/lib/codeql/rust/dataflow/internal/DataFlowConsistency.qll b/rust/ql/lib/codeql/rust/dataflow/internal/DataFlowConsistency.qll
index f0dc961a9f9..909d275dc11 100644
--- a/rust/ql/lib/codeql/rust/dataflow/internal/DataFlowConsistency.qll
+++ b/rust/ql/lib/codeql/rust/dataflow/internal/DataFlowConsistency.qll
@@ -1,5 +1,8 @@
 import codeql.rust.dataflow.DataFlow::DataFlow as DataFlow
 private import rust
+private import codeql.rust.controlflow.ControlFlowGraph
+private import codeql.rust.controlflow.internal.Splitting
+private import codeql.rust.controlflow.CfgNodes as CfgNodes
 private import codeql.rust.dataflow.internal.DataFlowImpl
 private import codeql.rust.dataflow.internal.FlowSummaryImpl as FlowSummaryImpl
 private import codeql.rust.dataflow.internal.Node as Node
@@ -26,6 +29,17 @@ private module Input implements InputSig<Location, RustDataFlow> {
   }
 
   predicate missingLocationExclude(RustDataFlow::Node n) { not exists(n.asExpr().getLocation()) }
+
+  predicate multipleArgumentCallExclude(Node::ArgumentNode arg, DataFlowCall call) {
+    // An argument such as `x` in `if !x { ... }` has two successors (and hence
+    // two calls); one for each Boolean outcome of `x`.
+    exists(CfgNodes::ExprCfgNode n |
+      arg.isArgumentOf(call, _) and
+      n = call.asCallCfgNode() and
+      arg.asExpr().getASuccessor(any(ConditionalSuccessor c)).getASuccessor*() = n and
+      n.getASplit() instanceof ConditionalCompletionSplitting::ConditionalCompletionSplit
+    )
+  }
 }
 
 import MakeConsistency<Location, RustDataFlow, RustTaintTracking, Input>
diff --git a/rust/ql/lib/codeql/rust/dataflow/internal/DataFlowImpl.qll b/rust/ql/lib/codeql/rust/dataflow/internal/DataFlowImpl.qll
index d0f7378bd3a..2cf9cc21668 100644
--- a/rust/ql/lib/codeql/rust/dataflow/internal/DataFlowImpl.qll
+++ b/rust/ql/lib/codeql/rust/dataflow/internal/DataFlowImpl.qll
@@ -8,6 +8,7 @@ private import codeql.util.Boolean
 private import codeql.dataflow.DataFlow
 private import codeql.dataflow.internal.DataFlowImpl
 private import rust
+private import codeql.rust.elements.Call
 private import SsaImpl as SsaImpl
 private import codeql.rust.controlflow.internal.Scope as Scope
 private import codeql.rust.internal.PathResolution
@@ -55,11 +56,7 @@ final class DataFlowCallable extends TDataFlowCallable {
 
 final class DataFlowCall extends TDataFlowCall {
   /** Gets the underlying call in the CFG, if any. */
-  CallExprCfgNode asCallExprCfgNode() { result = this.asCallBaseExprCfgNode() }
-
-  MethodCallExprCfgNode asMethodCallExprCfgNode() { result = this.asCallBaseExprCfgNode() }
-
-  CallExprBaseCfgNode asCallBaseExprCfgNode() { this = TCall(result) }
+  CallCfgNode asCallCfgNode() { this = TCall(result) }
 
   predicate isSummaryCall(
     FlowSummaryImpl::Public::SummarizedCallable c, FlowSummaryImpl::Private::SummaryNode receiver
@@ -68,7 +65,7 @@ final class DataFlowCall extends TDataFlowCall {
   }
 
   DataFlowCallable getEnclosingCallable() {
-    result = TCfgScope(this.asCallBaseExprCfgNode().getExpr().getEnclosingCfgScope())
+    result = TCfgScope(this.asCallCfgNode().getExpr().getEnclosingCfgScope())
     or
     exists(FlowSummaryImpl::Public::SummarizedCallable c |
       this.isSummaryCall(c, _) and
@@ -77,7 +74,7 @@ final class DataFlowCall extends TDataFlowCall {
   }
 
   string toString() {
-    result = this.asCallBaseExprCfgNode().toString()
+    result = this.asCallCfgNode().toString()
     or
     exists(
       FlowSummaryImpl::Public::SummarizedCallable c, FlowSummaryImpl::Private::SummaryNode receiver
@@ -87,7 +84,7 @@ final class DataFlowCall extends TDataFlowCall {
     )
   }
 
-  Location getLocation() { result = this.asCallBaseExprCfgNode().getLocation() }
+  Location getLocation() { result = this.asCallCfgNode().getLocation() }
 }
 
 /**
@@ -135,38 +132,23 @@ final class ParameterPosition extends TParameterPosition {
  */
 final class ArgumentPosition extends ParameterPosition {
   /** Gets the argument of `call` at this position, if any. */
-  Expr getArgument(CallExprBase call) {
-    result = call.getArgList().getArg(this.getPosition())
+  Expr getArgument(Call call) {
+    result = call.getArgument(this.getPosition())
     or
-    this.isSelf() and
-    result = call.(MethodCallExpr).getReceiver()
+    result = call.getReceiver() and this.isSelf()
   }
 }
 
-/** Holds if `call` invokes a qualified path that resolves to a method. */
-private predicate callToMethod(CallExpr call) {
-  exists(Path path |
-    path = call.getFunction().(PathExpr).getPath() and
-    path.hasQualifier() and
-    resolvePath(path).(Function).getParamList().hasSelfParam()
-  )
-}
-
 /**
  * Holds if `arg` is an argument of `call` at the position `pos`.
  *
  * Note that this does not hold for the receiever expression of a method call
  * as the synthetic `ReceiverNode` is the argument for the `self` parameter.
  */
-predicate isArgumentForCall(ExprCfgNode arg, CallExprBaseCfgNode call, ParameterPosition pos) {
-  if callToMethod(call.(CallExprCfgNode).getCallExpr())
-  then
-    // The first argument is for the `self` parameter
-    arg = call.getArgument(0) and pos.isSelf()
-    or
-    // Succeeding arguments are shifted left
-    arg = call.getArgument(pos.getPosition() + 1)
-  else arg = call.getArgument(pos.getPosition())
+predicate isArgumentForCall(ExprCfgNode arg, CallCfgNode call, ParameterPosition pos) {
+  call.getArgument(pos.getPosition()) = arg
+  or
+  call.getReceiver() = arg and pos.isSelf() and not call.getCall().receiverImplicitlyBorrowed()
 }
 
 /** Provides logic related to SSA. */
@@ -419,9 +401,9 @@ module RustDataFlow implements InputSig<Location> {
 
   /** Gets a viable implementation of the target of the given `Call`. */
   DataFlowCallable viableCallable(DataFlowCall call) {
-    result.asCfgScope() = call.asCallBaseExprCfgNode().getCallExprBase().getStaticTarget()
+    result.asCfgScope() = call.asCallCfgNode().getCall().getStaticTarget()
     or
-    result.asLibraryCallable().getACall() = call.asCallBaseExprCfgNode().getCallExprBase()
+    result.asLibraryCallable().getACall() = call.asCallCfgNode().getCall()
   }
 
   /**
@@ -812,7 +794,7 @@ module RustDataFlow implements InputSig<Location> {
    */
   predicate lambdaCall(DataFlowCall call, LambdaCallKind kind, Node receiver) {
     (
-      receiver.asExpr() = call.asCallExprCfgNode().getFunction() and
+      receiver.asExpr() = call.asCallCfgNode().(CallExprCfgNode).getFunction() and
       // All calls to complex expressions and local variable accesses are lambda call.
       exists(Expr f | f = receiver.asExpr().getExpr() |
         f instanceof PathExpr implies f = any(Variable v).getAnAccess()
@@ -976,7 +958,7 @@ private module Cached {
 
   cached
   newtype TDataFlowCall =
-    TCall(CallExprBaseCfgNode c) { Stages::DataFlowStage::ref() } or
+    TCall(CallCfgNode c) { Stages::DataFlowStage::ref() } or
     TSummaryCall(
       FlowSummaryImpl::Public::SummarizedCallable c, FlowSummaryImpl::Private::SummaryNode receiver
     ) {
diff --git a/rust/ql/lib/codeql/rust/dataflow/internal/FlowSummaryImpl.qll b/rust/ql/lib/codeql/rust/dataflow/internal/FlowSummaryImpl.qll
index 62cc47dfc0d..ba91518eab6 100644
--- a/rust/ql/lib/codeql/rust/dataflow/internal/FlowSummaryImpl.qll
+++ b/rust/ql/lib/codeql/rust/dataflow/internal/FlowSummaryImpl.qll
@@ -153,7 +153,7 @@ private import Make<Location, RustDataFlow, Input> as Impl
 
 private module StepsInput implements Impl::Private::StepsInputSig {
   DataFlowCall getACall(Public::SummarizedCallable sc) {
-    result.asCallBaseExprCfgNode().getCallExprBase() = sc.(LibraryCallable).getACall()
+    result.asCallCfgNode().getCall() = sc.(LibraryCallable).getACall()
   }
 
   RustDataFlow::Node getSourceNode(Input::SourceBase source, Impl::Private::SummaryComponent sc) {
diff --git a/rust/ql/lib/codeql/rust/dataflow/internal/Node.qll b/rust/ql/lib/codeql/rust/dataflow/internal/Node.qll
index 67782f0b7e0..939cb45a0ca 100644
--- a/rust/ql/lib/codeql/rust/dataflow/internal/Node.qll
+++ b/rust/ql/lib/codeql/rust/dataflow/internal/Node.qll
@@ -224,13 +224,13 @@ abstract class ArgumentNode extends Node {
 }
 
 final class ExprArgumentNode extends ArgumentNode, ExprNode {
-  private CallExprBaseCfgNode call_;
+  private CallCfgNode call_;
   private RustDataFlow::ArgumentPosition pos_;
 
   ExprArgumentNode() { isArgumentForCall(n, call_, pos_) }
 
   override predicate isArgumentOf(DataFlowCall call, RustDataFlow::ArgumentPosition pos) {
-    call.asCallBaseExprCfgNode() = call_ and pos = pos_
+    call.asCallCfgNode() = call_ and pos = pos_
   }
 }
 
@@ -239,7 +239,7 @@ final class ExprArgumentNode extends ArgumentNode, ExprNode {
  * has taken place.
  */
 final class ReceiverNode extends ArgumentNode, TReceiverNode {
-  private MethodCallExprCfgNode n;
+  private CallCfgNode n;
 
   ReceiverNode() { this = TReceiverNode(n, false) }
 
@@ -248,7 +248,7 @@ final class ReceiverNode extends ArgumentNode, TReceiverNode {
   MethodCallExprCfgNode getMethodCall() { result = n }
 
   override predicate isArgumentOf(DataFlowCall call, RustDataFlow::ArgumentPosition pos) {
-    call.asMethodCallExprCfgNode() = n and pos = TSelfParameterPosition()
+    call.asCallCfgNode() = n and pos = TSelfParameterPosition()
   }
 
   override CfgScope getCfgScope() { result = n.getAstNode().getEnclosingCfgScope() }
@@ -281,7 +281,7 @@ final class ClosureArgumentNode extends ArgumentNode, ExprNode {
   ClosureArgumentNode() { lambdaCallExpr(call_, _, this.asExpr()) }
 
   override predicate isArgumentOf(DataFlowCall call, RustDataFlow::ArgumentPosition pos) {
-    call.asCallExprCfgNode() = call_ and
+    call.asCallCfgNode() = call_ and
     pos.isClosureSelf()
   }
 }
@@ -330,11 +330,11 @@ abstract class OutNode extends Node {
 }
 
 final private class ExprOutNode extends ExprNode, OutNode {
-  ExprOutNode() { this.asExpr() instanceof CallExprBaseCfgNode }
+  ExprOutNode() { this.asExpr() instanceof CallCfgNode }
 
   /** Gets the underlying call CFG node that includes this out node. */
   override DataFlowCall getCall(ReturnKind kind) {
-    result.asCallBaseExprCfgNode() = this.getCfgNode() and
+    result.asCallCfgNode() = this.getCfgNode() and
     kind = TNormalReturnKind()
   }
 }
@@ -404,7 +404,7 @@ final class ExprPostUpdateNode extends PostUpdateNode, TExprPostUpdateNode {
 }
 
 final class ReceiverPostUpdateNode extends PostUpdateNode, TReceiverNode {
-  private MethodCallExprCfgNode n;
+  private CallCfgNode n;
 
   ReceiverPostUpdateNode() { this = TReceiverNode(n, true) }
 
@@ -467,11 +467,12 @@ newtype TNode =
         any(FieldExprCfgNode access).getContainer(), //
         any(TryExprCfgNode try).getExpr(), //
         any(PrefixExprCfgNode pe | pe.getOperatorName() = "*").getExpr(), //
-        any(AwaitExprCfgNode a).getExpr(), any(MethodCallExprCfgNode mc).getReceiver(), //
+        any(AwaitExprCfgNode a).getExpr(), //
+        any(MethodCallExprCfgNode mc).getReceiver(), //
         getPostUpdateReverseStep(any(PostUpdateNode n).getPreUpdateNode().asExpr(), _)
       ]
   } or
-  TReceiverNode(MethodCallExprCfgNode mc, Boolean isPost) or
+  TReceiverNode(CallCfgNode mc, Boolean isPost) { mc.getCall().receiverImplicitlyBorrowed() } or
   TSsaNode(SsaImpl::DataFlowIntegration::SsaNode node) or
   TFlowSummaryNode(FlowSummaryImpl::Private::SummaryNode sn) or
   TClosureSelfReferenceNode(CfgScope c) { lambdaCreationExpr(c, _) } or
diff --git a/rust/ql/lib/codeql/rust/elements/Call.qll b/rust/ql/lib/codeql/rust/elements/Call.qll
new file mode 100644
index 00000000000..a65fb3dadb0
--- /dev/null
+++ b/rust/ql/lib/codeql/rust/elements/Call.qll
@@ -0,0 +1,7 @@
+/**
+ * This module provides the public class `Call`.
+ */
+
+private import internal.CallImpl
+
+final class Call = Impl::Call;
diff --git a/rust/ql/lib/codeql/rust/elements/Callable.qll b/rust/ql/lib/codeql/rust/elements/Callable.qll
index c42262a1854..11d029fff7d 100644
--- a/rust/ql/lib/codeql/rust/elements/Callable.qll
+++ b/rust/ql/lib/codeql/rust/elements/Callable.qll
@@ -6,6 +6,7 @@
 private import internal.CallableImpl
 import codeql.rust.elements.AstNode
 import codeql.rust.elements.Attr
+import codeql.rust.elements.Param
 import codeql.rust.elements.ParamList
 
 /**
diff --git a/rust/ql/lib/codeql/rust/elements/internal/CallExprBaseImpl.qll b/rust/ql/lib/codeql/rust/elements/internal/CallExprBaseImpl.qll
index c916b717bf6..b78720b08fa 100644
--- a/rust/ql/lib/codeql/rust/elements/internal/CallExprBaseImpl.qll
+++ b/rust/ql/lib/codeql/rust/elements/internal/CallExprBaseImpl.qll
@@ -28,5 +28,7 @@ module Impl {
   class CallExprBase extends Generated::CallExprBase {
     /** Gets the static target of this call, if any. */
     Callable getStaticTarget() { none() } // overridden by subclasses, but cannot be made abstract
+
+    override Expr getArg(int index) { result = this.getArgList().getArg(index) }
   }
 }
diff --git a/rust/ql/lib/codeql/rust/elements/internal/CallExprImpl.qll b/rust/ql/lib/codeql/rust/elements/internal/CallExprImpl.qll
index e9ec4339d1a..e5262014ab4 100644
--- a/rust/ql/lib/codeql/rust/elements/internal/CallExprImpl.qll
+++ b/rust/ql/lib/codeql/rust/elements/internal/CallExprImpl.qll
@@ -55,7 +55,7 @@ module Impl {
     pragma[nomagic]
     private PathResolution::ItemNode getResolvedFunctionAndPos(int pos) {
       result = getResolvedFunction(this) and
-      exists(this.getArgList().getArg(pos))
+      exists(this.getArg(pos))
     }
 
     /**
diff --git a/rust/ql/lib/codeql/rust/elements/internal/CallImpl.qll b/rust/ql/lib/codeql/rust/elements/internal/CallImpl.qll
new file mode 100644
index 00000000000..27dfd2a93fc
--- /dev/null
+++ b/rust/ql/lib/codeql/rust/elements/internal/CallImpl.qll
@@ -0,0 +1,126 @@
+private import rust
+private import codeql.rust.internal.PathResolution
+private import codeql.rust.internal.TypeInference as TypeInference
+private import codeql.rust.elements.internal.ExprImpl::Impl as ExprImpl
+private import codeql.rust.elements.Operation
+
+module Impl {
+  /**
+   * An expression that calls a function.
+   *
+   * This class abstracts over the different ways in which a function can be called in Rust.
+   */
+  abstract class Call extends ExprImpl::Expr {
+    /** Gets the number of arguments _excluding_ any `self` argument. */
+    abstract int getNumberOfArguments();
+
+    /** Gets the receiver of this call if it is a method call. */
+    abstract Expr getReceiver();
+
+    /** Holds if the call has a receiver that might be implicitly borrowed. */
+    abstract predicate receiverImplicitlyBorrowed();
+
+    /** Gets the trait targeted by this call, if any. */
+    abstract Trait getTrait();
+
+    /** Gets the name of the method called if this call is a method call. */
+    abstract string getMethodName();
+
+    /** Gets the `i`th argument of this call, if any. */
+    abstract Expr getArgument(int i);
+
+    /** Gets the static target of this call, if any. */
+    Function getStaticTarget() {
+      result = TypeInference::resolveMethodCallTarget(this)
+      or
+      not exists(TypeInference::resolveMethodCallTarget(this)) and
+      result = this.(CallExpr).getStaticTarget()
+    }
+  }
+
+  /** Holds if the call expression dispatches to a trait method. */
+  private predicate callIsMethodCall(CallExpr call, Path qualifier, string methodName) {
+    exists(Path path, Function f |
+      path = call.getFunction().(PathExpr).getPath() and
+      f = resolvePath(path) and
+      f.getParamList().hasSelfParam() and
+      qualifier = path.getQualifier() and
+      path.getSegment().getIdentifier().getText() = methodName
+    )
+  }
+
+  private class CallExprCall extends Call instanceof CallExpr {
+    CallExprCall() { not callIsMethodCall(this, _, _) }
+
+    override string getMethodName() { none() }
+
+    override Expr getReceiver() { none() }
+
+    override Trait getTrait() { none() }
+
+    override predicate receiverImplicitlyBorrowed() { none() }
+
+    override int getNumberOfArguments() { result = super.getArgList().getNumberOfArgs() }
+
+    override Expr getArgument(int i) { result = super.getArgList().getArg(i) }
+  }
+
+  private class CallExprMethodCall extends Call instanceof CallExpr {
+    Path qualifier;
+    string methodName;
+
+    CallExprMethodCall() { callIsMethodCall(this, qualifier, methodName) }
+
+    override string getMethodName() { result = methodName }
+
+    override Expr getReceiver() { result = super.getArgList().getArg(0) }
+
+    override Trait getTrait() {
+      result = resolvePath(qualifier) and
+      // When the qualifier is `Self` and resolves to a trait, it's inside a
+      // trait method's default implementation. This is not a dispatch whose
+      // target is inferred from the type of the receiver, but should always
+      // resolve to the function in the trait block as path resolution does.
+      qualifier.toString() != "Self"
+    }
+
+    override predicate receiverImplicitlyBorrowed() { none() }
+
+    override int getNumberOfArguments() { result = super.getArgList().getNumberOfArgs() - 1 }
+
+    override Expr getArgument(int i) { result = super.getArgList().getArg(i + 1) }
+  }
+
+  private class MethodCallExprCall extends Call instanceof MethodCallExpr {
+    override string getMethodName() { result = super.getIdentifier().getText() }
+
+    override Expr getReceiver() { result = this.(MethodCallExpr).getReceiver() }
+
+    override Trait getTrait() { none() }
+
+    override predicate receiverImplicitlyBorrowed() { any() }
+
+    override int getNumberOfArguments() { result = super.getArgList().getNumberOfArgs() }
+
+    override Expr getArgument(int i) { result = super.getArgList().getArg(i) }
+  }
+
+  private class OperatorCall extends Call instanceof Operation {
+    Trait trait;
+    string methodName;
+
+    OperatorCall() { super.isOverloaded(trait, methodName) }
+
+    override string getMethodName() { result = methodName }
+
+    override Expr getReceiver() { result = super.getOperand(0) }
+
+    override Trait getTrait() { result = trait }
+
+    override predicate receiverImplicitlyBorrowed() { none() }
+
+    override int getNumberOfArguments() { result = super.getNumberOfOperands() - 1 }
+
+    override Expr getArgument(int i) { result = super.getOperand(1) and i = 0 }
+  }
+}
diff --git a/rust/ql/lib/codeql/rust/elements/internal/CallableImpl.qll b/rust/ql/lib/codeql/rust/elements/internal/CallableImpl.qll
index d604b4d239f..37e24a9150c 100644
--- a/rust/ql/lib/codeql/rust/elements/internal/CallableImpl.qll
+++ b/rust/ql/lib/codeql/rust/elements/internal/CallableImpl.qll
@@ -1,4 +1,3 @@
-// generated by codegen, remove this comment if you wish to edit this file
 /**
  * This module provides a hand-modifiable wrapper around the generated class `Callable`.
  *
@@ -12,8 +11,11 @@ private import codeql.rust.elements.internal.generated.Callable
  * be referenced directly.
  */
 module Impl {
+  // the following QLdoc is generated: if you need to edit it, do it in the schema file
   /**
    * A callable. Either a `Function` or a `ClosureExpr`.
    */
-  class Callable extends Generated::Callable { }
+  class Callable extends Generated::Callable {
+    override Param getParam(int index) { result = this.getParamList().getParam(index) }
+  }
 }
diff --git a/rust/ql/lib/codeql/rust/elements/internal/GenericArgListImpl.qll b/rust/ql/lib/codeql/rust/elements/internal/GenericArgListImpl.qll
index eaba0f7ff6e..d459ab13dc6 100644
--- a/rust/ql/lib/codeql/rust/elements/internal/GenericArgListImpl.qll
+++ b/rust/ql/lib/codeql/rust/elements/internal/GenericArgListImpl.qll
@@ -26,6 +26,7 @@ module Impl {
     override string toAbbreviatedString() { result = "<...>" }
 
     /** Gets the `i`th type argument of this list. */
+    pragma[nomagic]
     TypeRepr getTypeArg(int i) {
       result =
         rank[i + 1](TypeRepr res, int j |
@@ -37,5 +38,15 @@ module Impl {
 
     /** Gets a type argument of this list. */
     TypeRepr getATypeArg() { result = this.getTypeArg(_) }
+
+    /** Gets the associated type argument with the given `name`, if any. */
+    pragma[nomagic]
+    TypeRepr getAssocTypeArg(string name) {
+      exists(AssocTypeArg arg |
+        arg = this.getAGenericArg() and
+        result = arg.getTypeRepr() and
+        name = arg.getIdentifier().getText()
+      )
+    }
   }
 }
diff --git a/rust/ql/lib/codeql/rust/elements/internal/OperationImpl.qll b/rust/ql/lib/codeql/rust/elements/internal/OperationImpl.qll
index c1ba794e8e4..71f861b013d 100644
--- a/rust/ql/lib/codeql/rust/elements/internal/OperationImpl.qll
+++ b/rust/ql/lib/codeql/rust/elements/internal/OperationImpl.qll
@@ -8,75 +8,81 @@ private import rust
 private import codeql.rust.elements.internal.ExprImpl::Impl as ExprImpl
 
 /**
- * Holds if the operator `op` is overloaded to a trait with the canonical path
- * `path` and the method name `method`.
+ * Holds if the operator `op` with arity `arity` is overloaded to a trait with
+ * the canonical path `path` and the method name `method`.
  */
-private predicate isOverloaded(string op, string path, string method) {
-  // Negation
-  op = "-" and path = "core::ops::arith::Neg" and method = "neg"
+private predicate isOverloaded(string op, int arity, string path, string method) {
+  arity = 1 and
+  (
+    // Negation
+    op = "-" and path = "core::ops::arith::Neg" and method = "neg"
+    or
+    // Not
+    op = "!" and path = "core::ops::bit::Not" and method = "not"
+    or
+    // Dereference
+    op = "*" and path = "core::ops::deref::Deref" and method = "deref"
+  )
   or
-  // Not
-  op = "!" and path = "core::ops::bit::Not" and method = "not"
-  or
-  // Dereference
-  op = "*" and path = "core::ops::Deref" and method = "deref"
-  or
-  // Comparison operators
-  op = "==" and path = "core::cmp::PartialEq" and method = "eq"
-  or
-  op = "!=" and path = "core::cmp::PartialEq" and method = "ne"
-  or
-  op = "<" and path = "core::cmp::PartialOrd" and method = "lt"
-  or
-  op = "<=" and path = "core::cmp::PartialOrd" and method = "le"
-  or
-  op = ">" and path = "core::cmp::PartialOrd" and method = "gt"
-  or
-  op = ">=" and path = "core::cmp::PartialOrd" and method = "ge"
-  or
-  // Arithmetic operators
-  op = "+" and path = "core::ops::arith::Add" and method = "add"
-  or
-  op = "-" and path = "core::ops::arith::Sub" and method = "sub"
-  or
-  op = "*" and path = "core::ops::arith::Mul" and method = "mul"
-  or
-  op = "/" and path = "core::ops::arith::Div" and method = "div"
-  or
-  op = "%" and path = "core::ops::arith::Rem" and method = "rem"
-  or
-  // Arithmetic assignment expressions
-  op = "+=" and path = "core::ops::arith::AddAssign" and method = "add_assign"
-  or
-  op = "-=" and path = "core::ops::arith::SubAssign" and method = "sub_assign"
-  or
-  op = "*=" and path = "core::ops::arith::MulAssign" and method = "mul_assign"
-  or
-  op = "/=" and path = "core::ops::arith::DivAssign" and method = "div_assign"
-  or
-  op = "%=" and path = "core::ops::arith::RemAssign" and method = "rem_assign"
-  or
-  // Bitwise operators
-  op = "&" and path = "core::ops::bit::BitAnd" and method = "bitand"
-  or
-  op = "|" and path = "core::ops::bit::BitOr" and method = "bitor"
-  or
-  op = "^" and path = "core::ops::bit::BitXor" and method = "bitxor"
-  or
-  op = "<<" and path = "core::ops::bit::Shl" and method = "shl"
-  or
-  op = ">>" and path = "core::ops::bit::Shr" and method = "shr"
-  or
-  // Bitwise assignment operators
-  op = "&=" and path = "core::ops::bit::BitAndAssign" and method = "bitand_assign"
-  or
-  op = "|=" and path = "core::ops::bit::BitOrAssign" and method = "bitor_assign"
-  or
-  op = "^=" and path = "core::ops::bit::BitXorAssign" and method = "bitxor_assign"
-  or
-  op = "<<=" and path = "core::ops::bit::ShlAssign" and method = "shl_assign"
-  or
-  op = ">>=" and path = "core::ops::bit::ShrAssign" and method = "shr_assign"
+  arity = 2 and
+  (
+    // Comparison operators
+    op = "==" and path = "core::cmp::PartialEq" and method = "eq"
+    or
+    op = "!=" and path = "core::cmp::PartialEq" and method = "ne"
+    or
+    op = "<" and path = "core::cmp::PartialOrd" and method = "lt"
+    or
+    op = "<=" and path = "core::cmp::PartialOrd" and method = "le"
+    or
+    op = ">" and path = "core::cmp::PartialOrd" and method = "gt"
+    or
+    op = ">=" and path = "core::cmp::PartialOrd" and method = "ge"
+    or
+    // Arithmetic operators
+    op = "+" and path = "core::ops::arith::Add" and method = "add"
+    or
+    op = "-" and path = "core::ops::arith::Sub" and method = "sub"
+    or
+    op = "*" and path = "core::ops::arith::Mul" and method = "mul"
+    or
+    op = "/" and path = "core::ops::arith::Div" and method = "div"
+    or
+    op = "%" and path = "core::ops::arith::Rem" and method = "rem"
+    or
+    // Arithmetic assignment expressions
+    op = "+=" and path = "core::ops::arith::AddAssign" and method = "add_assign"
+    or
+    op = "-=" and path = "core::ops::arith::SubAssign" and method = "sub_assign"
+    or
+    op = "*=" and path = "core::ops::arith::MulAssign" and method = "mul_assign"
+    or
+    op = "/=" and path = "core::ops::arith::DivAssign" and method = "div_assign"
+    or
+    op = "%=" and path = "core::ops::arith::RemAssign" and method = "rem_assign"
+    or
+    // Bitwise operators
+    op = "&" and path = "core::ops::bit::BitAnd" and method = "bitand"
+    or
+    op = "|" and path = "core::ops::bit::BitOr" and method = "bitor"
+    or
+    op = "^" and path = "core::ops::bit::BitXor" and method = "bitxor"
+    or
+    op = "<<" and path = "core::ops::bit::Shl" and method = "shl"
+    or
+    op = ">>" and path = "core::ops::bit::Shr" and method = "shr"
+    or
+    // Bitwise assignment operators
+    op = "&=" and path = "core::ops::bit::BitAndAssign" and method = "bitand_assign"
+    or
+    op = "|=" and path = "core::ops::bit::BitOrAssign" and method = "bitor_assign"
+    or
+    op = "^=" and path = "core::ops::bit::BitXorAssign" and method = "bitxor_assign"
+    or
+    op = "<<=" and path = "core::ops::bit::ShlAssign" and method = "shl_assign"
+    or
+    op = ">>=" and path = "core::ops::bit::ShrAssign" and method = "shr_assign"
+  )
 }
 
 /**
@@ -109,7 +115,8 @@ module Impl {
      * trait `trait`.
      */
     predicate isOverloaded(Trait trait, string methodName) {
-      isOverloaded(this.getOperatorName(), trait.getCanonicalPath(), methodName)
+      isOverloaded(this.getOperatorName(), this.getNumberOfOperands(), trait.getCanonicalPath(),
+        methodName)
     }
   }
 }
diff --git a/rust/ql/lib/codeql/rust/elements/internal/VariableImpl.qll b/rust/ql/lib/codeql/rust/elements/internal/VariableImpl.qll
index 790186bf2c9..b645092a016 100644
--- a/rust/ql/lib/codeql/rust/elements/internal/VariableImpl.qll
+++ b/rust/ql/lib/codeql/rust/elements/internal/VariableImpl.qll
@@ -95,9 +95,9 @@ module Impl {
       not text.charAt(0).isUppercase() and
       // exclude parameters from functions without a body as these are trait method declarations
       // without implementations
-      not exists(Function f | not f.hasBody() and f.getParamList().getAParam().getPat() = pat) and
+      not exists(Function f | not f.hasBody() and f.getAParam().getPat() = pat) and
       // exclude parameters from function pointer types (e.g. `x` in `fn(x: i32) -> i32`)
-      not exists(FnPtrTypeRepr fp | fp.getParamList().getParam(_).getPat() = pat)
+      not exists(FnPtrTypeRepr fp | fp.getParamList().getAParam().getPat() = pat)
     )
   }
 
diff --git a/rust/ql/lib/codeql/rust/elements/internal/generated/CallExprBase.qll b/rust/ql/lib/codeql/rust/elements/internal/generated/CallExprBase.qll
index 046558c356d..1d6364fb94f 100644
--- a/rust/ql/lib/codeql/rust/elements/internal/generated/CallExprBase.qll
+++ b/rust/ql/lib/codeql/rust/elements/internal/generated/CallExprBase.qll
@@ -8,6 +8,7 @@ private import codeql.rust.elements.internal.generated.Synth
 private import codeql.rust.elements.internal.generated.Raw
 import codeql.rust.elements.ArgList
 import codeql.rust.elements.Attr
+import codeql.rust.elements.Expr
 import codeql.rust.elements.internal.ExprImpl::Impl as ExprImpl
 
 /**
@@ -55,5 +56,20 @@ module Generated {
      * Gets the number of attrs of this call expression base.
      */
     final int getNumberOfAttrs() { result = count(int i | exists(this.getAttr(i))) }
+
+    /**
+     * Gets the `index`th argument of this call expression base (0-based).
+     */
+    Expr getArg(int index) { none() }
+
+    /**
+     * Gets any of the arguments of this call expression base.
+     */
+    final Expr getAnArg() { result = this.getArg(_) }
+
+    /**
+     * Gets the number of arguments of this call expression base.
+     */
+    final int getNumberOfArgs() { result = count(int i | exists(this.getArg(i))) }
   }
 }
diff --git a/rust/ql/lib/codeql/rust/elements/internal/generated/Callable.qll b/rust/ql/lib/codeql/rust/elements/internal/generated/Callable.qll
index 710cfe2078e..f42f711dcf8 100644
--- a/rust/ql/lib/codeql/rust/elements/internal/generated/Callable.qll
+++ b/rust/ql/lib/codeql/rust/elements/internal/generated/Callable.qll
@@ -8,6 +8,7 @@ private import codeql.rust.elements.internal.generated.Synth
 private import codeql.rust.elements.internal.generated.Raw
 import codeql.rust.elements.internal.AstNodeImpl::Impl as AstNodeImpl
 import codeql.rust.elements.Attr
+import codeql.rust.elements.Param
 import codeql.rust.elements.ParamList
 
 /**
@@ -53,5 +54,20 @@ module Generated {
      * Gets the number of attrs of this callable.
      */
     final int getNumberOfAttrs() { result = count(int i | exists(this.getAttr(i))) }
+
+    /**
+     * Gets the `index`th parameter of this callable (0-based).
+     */
+    Param getParam(int index) { none() }
+
+    /**
+     * Gets any of the parameters of this callable.
+     */
+    final Param getAParam() { result = this.getParam(_) }
+
+    /**
+     * Gets the number of parameters of this callable.
+     */
+    final int getNumberOfParams() { result = count(int i | exists(this.getParam(i))) }
   }
 }
diff --git a/rust/ql/lib/codeql/rust/elements/internal/generated/Const.qll b/rust/ql/lib/codeql/rust/elements/internal/generated/Const.qll
index 3ff3c77f04e..29bda01a6fe 100644
--- a/rust/ql/lib/codeql/rust/elements/internal/generated/Const.qll
+++ b/rust/ql/lib/codeql/rust/elements/internal/generated/Const.qll
@@ -108,5 +108,15 @@ module Generated {
      * Holds if `getVisibility()` exists.
      */
     final predicate hasVisibility() { exists(this.getVisibility()) }
+
+    /**
+     * Holds if this constant has an implementation.
+     *
+     * This is the same as `hasBody` for source code, but for library code (for which we always skip
+     * the body), this will hold when the body was present in the original code.
+     */
+    predicate hasImplementation() {
+      Synth::convertConstToRaw(this).(Raw::Const).hasImplementation()
+    }
   }
 }
diff --git a/rust/ql/lib/codeql/rust/elements/internal/generated/Function.qll b/rust/ql/lib/codeql/rust/elements/internal/generated/Function.qll
index 82914663b94..00c4cd38c32 100644
--- a/rust/ql/lib/codeql/rust/elements/internal/generated/Function.qll
+++ b/rust/ql/lib/codeql/rust/elements/internal/generated/Function.qll
@@ -164,5 +164,15 @@ module Generated {
      * Holds if `getWhereClause()` exists.
      */
     final predicate hasWhereClause() { exists(this.getWhereClause()) }
+
+    /**
+     * Holds if this function has an implementation.
+     *
+     * This is the same as `hasBody` for source code, but for library code (for which we always skip
+     * the body), this will hold when the body was present in the original code.
+     */
+    predicate hasImplementation() {
+      Synth::convertFunctionToRaw(this).(Raw::Function).hasImplementation()
+    }
   }
 }
diff --git a/rust/ql/lib/codeql/rust/elements/internal/generated/Raw.qll b/rust/ql/lib/codeql/rust/elements/internal/generated/Raw.qll
index c5344d351d4..503691bb83b 100644
--- a/rust/ql/lib/codeql/rust/elements/internal/generated/Raw.qll
+++ b/rust/ql/lib/codeql/rust/elements/internal/generated/Raw.qll
@@ -3734,6 +3734,14 @@ module Raw {
      * Gets the visibility of this const, if it exists.
      */
     Visibility getVisibility() { const_visibilities(this, result) }
+
+    /**
+     * Holds if this constant has an implementation.
+     *
+     * This is the same as `hasBody` for source code, but for library code (for which we always skip
+     * the body), this will hold when the body was present in the original code.
+     */
+    predicate hasImplementation() { const_has_implementation(this) }
   }
 
   /**
@@ -3922,6 +3930,14 @@ module Raw {
      * Gets the where clause of this function, if it exists.
      */
     WhereClause getWhereClause() { function_where_clauses(this, result) }
+
+    /**
+     * Holds if this function has an implementation.
+     *
+     * This is the same as `hasBody` for source code, but for library code (for which we always skip
+     * the body), this will hold when the body was present in the original code.
+     */
+    predicate hasImplementation() { function_has_implementation(this) }
   }
 
   /**
diff --git a/rust/ql/lib/codeql/rust/frameworks/async-rs.model.yml b/rust/ql/lib/codeql/rust/frameworks/async-rs.model.yml
new file mode 100644
index 00000000000..2217c30fce3
--- /dev/null
+++ b/rust/ql/lib/codeql/rust/frameworks/async-rs.model.yml
@@ -0,0 +1,6 @@
+extensions:
+  - addsTo:
+      pack: codeql/rust-all
+      extensible: sourceModel
+    data:
+      - ["repo:https://github.com/async-rs/async-std:async-std", "<crate::net::tcp::stream::TcpStream>::connect", "ReturnValue.Future.Field[crate::result::Result::Ok(0)]", "remote", "manual"]
diff --git a/rust/ql/lib/codeql/rust/frameworks/futures.model.yml b/rust/ql/lib/codeql/rust/frameworks/futures.model.yml
index 1361ff9aeb2..02f29d23494 100644
--- a/rust/ql/lib/codeql/rust/frameworks/futures.model.yml
+++ b/rust/ql/lib/codeql/rust/frameworks/futures.model.yml
@@ -4,3 +4,16 @@ extensions:
       extensible: summaryModel
     data:
       - ["repo:https://github.com/rust-lang/futures-rs:futures-executor", "crate::local_pool::block_on", "Argument[0]", "ReturnValue", "value", "manual"]
+      - ["repo:https://github.com/rust-lang/futures-rs:futures-util", "<crate::io::buf_reader::BufReader>::new", "Argument[0]", "ReturnValue", "taint", "manual"]
+      - ["repo:https://github.com/rust-lang/futures-rs:futures-util", "crate::io::AsyncReadExt::read", "Argument[self]", "Argument[0].Reference", "taint", "manual"]
+      - ["repo:https://github.com/rust-lang/futures-rs:futures-util", "crate::io::AsyncReadExt::read", "Argument[self].Reference", "Argument[0].Reference", "taint", "manual"]
+      - ["repo:https://github.com/rust-lang/futures-rs:futures-util", "crate::io::AsyncReadExt::read_to_end", "Argument[self]", "Argument[0].Reference", "taint", "manual"]
+      - ["repo:https://github.com/rust-lang/futures-rs:futures-util", "crate::io::AsyncReadExt::read_to_end", "Argument[self].Reference", "Argument[0].Reference", "taint", "manual"]
+      - ["repo:https://github.com/rust-lang/futures-rs:futures-util", "crate::io::AsyncBufReadExt::read_line", "Argument[self]", "Argument[0].Reference", "taint", "manual"]
+      - ["repo:https://github.com/rust-lang/futures-rs:futures-util", "crate::io::AsyncBufReadExt::read_line", "Argument[self].Reference", "Argument[0].Reference", "taint", "manual"]
+      - ["repo:https://github.com/rust-lang/futures-rs:futures-util", "crate::io::AsyncBufReadExt::read_until", "Argument[self]", "Argument[1].Reference", "taint", "manual"]
+      - ["repo:https://github.com/rust-lang/futures-rs:futures-util", "crate::io::AsyncBufReadExt::read_until", "Argument[self].Reference", "Argument[1].Reference", "taint", "manual"]
+      - ["repo:https://github.com/rust-lang/futures-rs:futures-util", "crate::io::AsyncBufReadExt::fill_buf", "Argument[self]", "ReturnValue.Future.Field[crate::result::Result::Ok(0)]", "taint", "manual"]
+      - ["repo:https://github.com/rust-lang/futures-rs:futures-util", "crate::io::AsyncBufReadExt::lines", "Argument[self]", "ReturnValue", "taint", "manual"]
+      - ["repo:https://github.com/rust-lang/futures-rs:futures-util", "crate::stream::stream::StreamExt::next", "Argument[self]", "ReturnValue.Future.Field[crate::option::Option::Some(0)]", "taint", "manual"]
+      - ["repo:https://github.com/rust-lang/futures-rs:futures-util", "<crate::io::buf_reader::BufReader as crate::if_std::AsyncBufRead>::poll_fill_buf", "Argument[self].Reference", "ReturnValue.Field[crate::task::poll::Poll::Ready(0)].Field[crate::result::Result::Ok(0)]", "taint", "manual"]
diff --git a/rust/ql/lib/codeql/rust/frameworks/rustls.model.yml b/rust/ql/lib/codeql/rust/frameworks/rustls.model.yml
new file mode 100644
index 00000000000..baa5615d458
--- /dev/null
+++ b/rust/ql/lib/codeql/rust/frameworks/rustls.model.yml
@@ -0,0 +1,14 @@
+extensions:
+  - addsTo:
+      pack: codeql/rust-all
+      extensible: sourceModel
+    data:
+      - ["repo:https://github.com/rustls/rustls:rustls", "<crate::client::client_conn::connection::ClientConnection>::new", "ReturnValue.Field[crate::result::Result::Ok(0)]", "remote", "manual"]
+  - addsTo:
+      pack: codeql/rust-all
+      extensible: summaryModel
+    data:
+      - ["repo:https://github.com/quininer/futures-rustls:futures-rustls", "<crate::TlsConnector>::connect", "Argument[1]", "ReturnValue.Future.Field[crate::result::Result::Ok(0)]", "taint", "manual"]
+      - ["repo:https://github.com/quininer/futures-rustls:futures-rustls", "<crate::client::TlsStream as crate::if_std::AsyncRead>::poll_read", "Argument[self].Reference", "Argument[1].Reference", "taint", "manual"]
+      - ["repo:https://github.com/rustls/rustls:rustls", "<crate::conn::ConnectionCommon>::reader", "Argument[self]", "ReturnValue", "taint", "manual"]
+      - ["repo:https://github.com/rustls/rustls:rustls", "<crate::conn::connection::Reader as crate::io::Read>::read", "Argument[self]", "Argument[0].Reference", "taint", "manual"]
diff --git a/rust/ql/lib/codeql/rust/frameworks/stdlib/Bultins.qll b/rust/ql/lib/codeql/rust/frameworks/stdlib/Builtins.qll
similarity index 100%
rename from rust/ql/lib/codeql/rust/frameworks/stdlib/Bultins.qll
rename to rust/ql/lib/codeql/rust/frameworks/stdlib/Builtins.qll
diff --git a/rust/ql/lib/codeql/rust/frameworks/stdlib/Stdlib.qll b/rust/ql/lib/codeql/rust/frameworks/stdlib/Stdlib.qll
index e7d9cac24e9..f8a65d9dcb9 100644
--- a/rust/ql/lib/codeql/rust/frameworks/stdlib/Stdlib.qll
+++ b/rust/ql/lib/codeql/rust/frameworks/stdlib/Stdlib.qll
@@ -49,3 +49,19 @@ class ResultEnum extends Enum {
   /** Gets the `Err` variant. */
   Variant getErr() { result = this.getVariant("Err") }
 }
+
+/**
+ * The [`Future` trait][1].
+ *
+ * [1]: https://doc.rust-lang.org/std/future/trait.Future.html
+ */
+class FutureTrait extends Trait {
+  FutureTrait() { this.getCanonicalPath() = "core::future::future::Future" }
+
+  /** Gets the `Output` associated type. */
+  pragma[nomagic]
+  TypeAlias getOutputType() {
+    result = this.getAssocItemList().getAnAssocItem() and
+    result.getName().getText() = "Output"
+  }
+}
diff --git a/rust/ql/lib/codeql/rust/internal/PathResolution.qll b/rust/ql/lib/codeql/rust/internal/PathResolution.qll
index d23679ee81b..748fa0fa45d 100644
--- a/rust/ql/lib/codeql/rust/internal/PathResolution.qll
+++ b/rust/ql/lib/codeql/rust/internal/PathResolution.qll
@@ -5,6 +5,7 @@
 private import rust
 private import codeql.rust.elements.internal.generated.ParentChild
 private import codeql.rust.internal.CachedStages
+private import codeql.rust.frameworks.stdlib.Builtins as Builtins
 
 private newtype TNamespace =
   TTypeNamespace() or
@@ -127,12 +128,25 @@ abstract class ItemNode extends Locatable {
     or
     crateDependencyEdge(this, name, result)
     or
+    externCrateEdge(this, name, result)
+    or
     // items made available through `use` are available to nodes that contain the `use`
     exists(UseItemNode use |
       use = this.getASuccessorRec(_) and
       result = use.(ItemNode).getASuccessorRec(name)
     )
     or
+    exists(ExternCrateItemNode ec | result = ec.(ItemNode).getASuccessorRec(name) |
+      ec = this.getASuccessorRec(_)
+      or
+      // if the extern crate appears in the crate root, then the crate name is also added
+      // to the 'extern prelude', see https://doc.rust-lang.org/reference/items/extern-crates.html
+      exists(Crate c |
+        ec = c.getSourceFile().(ItemNode).getASuccessorRec(_) and
+        this = c.getASourceFile()
+      )
+    )
+    or
     // items made available through macro calls are available to nodes that contain the macro call
     exists(MacroCallItemNode call |
       call = this.getASuccessorRec(_) and
@@ -165,6 +179,8 @@ abstract class ItemNode extends Locatable {
     or
     // type parameters have access to the associated items of its bounds
     result = this.(TypeParamItemNode).resolveABound().getASuccessorRec(name).(AssocItemNode)
+    or
+    result = this.(ImplTraitTypeReprItemNode).resolveABound().getASuccessorRec(name).(AssocItemNode)
   }
 
   /**
@@ -353,16 +369,33 @@ class CrateItemNode extends ItemNode instanceof Crate {
 
   override predicate providesCanonicalPathPrefixFor(Crate c, ItemNode child) {
     this.hasCanonicalPath(c) and
-    exists(ModuleLikeNode m |
-      child.getImmediateParent() = m and
-      not m = child.(SourceFileItemNode).getSuper() and
-      m = super.getSourceFile()
+    exists(SourceFileItemNode file |
+      child.getImmediateParent() = file and
+      not file = child.(SourceFileItemNode).getSuper() and
+      file = super.getSourceFile()
     )
+    or
+    this.getName() = "core" and
+    child instanceof Builtins::BuiltinType
   }
 
   override string getCanonicalPath(Crate c) { c = this and result = Crate.super.getName() }
 }
 
+class ExternCrateItemNode extends ItemNode instanceof ExternCrate {
+  override string getName() { result = super.getRename().getName().getText() }
+
+  override Namespace getNamespace() { none() }
+
+  override Visibility getVisibility() { none() }
+
+  override TypeParam getTypeParam(int i) { none() }
+
+  override predicate hasCanonicalPath(Crate c) { none() }
+
+  override string getCanonicalPath(Crate c) { none() }
+}
+
 /** An item that can occur in a trait or an `impl` block. */
 abstract private class AssocItemNode extends ItemNode, AssocItem {
   /** Holds if this associated item has an implementation. */
@@ -577,6 +610,9 @@ class ImplItemNode extends ImplOrTraitItemNode instanceof Impl {
     result = this.resolveTraitTy().getCanonicalPath(c)
   }
 
+  pragma[nomagic]
+  private string getSelfCanonicalPath(Crate c) { result = this.resolveSelfTy().getCanonicalPath(c) }
+
   pragma[nomagic]
   private string getCanonicalPathTraitPart(Crate c) {
     exists(Crate c2 |
@@ -591,7 +627,7 @@ class ImplItemNode extends ImplOrTraitItemNode instanceof Impl {
     result = "<"
     or
     i = 1 and
-    result = this.resolveSelfTy().getCanonicalPath(c)
+    result = this.getSelfCanonicalPath(c)
     or
     if exists(this.getTraitPath())
     then
@@ -618,6 +654,28 @@ class ImplItemNode extends ImplOrTraitItemNode instanceof Impl {
   }
 }
 
+private class ImplTraitTypeReprItemNode extends ItemNode instanceof ImplTraitTypeRepr {
+  pragma[nomagic]
+  Path getABoundPath() {
+    result = super.getTypeBoundList().getABound().getTypeRepr().(PathTypeRepr).getPath()
+  }
+
+  pragma[nomagic]
+  ItemNode resolveABound() { result = resolvePathFull(this.getABoundPath()) }
+
+  override string getName() { result = "(impl trait)" }
+
+  override Namespace getNamespace() { result.isType() }
+
+  override Visibility getVisibility() { none() }
+
+  override TypeParam getTypeParam(int i) { none() }
+
+  override predicate hasCanonicalPath(Crate c) { none() }
+
+  override string getCanonicalPath(Crate c) { none() }
+}
+
 private class MacroCallItemNode extends AssocItemNode instanceof MacroCall {
   override string getName() { result = "(macro call)" }
 
@@ -793,6 +851,10 @@ class TypeAliasItemNode extends AssocItemNode instanceof TypeAlias {
   override Visibility getVisibility() { result = TypeAlias.super.getVisibility() }
 
   override TypeParam getTypeParam(int i) { result = super.getGenericParamList().getTypeParam(i) }
+
+  override predicate hasCanonicalPath(Crate c) { none() }
+
+  override string getCanonicalPath(Crate c) { none() }
 }
 
 private class UnionItemNode extends ItemNode instanceof Union {
@@ -929,6 +991,7 @@ private predicate sourceFileEdge(SourceFile f, string name, ItemNode item) {
 }
 
 /** Holds if `f` is available as `mod name;` inside `folder`. */
+pragma[nomagic]
 private predicate fileModule(SourceFile f, string name, Folder folder) {
   exists(File file | file = f.getFile() |
     file.getBaseName() = name + ".rs" and
@@ -943,6 +1006,12 @@ private predicate fileModule(SourceFile f, string name, Folder folder) {
   )
 }
 
+bindingset[name, folder]
+pragma[inline_late]
+private predicate fileModuleInlineLate(SourceFile f, string name, Folder folder) {
+  fileModule(f, name, folder)
+}
+
 /**
  * Gets the `Meta` of the module `m`'s [path attribute][1].
  *
@@ -1025,7 +1094,7 @@ pragma[nomagic]
 predicate fileImport(Module m, SourceFile f) {
   exists(string name, Folder parent |
     modImport0(m, name, _) and
-    fileModule(f, name, parent)
+    fileModuleInlineLate(f, name, parent)
   |
     // `m` is not inside a nested module
     modImport0(m, name, parent) and
@@ -1062,14 +1131,21 @@ private predicate crateDefEdge(CrateItemNode c, string name, ItemNode i) {
   not i instanceof Crate
 }
 
+private class BuiltinSourceFile extends SourceFileItemNode {
+  BuiltinSourceFile() { this.getFile().getParentContainer() instanceof Builtins::BuiltinsFolder }
+}
+
 /**
- * Holds if `m` depends on crate `dep` named `name`.
+ * Holds if `file` depends on crate `dep` named `name`.
  */
-private predicate crateDependencyEdge(ModuleLikeNode m, string name, CrateItemNode dep) {
-  exists(CrateItemNode c |
-    dep = c.(Crate).getDependency(name) and
-    m = c.getASourceFile()
-  )
+pragma[nomagic]
+private predicate crateDependencyEdge(SourceFileItemNode file, string name, CrateItemNode dep) {
+  exists(CrateItemNode c | dep = c.(Crate).getDependency(name) | file = c.getASourceFile())
+  or
+  // Give builtin files, such as `await.rs`, access to `std`
+  file instanceof BuiltinSourceFile and
+  dep.getName() = name and
+  name = "std"
 }
 
 private predicate useTreeDeclares(UseTree tree, string name) {
@@ -1404,6 +1480,22 @@ private predicate useImportEdge(Use use, string name, ItemNode item) {
   )
 }
 
+/** Holds if `ec` imports `crate` as `name`. */
+pragma[nomagic]
+private predicate externCrateEdge(ExternCrateItemNode ec, string name, CrateItemNode crate) {
+  name = ec.getName() and
+  exists(SourceFile f, string s |
+    ec.getFile() = f.getFile() and
+    s = ec.(ExternCrate).getIdentifier().getText()
+  |
+    crateDependencyEdge(f, s, crate)
+    or
+    // `extern crate` is used to import the current crate
+    s = "self" and
+    ec.getFile() = crate.getASourceFile().getFile()
+  )
+}
+
 /**
  * Holds if `i` is available inside `f` because it is reexported in
  * [the `core` prelude][1] or [the `std` prelude][2].
@@ -1414,9 +1506,14 @@ private predicate useImportEdge(Use use, string name, ItemNode item) {
  * [1]: https://doc.rust-lang.org/core/prelude/index.html
  * [2]: https://doc.rust-lang.org/std/prelude/index.html
  */
+pragma[nomagic]
 private predicate preludeEdge(SourceFile f, string name, ItemNode i) {
   exists(Crate stdOrCore, ModuleLikeNode mod, ModuleItemNode prelude, ModuleItemNode rust |
-    f = any(Crate c0 | stdOrCore = c0.getDependency(_) or stdOrCore = c0).getASourceFile() and
+    f = any(Crate c0 | stdOrCore = c0.getDependency(_) or stdOrCore = c0).getASourceFile()
+    or
+    // Give builtin files, such as `await.rs`, access to the prelude
+    f instanceof BuiltinSourceFile
+  |
     stdOrCore.getName() = ["std", "core"] and
     mod = stdOrCore.getSourceFile() and
     prelude = mod.getASuccessorRec("prelude") and
@@ -1426,12 +1523,10 @@ private predicate preludeEdge(SourceFile f, string name, ItemNode i) {
   )
 }
 
-private import codeql.rust.frameworks.stdlib.Bultins as Builtins
-
 pragma[nomagic]
 private predicate builtin(string name, ItemNode i) {
-  exists(SourceFileItemNode builtins |
-    builtins.getFile().getParentContainer() instanceof Builtins::BuiltinsFolder and
+  exists(BuiltinSourceFile builtins |
+    builtins.getFile().getBaseName() = "types.rs" and
     i = builtins.getASuccessorRec(name)
   )
 }
diff --git a/rust/ql/lib/codeql/rust/internal/Type.qll b/rust/ql/lib/codeql/rust/internal/Type.qll
index db7938b3cf1..47ff0e2dd3f 100644
--- a/rust/ql/lib/codeql/rust/internal/Type.qll
+++ b/rust/ql/lib/codeql/rust/internal/Type.qll
@@ -15,10 +15,14 @@ newtype TType =
   TTrait(Trait t) or
   TArrayType() or // todo: add size?
   TRefType() or // todo: add mut?
+  TImplTraitType(ImplTraitTypeRepr impl) or
+  TSliceType() or
   TTypeParamTypeParameter(TypeParam t) or
   TAssociatedTypeTypeParameter(TypeAlias t) { any(TraitItemNode trait).getAnAssocItem() = t } or
+  TArrayTypeParameter() or
   TRefTypeParameter() or
-  TSelfTypeParameter(Trait t)
+  TSelfTypeParameter(Trait t) or
+  TSliceTypeParameter()
 
 /**
  * A type without type arguments.
@@ -115,6 +119,9 @@ class TraitType extends Type, TTrait {
 
   TraitType() { this = TTrait(trait) }
 
+  /** Gets the underlying trait. */
+  Trait getTrait() { result = trait }
+
   override StructField getStructField(string name) { none() }
 
   override TupleField getTupleField(int i) { none() }
@@ -145,7 +152,8 @@ class ArrayType extends Type, TArrayType {
   override TupleField getTupleField(int i) { none() }
 
   override TypeParameter getTypeParameter(int i) {
-    none() // todo
+    result = TArrayTypeParameter() and
+    i = 0
   }
 
   override string toString() { result = "[]" }
@@ -176,6 +184,76 @@ class RefType extends Type, TRefType {
   override Location getLocation() { result instanceof EmptyLocation }
 }
 
+/**
+ * An [impl Trait][1] type.
+ *
+ * Each syntactic `impl Trait` type gives rise to its own type, even if
+ * two `impl Trait` types have the same bounds.
+ *
+ * [1]: https://doc.rust-lang.org/reference/types/impl-trait.html
+ */
+class ImplTraitType extends Type, TImplTraitType {
+  ImplTraitTypeRepr impl;
+
+  ImplTraitType() { this = TImplTraitType(impl) }
+
+  /** Gets the underlying AST node. */
+  ImplTraitTypeRepr getImplTraitTypeRepr() { result = impl }
+
+  /** Gets the function that this `impl Trait` belongs to. */
+  abstract Function getFunction();
+
+  override StructField getStructField(string name) { none() }
+
+  override TupleField getTupleField(int i) { none() }
+
+  override TypeParameter getTypeParameter(int i) { none() }
+
+  override string toString() { result = impl.toString() }
+
+  override Location getLocation() { result = impl.getLocation() }
+}
+
+/**
+ * An [impl Trait in return position][1] type, for example:
+ *
+ * ```rust
+ * fn foo() -> impl Trait
+ * ```
+ *
+ * [1]: https://doc.rust-lang.org/reference/types/impl-trait.html#r-type.impl-trait.return
+ */
+class ImplTraitReturnType extends ImplTraitType {
+  private Function function;
+
+  ImplTraitReturnType() { impl = function.getRetType().getTypeRepr() }
+
+  override Function getFunction() { result = function }
+}
+
+/**
+ * A slice type.
+ *
+ * Slice types like `[i64]` are modeled as normal generic types
+ * with a single type argument.
+ */
+class SliceType extends Type, TSliceType {
+  SliceType() { this = TSliceType() }
+
+  override StructField getStructField(string name) { none() }
+
+  override TupleField getTupleField(int i) { none() }
+
+  override TypeParameter getTypeParameter(int i) {
+    result = TSliceTypeParameter() and
+    i = 0
+  }
+
+  override string toString() { result = "[]" }
+
+  override Location getLocation() { result instanceof EmptyLocation }
+}
+
 /** A type parameter. */
 abstract class TypeParameter extends Type {
   override StructField getStructField(string name) { none() }
@@ -185,7 +263,7 @@ abstract class TypeParameter extends Type {
   override TypeParameter getTypeParameter(int i) { none() }
 }
 
-private class RawTypeParameter = @type_param or @trait or @type_alias;
+private class RawTypeParameter = @type_param or @trait or @type_alias or @impl_trait_type_repr;
 
 private predicate id(RawTypeParameter x, RawTypeParameter y) { x = y }
 
@@ -255,6 +333,13 @@ class AssociatedTypeTypeParameter extends TypeParameter, TAssociatedTypeTypePara
   override Location getLocation() { result = typeAlias.getLocation() }
 }
 
+/** An implicit array type parameter. */
+class ArrayTypeParameter extends TypeParameter, TArrayTypeParameter {
+  override string toString() { result = "[T;...]" }
+
+  override Location getLocation() { result instanceof EmptyLocation }
+}
+
 /** An implicit reference type parameter. */
 class RefTypeParameter extends TypeParameter, TRefTypeParameter {
   override string toString() { result = "&T" }
@@ -262,6 +347,13 @@ class RefTypeParameter extends TypeParameter, TRefTypeParameter {
   override Location getLocation() { result instanceof EmptyLocation }
 }
 
+/** An implicit slice type parameter. */
+class SliceTypeParameter extends TypeParameter, TSliceTypeParameter {
+  override string toString() { result = "[T]" }
+
+  override Location getLocation() { result instanceof EmptyLocation }
+}
+
 /**
  * The implicit `Self` type parameter of a trait, that refers to the
  * implementing type of the trait.
@@ -281,6 +373,37 @@ class SelfTypeParameter extends TypeParameter, TSelfTypeParameter {
   override Location getLocation() { result = trait.getLocation() }
 }
 
+/**
+ * An [impl Trait in argument position][1] type, for example:
+ *
+ * ```rust
+ * fn foo(arg: impl Trait)
+ * ```
+ *
+ * Such types are syntactic sugar for type parameters, that is
+ *
+ * ```rust
+ * fn foo<T: Trait>(arg: T)
+ * ```
+ *
+ * so we model them as type parameters.
+ *
+ * [1]: https://doc.rust-lang.org/reference/types/impl-trait.html#r-type.impl-trait.param
+ */
+class ImplTraitTypeTypeParameter extends ImplTraitType, TypeParameter {
+  private Function function;
+
+  ImplTraitTypeTypeParameter() { impl = function.getAParam().getTypeRepr() }
+
+  override Function getFunction() { result = function }
+
+  override StructField getStructField(string name) { none() }
+
+  override TupleField getTupleField(int i) { none() }
+
+  override TypeParameter getTypeParameter(int i) { none() }
+}
+
 /**
  * A type abstraction. I.e., a place in the program where type variables are
  * introduced.
@@ -316,3 +439,7 @@ final class SelfTypeBoundTypeAbstraction extends TypeAbstraction, Name {
 
   override TypeParamTypeParameter getATypeParameter() { none() }
 }
+
+final class ImplTraitTypeReprAbstraction extends TypeAbstraction, ImplTraitTypeRepr {
+  override TypeParamTypeParameter getATypeParameter() { none() }
+}
diff --git a/rust/ql/lib/codeql/rust/internal/TypeInference.qll b/rust/ql/lib/codeql/rust/internal/TypeInference.qll
index 8399bde8aa8..61c93153957 100644
--- a/rust/ql/lib/codeql/rust/internal/TypeInference.qll
+++ b/rust/ql/lib/codeql/rust/internal/TypeInference.qll
@@ -1,5 +1,6 @@
 /** Provides functionality for inferring types. */
 
+private import codeql.util.Boolean
 private import rust
 private import PathResolution
 private import Type
@@ -7,7 +8,8 @@ private import Type as T
 private import TypeMention
 private import codeql.typeinference.internal.TypeInference
 private import codeql.rust.frameworks.stdlib.Stdlib
-private import codeql.rust.frameworks.stdlib.Bultins as Builtins
+private import codeql.rust.frameworks.stdlib.Builtins as Builtins
+private import codeql.rust.elements.Call
 
 class Type = T::Type;
 
@@ -80,15 +82,24 @@ private module Input1 implements InputSig1<Location> {
   int getTypeParameterId(TypeParameter tp) {
     tp =
       rank[result](TypeParameter tp0, int kind, int id |
-        tp0 instanceof RefTypeParameter and
+        tp0 instanceof ArrayTypeParameter and
         kind = 0 and
         id = 0
         or
+        tp0 instanceof RefTypeParameter and
+        kind = 0 and
+        id = 1
+        or
+        tp0 instanceof SliceTypeParameter and
+        kind = 0 and
+        id = 2
+        or
         kind = 1 and
         exists(AstNode node | id = idOfTypeParameterAstNode(node) |
           node = tp0.(TypeParamTypeParameter).getTypeParam() or
           node = tp0.(AssociatedTypeTypeParameter).getTypeAlias() or
-          node = tp0.(SelfTypeParameter).getTrait()
+          node = tp0.(SelfTypeParameter).getTrait() or
+          node = tp0.(ImplTraitTypeTypeParameter).getImplTraitTypeRepr()
         )
       |
         tp0 order by kind, id
@@ -117,6 +128,13 @@ private module Input2 implements InputSig2 {
     result = tp.(TypeParamTypeParameter).getTypeParam().getTypeBoundList().getABound().getTypeRepr()
     or
     result = tp.(SelfTypeParameter).getTrait()
+    or
+    result =
+      tp.(ImplTraitTypeTypeParameter)
+          .getImplTraitTypeRepr()
+          .getTypeBoundList()
+          .getABound()
+          .getTypeRepr()
   }
 
   /**
@@ -156,6 +174,12 @@ private module Input2 implements InputSig2 {
       condition = self and
       constraint = self.getTrait()
     )
+    or
+    exists(ImplTraitTypeRepr impl |
+      abs = impl and
+      condition = impl and
+      constraint = impl.getTypeBoundList().getABound().getTypeRepr()
+    )
   }
 }
 
@@ -228,8 +252,6 @@ private predicate typeEquality(AstNode n1, TypePath prefix1, AstNode n2, TypePat
     or
     n1 = n2.(ParenExpr).getExpr()
     or
-    n1 = n2.(BlockExpr).getStmtList().getTailExpr()
-    or
     n1 = n2.(IfExpr).getABranch()
     or
     n1 = n2.(MatchExpr).getAnArm().getExpr()
@@ -245,9 +267,26 @@ private predicate typeEquality(AstNode n1, TypePath prefix1, AstNode n2, TypePat
     )
   )
   or
+  n1 = n2.(RefExpr).getExpr() and
+  prefix1.isEmpty() and
+  prefix2 = TypePath::singleton(TRefTypeParameter())
+  or
   n1 = n2.(DerefExpr).getExpr() and
   prefix1 = TypePath::singleton(TRefTypeParameter()) and
   prefix2.isEmpty()
+  or
+  exists(BlockExpr be |
+    n1 = be and
+    n2 = be.getStmtList().getTailExpr() and
+    if be.isAsync()
+    then
+      prefix1 = TypePath::singleton(getFutureOutputTypeParameter()) and
+      prefix2.isEmpty()
+    else (
+      prefix1.isEmpty() and
+      prefix2.isEmpty()
+    )
+  )
 }
 
 pragma[nomagic]
@@ -459,20 +498,17 @@ private Type inferPathExprType(PathExpr pe, TypePath path) {
  * like `foo::bar(baz)` and `foo.bar(baz)`.
  */
 private module CallExprBaseMatchingInput implements MatchingInputSig {
-  private predicate paramPos(ParamList pl, Param p, int pos, boolean inMethod) {
-    p = pl.getParam(pos) and
-    if pl.hasSelfParam() then inMethod = true else inMethod = false
-  }
+  private predicate paramPos(ParamList pl, Param p, int pos) { p = pl.getParam(pos) }
 
   private newtype TDeclarationPosition =
     TSelfDeclarationPosition() or
-    TPositionalDeclarationPosition(int pos, boolean inMethod) { paramPos(_, _, pos, inMethod) } or
+    TPositionalDeclarationPosition(int pos) { paramPos(_, _, pos) } or
     TReturnDeclarationPosition()
 
   class DeclarationPosition extends TDeclarationPosition {
     predicate isSelf() { this = TSelfDeclarationPosition() }
 
-    int asPosition(boolean inMethod) { this = TPositionalDeclarationPosition(result, inMethod) }
+    int asPosition() { this = TPositionalDeclarationPosition(result) }
 
     predicate isReturn() { this = TReturnDeclarationPosition() }
 
@@ -480,7 +516,7 @@ private module CallExprBaseMatchingInput implements MatchingInputSig {
       this.isSelf() and
       result = "self"
       or
-      result = this.asPosition(_).toString()
+      result = this.asPosition().toString()
       or
       this.isReturn() and
       result = "(return)"
@@ -513,7 +549,7 @@ private module CallExprBaseMatchingInput implements MatchingInputSig {
     override Type getParameterType(DeclarationPosition dpos, TypePath path) {
       exists(int pos |
         result = this.getTupleField(pos).getTypeRepr().(TypeMention).resolveTypeAt(path) and
-        dpos = TPositionalDeclarationPosition(pos, false)
+        dpos = TPositionalDeclarationPosition(pos)
       )
     }
 
@@ -536,7 +572,7 @@ private module CallExprBaseMatchingInput implements MatchingInputSig {
     override Type getParameterType(DeclarationPosition dpos, TypePath path) {
       exists(int p |
         result = this.getTupleField(p).getTypeRepr().(TypeMention).resolveTypeAt(path) and
-        dpos = TPositionalDeclarationPosition(p, false)
+        dpos = TPositionalDeclarationPosition(p)
       )
     }
 
@@ -563,12 +599,15 @@ private module CallExprBaseMatchingInput implements MatchingInputSig {
         ppos.isImplicit() and
         result.(AssociatedTypeTypeParameter).getTrait() = trait
       )
+      or
+      ppos.isImplicit() and
+      this = result.(ImplTraitTypeTypeParameter).getFunction()
     }
 
     override Type getParameterType(DeclarationPosition dpos, TypePath path) {
-      exists(Param p, int i, boolean inMethod |
-        paramPos(this.getParamList(), p, i, inMethod) and
-        dpos = TPositionalDeclarationPosition(i, inMethod) and
+      exists(Param p, int i |
+        paramPos(this.getParamList(), p, i) and
+        dpos = TPositionalDeclarationPosition(i) and
         result = inferAnnotatedType(p.getPat(), path)
       )
       or
@@ -582,36 +621,41 @@ private module CallExprBaseMatchingInput implements MatchingInputSig {
       )
     }
 
-    override Type getReturnType(TypePath path) {
+    private Type resolveRetType(TypePath path) {
       result = this.getRetType().getTypeRepr().(TypeMention).resolveTypeAt(path)
     }
+
+    override Type getReturnType(TypePath path) {
+      if this.isAsync()
+      then
+        path.isEmpty() and
+        result = getFutureTraitType()
+        or
+        exists(TypePath suffix |
+          result = this.resolveRetType(suffix) and
+          path = TypePath::cons(getFutureOutputTypeParameter(), suffix)
+        )
+      else result = this.resolveRetType(path)
+    }
   }
 
-  private predicate argPos(CallExprBase call, Expr e, int pos, boolean isMethodCall) {
-    exists(ArgList al |
-      e = al.getArg(pos) and
-      call.getArgList() = al and
-      if call instanceof MethodCallExpr then isMethodCall = true else isMethodCall = false
-    )
-  }
-
   private newtype TAccessPosition =
-    TSelfAccessPosition() or
-    TPositionalAccessPosition(int pos, boolean isMethodCall) { argPos(_, _, pos, isMethodCall) } or
+    TSelfAccessPosition(Boolean implicitlyBorrowed) or
+    TPositionalAccessPosition(int pos) { exists(TPositionalDeclarationPosition(pos)) } or
     TReturnAccessPosition()
 
   class AccessPosition extends TAccessPosition {
-    predicate isSelf() { this = TSelfAccessPosition() }
+    predicate isSelf(boolean implicitlyBorrowed) { this = TSelfAccessPosition(implicitlyBorrowed) }
 
-    int asPosition(boolean isMethodCall) { this = TPositionalAccessPosition(result, isMethodCall) }
+    int asPosition() { this = TPositionalAccessPosition(result) }
 
     predicate isReturn() { this = TReturnAccessPosition() }
 
     string toString() {
-      this.isSelf() and
+      this.isSelf(_) and
       result = "self"
       or
-      result = this.asPosition(_).toString()
+      result = this.asPosition().toString()
       or
       this.isReturn() and
       result = "(return)"
@@ -620,95 +664,42 @@ private module CallExprBaseMatchingInput implements MatchingInputSig {
 
   private import codeql.rust.elements.internal.CallExprImpl::Impl as CallExprImpl
 
-  abstract class Access extends Expr {
-    abstract Type getTypeArgument(TypeArgumentPosition apos, TypePath path);
-
-    abstract AstNode getNodeAt(AccessPosition apos);
-
-    abstract Type getInferredType(AccessPosition apos, TypePath path);
-
-    abstract Declaration getTarget();
-  }
-
-  private class CallExprBaseAccess extends Access instanceof CallExprBase {
-    private TypeMention getMethodTypeArg(int i) {
-      result = this.(MethodCallExpr).getGenericArgList().getTypeArg(i)
-    }
-
-    override Type getTypeArgument(TypeArgumentPosition apos, TypePath path) {
+  final class Access extends Call {
+    Type getTypeArgument(TypeArgumentPosition apos, TypePath path) {
       exists(TypeMention arg | result = arg.resolveTypeAt(path) |
         arg = getExplicitTypeArgMention(CallExprImpl::getFunctionPath(this), apos.asTypeParam())
         or
-        arg = this.getMethodTypeArg(apos.asMethodTypeArgumentPosition())
+        arg =
+          this.(MethodCallExpr).getGenericArgList().getTypeArg(apos.asMethodTypeArgumentPosition())
       )
     }
 
-    override AstNode getNodeAt(AccessPosition apos) {
-      exists(int p, boolean isMethodCall |
-        argPos(this, result, p, isMethodCall) and
-        apos = TPositionalAccessPosition(p, isMethodCall)
-      )
+    AstNode getNodeAt(AccessPosition apos) {
+      result = this.getArgument(apos.asPosition())
       or
-      result = this.(MethodCallExpr).getReceiver() and
-      apos = TSelfAccessPosition()
+      result = this.getReceiver() and
+      if this.receiverImplicitlyBorrowed() then apos.isSelf(true) else apos.isSelf(false)
       or
-      result = this and
-      apos = TReturnAccessPosition()
+      result = this and apos.isReturn()
     }
 
-    override Type getInferredType(AccessPosition apos, TypePath path) {
+    Type getInferredType(AccessPosition apos, TypePath path) {
       result = inferType(this.getNodeAt(apos), path)
     }
 
-    override Declaration getTarget() {
+    Declaration getTarget() {
+      result = inferMethodCallTarget(this) // mutual recursion; resolving method calls requires resolving types and vice versa
+      or
       result = CallExprImpl::getResolvedFunction(this)
-      or
-      result = inferMethodCallTarget(this) // mutual recursion; resolving method calls requires resolving types and vice versa
-    }
-  }
-
-  private class OperationAccess extends Access instanceof Operation {
-    OperationAccess() { super.isOverloaded(_, _) }
-
-    override Type getTypeArgument(TypeArgumentPosition apos, TypePath path) {
-      // The syntax for operators does not allow type arguments.
-      none()
-    }
-
-    override AstNode getNodeAt(AccessPosition apos) {
-      result = super.getOperand(0) and apos = TSelfAccessPosition()
-      or
-      result = super.getOperand(1) and apos = TPositionalAccessPosition(0, true)
-      or
-      result = this and apos = TReturnAccessPosition()
-    }
-
-    override Type getInferredType(AccessPosition apos, TypePath path) {
-      result = inferType(this.getNodeAt(apos), path)
-    }
-
-    override Declaration getTarget() {
-      result = inferMethodCallTarget(this) // mutual recursion; resolving method calls requires resolving types and vice versa
     }
   }
 
   predicate accessDeclarationPositionMatch(AccessPosition apos, DeclarationPosition dpos) {
-    apos.isSelf() and
-    dpos.isSelf()
+    apos.isSelf(_) and dpos.isSelf()
     or
-    exists(int pos, boolean isMethodCall | pos = apos.asPosition(isMethodCall) |
-      pos = 0 and
-      isMethodCall = false and
-      dpos.isSelf()
-      or
-      isMethodCall = false and
-      pos = dpos.asPosition(true) + 1
-      or
-      pos = dpos.asPosition(isMethodCall)
-    )
+    apos.asPosition() = dpos.asPosition()
     or
-    apos.isReturn() and
-    dpos.isReturn()
+    apos.isReturn() and dpos.isReturn()
   }
 
   bindingset[apos, target, path, t]
@@ -716,7 +707,7 @@ private module CallExprBaseMatchingInput implements MatchingInputSig {
   predicate adjustAccessType(
     AccessPosition apos, Declaration target, TypePath path, Type t, TypePath pathAdj, Type tAdj
   ) {
-    if apos.isSelf()
+    if apos.isSelf(true)
     then
       exists(Type selfParamType |
         selfParamType = target.getParameterType(TSelfDeclarationPosition(), TypePath::nil())
@@ -776,7 +767,7 @@ private Type inferCallExprBaseType(AstNode n, TypePath path) {
     n = a.getNodeAt(apos) and
     result = CallExprBaseMatching::inferAccessType(a, apos, path0)
   |
-    if apos.isSelf()
+    if apos.isSelf(_)
     then
       exists(Type receiverType | receiverType = inferType(n) |
         if receiverType = TRefType()
@@ -932,43 +923,9 @@ private Type inferFieldExprType(AstNode n, TypePath path) {
   )
 }
 
-/**
- * Gets the type of `n` at `path`, where `n` is either a reference expression
- * `& x` or an expression `x` inside a reference expression `& x`.
- */
+/** Gets the root type of the reference expression `re`. */
 pragma[nomagic]
-private Type inferRefExprType(Expr e, TypePath path) {
-  exists(RefExpr re |
-    e = re and
-    path.isEmpty() and
-    result = TRefType()
-    or
-    e = re and
-    exists(TypePath exprPath | result = inferType(re.getExpr(), exprPath) |
-      if exprPath.isCons(TRefTypeParameter(), _)
-      then
-        // `&x` simply means `x` when `x` already has reference type
-        path = exprPath
-      else (
-        path = TypePath::cons(TRefTypeParameter(), exprPath) and
-        not (exprPath.isEmpty() and result = TRefType())
-      )
-    )
-    or
-    e = re.getExpr() and
-    exists(TypePath exprPath, TypePath refPath, Type exprType |
-      result = inferType(re, exprPath) and
-      exprPath.isCons(TRefTypeParameter(), refPath) and
-      exprType = inferType(e)
-    |
-      if exprType = TRefType()
-      then
-        // `&x` simply means `x` when `x` already has reference type
-        path = exprPath
-      else path = refPath
-    )
-  )
-}
+private Type inferRefExprType(RefExpr re) { exists(re) and result = TRefType() }
 
 pragma[nomagic]
 private Type inferTryExprType(TryExpr te, TypePath path) {
@@ -1010,31 +967,169 @@ private StructType inferLiteralType(LiteralExpr le) {
   )
 }
 
-private module MethodCall {
-  /** An expression that calls a method. */
-  abstract private class MethodCallImpl extends Expr {
-    /** Gets the name of the method targeted. */
-    abstract string getMethodName();
+pragma[nomagic]
+private TraitType getFutureTraitType() { result.getTrait() instanceof FutureTrait }
 
-    /** Gets the number of arguments _excluding_ the `self` argument. */
-    abstract int getArity();
+pragma[nomagic]
+private AssociatedTypeTypeParameter getFutureOutputTypeParameter() {
+  result.getTypeAlias() = any(FutureTrait ft).getOutputType()
+}
 
-    /** Gets the trait targeted by this method call, if any. */
-    Trait getTrait() { none() }
+/**
+ * A matching configuration for resolving types of `.await` expressions.
+ */
+private module AwaitExprMatchingInput implements MatchingInputSig {
+  private newtype TDeclarationPosition =
+    TSelfDeclarationPosition() or
+    TOutputPos()
 
-    /** Gets the type of the receiver of the method call at `path`. */
-    abstract Type getTypeAt(TypePath path);
+  class DeclarationPosition extends TDeclarationPosition {
+    predicate isSelf() { this = TSelfDeclarationPosition() }
+
+    predicate isOutput() { this = TOutputPos() }
+
+    string toString() {
+      this.isSelf() and
+      result = "self"
+      or
+      this.isOutput() and
+      result = "(output)"
+    }
   }
 
-  final class MethodCall = MethodCallImpl;
+  private class BuiltinsAwaitFile extends File {
+    BuiltinsAwaitFile() {
+      this.getBaseName() = "await.rs" and
+      this.getParentContainer() instanceof Builtins::BuiltinsFolder
+    }
+  }
 
-  private class MethodCallExprMethodCall extends MethodCallImpl instanceof MethodCallExpr {
-    override string getMethodName() { result = super.getIdentifier().getText() }
+  class Declaration extends Function {
+    Declaration() {
+      this.getFile() instanceof BuiltinsAwaitFile and
+      this.getName().getText() = "await_type_matching"
+    }
 
-    override int getArity() { result = super.getArgList().getNumberOfArgs() }
+    TypeParameter getTypeParameter(TypeParameterPosition ppos) {
+      typeParamMatchPosition(this.getGenericParamList().getATypeParam(), result, ppos)
+    }
 
-    pragma[nomagic]
-    override Type getTypeAt(TypePath path) {
+    Type getDeclaredType(DeclarationPosition dpos, TypePath path) {
+      dpos.isSelf() and
+      result = this.getParam(0).getTypeRepr().(TypeMention).resolveTypeAt(path)
+      or
+      dpos.isOutput() and
+      result = this.getRetType().getTypeRepr().(TypeMention).resolveTypeAt(path)
+    }
+  }
+
+  class AccessPosition = DeclarationPosition;
+
+  class Access extends AwaitExpr {
+    Type getTypeArgument(TypeArgumentPosition apos, TypePath path) { none() }
+
+    AstNode getNodeAt(AccessPosition apos) {
+      result = this.getExpr() and
+      apos.isSelf()
+      or
+      result = this and
+      apos.isOutput()
+    }
+
+    Type getInferredType(AccessPosition apos, TypePath path) {
+      result = inferType(this.getNodeAt(apos), path)
+    }
+
+    Declaration getTarget() { exists(this) and exists(result) }
+  }
+
+  predicate accessDeclarationPositionMatch(AccessPosition apos, DeclarationPosition dpos) {
+    apos = dpos
+  }
+}
+
+pragma[nomagic]
+private TraitType inferAsyncBlockExprRootType(AsyncBlockExpr abe) {
+  // `typeEquality` handles the non-root case
+  exists(abe) and
+  result = getFutureTraitType()
+}
+
+private module AwaitExprMatching = Matching<AwaitExprMatchingInput>;
+
+pragma[nomagic]
+private Type inferAwaitExprType(AstNode n, TypePath path) {
+  exists(AwaitExprMatchingInput::Access a, AwaitExprMatchingInput::AccessPosition apos |
+    n = a.getNodeAt(apos) and
+    result = AwaitExprMatching::inferAccessType(a, apos, path)
+  )
+  or
+  // This case is needed for `async` functions and blocks, where we assign
+  // the type `Future<Output = T>` directly instead of `impl Future<Output = T>`
+  //
+  // TODO: It would be better if we could handle this in the shared library
+  exists(TypePath exprPath |
+    result = inferType(n.(AwaitExpr).getExpr(), exprPath) and
+    exprPath.isCons(getFutureOutputTypeParameter(), path)
+  )
+}
+
+private class Vec extends Struct {
+  Vec() { this.getCanonicalPath() = "alloc::vec::Vec" }
+
+  TypeParamTypeParameter getElementTypeParameter() {
+    result.getTypeParam() = this.getGenericParamList().getTypeParam(0)
+  }
+}
+
+/**
+ * According to [the Rust reference][1]: _"array and slice-typed expressions
+ * can be indexed with a `usize` index ... For other types an index expression
+ * `a[b]` is equivalent to *std::ops::Index::index(&a, b)"_.
+ *
+ * The logic below handles array and slice indexing, but for other types it is
+ * currently limited to `Vec`.
+ *
+ * [1]: https://doc.rust-lang.org/reference/expressions/array-expr.html#r-expr.array.index
+ */
+pragma[nomagic]
+private Type inferIndexExprType(IndexExpr ie, TypePath path) {
+  // TODO: Should be implemented as method resolution, using the special
+  // `std::ops::Index` trait.
+  exists(TypePath exprPath, Builtins::BuiltinType t |
+    TStruct(t) = inferType(ie.getIndex()) and
+    (
+      // also allow `i32`, since that is currently the type that we infer for
+      // integer literals like `0`
+      t instanceof Builtins::I32
+      or
+      t instanceof Builtins::Usize
+    ) and
+    result = inferType(ie.getBase(), exprPath)
+  |
+    exprPath.isCons(any(Vec v).getElementTypeParameter(), path)
+    or
+    exprPath.isCons(any(ArrayTypeParameter tp), path)
+    or
+    exists(TypePath path0 |
+      exprPath.isCons(any(RefTypeParameter tp), path0) and
+      path0.isCons(any(SliceTypeParameter tp), path)
+    )
+  )
+}
+
+final class MethodCall extends Call {
+  MethodCall() {
+    exists(this.getReceiver()) and
+    // We want the method calls that don't have a path to a concrete method in
+    // an impl block. We need to exclude calls like `MyType::my_method(..)`.
+    (this instanceof CallExpr implies exists(this.getTrait()))
+  }
+
+  /** Gets the type of the receiver of the method call at `path`. */
+  Type getTypeAt(TypePath path) {
+    if this.receiverImplicitlyBorrowed()
+    then
       exists(TypePath path0 | result = inferType(super.getReceiver(), path0) |
         path0.isCons(TRefTypeParameter(), path)
         or
@@ -1042,59 +1137,10 @@ private module MethodCall {
         not (path0.isEmpty() and result = TRefType()) and
         path = path0
       )
-    }
-  }
-
-  private class CallExprMethodCall extends MethodCallImpl instanceof CallExpr {
-    TraitItemNode trait;
-    string methodName;
-    Expr receiver;
-
-    CallExprMethodCall() {
-      receiver = this.getArgList().getArg(0) and
-      exists(Path path, Function f |
-        path = this.getFunction().(PathExpr).getPath() and
-        f = resolvePath(path) and
-        f.getParamList().hasSelfParam() and
-        trait = resolvePath(path.getQualifier()) and
-        trait.getAnAssocItem() = f and
-        path.getSegment().getIdentifier().getText() = methodName
-      )
-    }
-
-    override string getMethodName() { result = methodName }
-
-    override int getArity() { result = super.getArgList().getNumberOfArgs() - 1 }
-
-    override Trait getTrait() { result = trait }
-
-    pragma[nomagic]
-    override Type getTypeAt(TypePath path) { result = inferType(receiver, path) }
-  }
-
-  private class OperationMethodCall extends MethodCallImpl instanceof Operation {
-    TraitItemNode trait;
-    string methodName;
-
-    OperationMethodCall() { super.isOverloaded(trait, methodName) }
-
-    override string getMethodName() { result = methodName }
-
-    override int getArity() { result = this.(Operation).getNumberOfOperands() - 1 }
-
-    override Trait getTrait() { result = trait }
-
-    pragma[nomagic]
-    override Type getTypeAt(TypePath path) {
-      result = inferType(this.(BinaryExpr).getLhs(), path)
-      or
-      result = inferType(this.(PrefixExpr).getExpr(), path)
-    }
+    else result = inferType(super.getReceiver(), path)
   }
 }
 
-import MethodCall
-
 /**
  * Holds if a method for `type` with the name `name` and the arity `arity`
  * exists in `impl`.
@@ -1119,12 +1165,17 @@ private predicate methodCandidateTrait(Type type, Trait trait, string name, int
 }
 
 private module IsInstantiationOfInput implements IsInstantiationOfInputSig<MethodCall> {
+  pragma[nomagic]
+  private predicate isMethodCall(MethodCall mc, Type rootType, string name, int arity) {
+    rootType = mc.getTypeAt(TypePath::nil()) and
+    name = mc.getMethodName() and
+    arity = mc.getNumberOfArguments()
+  }
+
   pragma[nomagic]
   predicate potentialInstantiationOf(MethodCall mc, TypeAbstraction impl, TypeMention constraint) {
     exists(Type rootType, string name, int arity |
-      rootType = mc.getTypeAt(TypePath::nil()) and
-      name = mc.getMethodName() and
-      arity = mc.getArity() and
+      isMethodCall(mc, rootType, name, arity) and
       constraint = impl.(ImplTypeAbstraction).getSelfTy()
     |
       methodCandidateTrait(rootType, mc.getTrait(), name, arity, impl)
@@ -1151,6 +1202,8 @@ private Function getTypeParameterMethod(TypeParameter tp, string name) {
   result = getMethodSuccessor(tp.(TypeParamTypeParameter).getTypeParam(), name)
   or
   result = getMethodSuccessor(tp.(SelfTypeParameter).getTrait(), name)
+  or
+  result = getMethodSuccessor(tp.(ImplTraitTypeTypeParameter).getImplTraitTypeRepr(), name)
 }
 
 /** Gets a method from an `impl` block that matches the method call `mc`. */
@@ -1161,6 +1214,12 @@ private Function getMethodFromImpl(MethodCall mc) {
   )
 }
 
+bindingset[trait, name]
+pragma[inline_late]
+private Function getTraitMethod(ImplTraitReturnType trait, string name) {
+  result = getMethodSuccessor(trait.getImplTraitTypeRepr(), name)
+}
+
 /**
  * Gets a method that the method call `mc` resolves to based on type inference,
  * if any.
@@ -1172,6 +1231,9 @@ private Function inferMethodCallTarget(MethodCall mc) {
   // The type of the receiver is a type parameter and the method comes from a
   // trait bound on the type parameter.
   result = getTypeParameterMethod(mc.getTypeAt(TypePath::nil()), mc.getMethodName())
+  or
+  // The type of the receiver is an `impl Trait` type.
+  result = getTraitMethod(mc.getTypeAt(TypePath::nil()), mc.getMethodName())
 }
 
 cached
@@ -1182,7 +1244,7 @@ private module Cached {
   cached
   predicate receiverHasImplicitDeref(AstNode receiver) {
     exists(CallExprBaseMatchingInput::Access a, CallExprBaseMatchingInput::AccessPosition apos |
-      apos.isSelf() and
+      apos.isSelf(true) and
       receiver = a.getNodeAt(apos) and
       inferType(receiver) = TRefType() and
       CallExprBaseMatching::inferAccessType(a, apos, TypePath::nil()) != TRefType()
@@ -1193,7 +1255,7 @@ private module Cached {
   cached
   predicate receiverHasImplicitBorrow(AstNode receiver) {
     exists(CallExprBaseMatchingInput::Access a, CallExprBaseMatchingInput::AccessPosition apos |
-      apos.isSelf() and
+      apos.isSelf(true) and
       receiver = a.getNodeAt(apos) and
       CallExprBaseMatching::inferAccessType(a, apos, TypePath::nil()) = TRefType() and
       inferType(receiver) != TRefType()
@@ -1341,12 +1403,20 @@ private module Cached {
     or
     result = inferFieldExprType(n, path)
     or
-    result = inferRefExprType(n, path)
+    result = inferRefExprType(n) and
+    path.isEmpty()
     or
     result = inferTryExprType(n, path)
     or
     result = inferLiteralType(n) and
     path.isEmpty()
+    or
+    result = inferAsyncBlockExprRootType(n) and
+    path.isEmpty()
+    or
+    result = inferAwaitExprType(n, path)
+    or
+    result = inferIndexExprType(n, path)
   }
 }
 
@@ -1363,7 +1433,7 @@ private module Debug {
     exists(string filepath, int startline, int startcolumn, int endline, int endcolumn |
       result.getLocation().hasLocationInfo(filepath, startline, startcolumn, endline, endcolumn) and
       filepath.matches("%/main.rs") and
-      startline = 948
+      startline = 1718
     )
   }
 
@@ -1376,4 +1446,15 @@ private module Debug {
     mce = getRelevantLocatable() and
     result = resolveMethodCallTarget(mce)
   }
+
+  pragma[nomagic]
+  private int countTypes(AstNode n, TypePath path, Type t) {
+    t = inferType(n, path) and
+    result = strictcount(Type t0 | t0 = inferType(n, path))
+  }
+
+  predicate maxTypes(AstNode n, TypePath path, Type t, int c) {
+    c = countTypes(n, path, t) and
+    c = max(countTypes(_, _, _))
+  }
 }
diff --git a/rust/ql/lib/codeql/rust/internal/TypeMention.qll b/rust/ql/lib/codeql/rust/internal/TypeMention.qll
index 7e947a35bc4..f14291103c7 100644
--- a/rust/ql/lib/codeql/rust/internal/TypeMention.qll
+++ b/rust/ql/lib/codeql/rust/internal/TypeMention.qll
@@ -15,7 +15,7 @@ abstract class TypeMention extends AstNode {
 
   /** Gets the sub mention at `path`. */
   pragma[nomagic]
-  private TypeMention getMentionAt(TypePath path) {
+  TypeMention getMentionAt(TypePath path) {
     path.isEmpty() and
     result = this
     or
@@ -43,6 +43,12 @@ class RefTypeReprMention extends TypeMention instanceof RefTypeRepr {
   override Type resolveType() { result = TRefType() }
 }
 
+class SliceTypeReprMention extends TypeMention instanceof SliceTypeRepr {
+  override TypeMention getTypeArgument(int i) { result = super.getTypeRepr() and i = 0 }
+
+  override Type resolveType() { result = TSliceType() }
+}
+
 class PathTypeReprMention extends TypeMention instanceof PathTypeRepr {
   Path path;
   ItemNode resolved;
@@ -56,6 +62,29 @@ class PathTypeReprMention extends TypeMention instanceof PathTypeRepr {
 
   ItemNode getResolved() { result = resolved }
 
+  pragma[nomagic]
+  private TypeAlias getResolvedTraitAlias(string name) {
+    exists(TraitItemNode trait |
+      trait = resolvePath(path) and
+      result = trait.getAnAssocItem() and
+      name = result.getName().getText()
+    )
+  }
+
+  pragma[nomagic]
+  private TypeRepr getAssocTypeArg(string name) {
+    result = path.getSegment().getGenericArgList().getAssocTypeArg(name)
+  }
+
+  /** Gets the type argument for the associated type `alias`, if any. */
+  pragma[nomagic]
+  private TypeRepr getAnAssocTypeArgument(TypeAlias alias) {
+    exists(string name |
+      alias = this.getResolvedTraitAlias(name) and
+      result = this.getAssocTypeArg(name)
+    )
+  }
+
   override TypeMention getTypeArgument(int i) {
     result = path.getSegment().getGenericArgList().getTypeArg(i)
     or
@@ -96,12 +125,18 @@ class PathTypeReprMention extends TypeMention instanceof PathTypeRepr {
       result = alias.getTypeRepr() and
       param.getIndex() = i
     )
+    or
+    exists(TypeAlias alias |
+      result = this.getAnAssocTypeArgument(alias) and
+      traitAliasIndex(_, i, alias)
+    )
   }
 
   /**
    * Holds if this path resolved to a type alias with a rhs. that has the
    * resulting type at `typePath`.
    */
+  pragma[nomagic]
   Type aliasResolveTypeAt(TypePath typePath) {
     exists(TypeAlias alias, TypeMention rhs | alias = resolved and rhs = alias.getTypeRepr() |
       result = rhs.resolveTypeAt(typePath) and
@@ -152,6 +187,12 @@ class PathTypeReprMention extends TypeMention instanceof PathTypeRepr {
   }
 }
 
+class ImplTraitTypeReprMention extends TypeMention instanceof ImplTraitTypeRepr {
+  override TypeMention getTypeArgument(int i) { none() }
+
+  override ImplTraitType resolveType() { result.getImplTraitTypeRepr() = this }
+}
+
 private TypeParameter pathGetTypeParameter(TypeAlias alias, int i) {
   result = TTypeParamTypeParameter(alias.getGenericParamList().getTypeParam(i))
 }
diff --git a/rust/ql/lib/codeql/rust/security/regex/RegexInjectionExtensions.qll b/rust/ql/lib/codeql/rust/security/regex/RegexInjectionExtensions.qll
index 4daff543b98..61d26f2f938 100644
--- a/rust/ql/lib/codeql/rust/security/regex/RegexInjectionExtensions.qll
+++ b/rust/ql/lib/codeql/rust/security/regex/RegexInjectionExtensions.qll
@@ -53,11 +53,10 @@ module RegexInjection {
    */
   private class NewSink extends Sink {
     NewSink() {
-      exists(CallExprCfgNode call, PathExpr path |
-        path = call.getFunction().getExpr() and
-        path.getResolvedCrateOrigin() = "repo:https://github.com/rust-lang/regex:regex" and
-        path.getResolvedPath() = "<crate::regex::string::Regex>::new" and
-        this.asExpr() = call.getArgument(0) and
+      exists(CallExprBase call, Addressable a |
+        call.getStaticTarget() = a and
+        a.getCanonicalPath() = "<regex::regex::string::Regex>::new" and
+        this.asExpr().getExpr() = call.getArg(0) and
         not this.asExpr() instanceof LiteralExprCfgNode
       )
     }
diff --git a/rust/ql/lib/ext/generated/actix-web/repo-https-github.com-actix-actix-web-actix-files.model.yml b/rust/ql/lib/ext/generated/actix-web/repo-https-github.com-actix-actix-web-actix-files.model.yml
index ed7c81cde18..50981fcdb5c 100644
--- a/rust/ql/lib/ext/generated/actix-web/repo-https-github.com-actix-actix-web-actix-files.model.yml
+++ b/rust/ql/lib/ext/generated/actix-web/repo-https-github.com-actix-actix-web-actix-files.model.yml
@@ -6,6 +6,7 @@ extensions:
     data:
       - ["repo:https://github.com/actix/actix-web:actix-files", "<crate::directory::Directory>::new", "Argument[0]", "ReturnValue.Field[crate::directory::Directory::base]", "value", "dfc-generated"]
       - ["repo:https://github.com/actix/actix-web:actix-files", "<crate::directory::Directory>::new", "Argument[1]", "ReturnValue.Field[crate::directory::Directory::path]", "value", "dfc-generated"]
+      - ["repo:https://github.com/actix/actix-web:actix-files", "<crate::files::Files as crate::ServiceFactory>::new_service", "Argument[self]", "ReturnValue", "taint", "df-generated"]
       - ["repo:https://github.com/actix/actix-web:actix-files", "<crate::files::Files as crate::clone::Clone>::clone", "Argument[self]", "ReturnValue", "taint", "df-generated"]
       - ["repo:https://github.com/actix/actix-web:actix-files", "<crate::files::Files>::default_handler", "Argument[self]", "ReturnValue", "value", "dfc-generated"]
       - ["repo:https://github.com/actix/actix-web:actix-files", "<crate::files::Files>::disable_content_disposition", "Argument[self]", "ReturnValue", "value", "dfc-generated"]
@@ -22,6 +23,7 @@ extensions:
       - ["repo:https://github.com/actix/actix-web:actix-files", "<crate::files::Files>::use_guards", "Argument[self]", "ReturnValue", "value", "dfc-generated"]
       - ["repo:https://github.com/actix/actix-web:actix-files", "<crate::files::Files>::use_hidden_files", "Argument[self]", "ReturnValue", "value", "dfc-generated"]
       - ["repo:https://github.com/actix/actix-web:actix-files", "<crate::files::Files>::use_last_modified", "Argument[self]", "ReturnValue", "value", "dfc-generated"]
+      - ["repo:https://github.com/actix/actix-web:actix-files", "<crate::named::NamedFile as crate::ServiceFactory>::new_service", "Argument[self]", "ReturnValue", "taint", "df-generated"]
       - ["repo:https://github.com/actix/actix-web:actix-files", "<crate::named::NamedFile>::content_disposition", "Argument[self].Field[crate::named::NamedFile::content_disposition]", "ReturnValue.Reference", "value", "dfc-generated"]
       - ["repo:https://github.com/actix/actix-web:actix-files", "<crate::named::NamedFile>::content_encoding", "Argument[self].Field[crate::named::NamedFile::encoding]", "ReturnValue", "value", "dfc-generated"]
       - ["repo:https://github.com/actix/actix-web:actix-files", "<crate::named::NamedFile>::content_type", "Argument[self].Field[crate::named::NamedFile::content_type]", "ReturnValue.Reference", "value", "dfc-generated"]
@@ -49,10 +51,22 @@ extensions:
       - ["repo:https://github.com/actix/actix-web:actix-files", "<crate::named::NamedFile>::set_status_code", "Argument[self]", "ReturnValue", "value", "dfc-generated"]
       - ["repo:https://github.com/actix/actix-web:actix-files", "<crate::named::NamedFile>::use_etag", "Argument[self]", "ReturnValue", "value", "dfc-generated"]
       - ["repo:https://github.com/actix/actix-web:actix-files", "<crate::named::NamedFile>::use_last_modified", "Argument[self]", "ReturnValue", "value", "dfc-generated"]
+      - ["repo:https://github.com/actix/actix-web:actix-files", "<crate::named::NamedFileService as crate::Service>::call", "Argument[self].Field[crate::named::NamedFileService::path].Reference", "ReturnValue.Reference", "value", "dfc-generated"]
+      - ["repo:https://github.com/actix/actix-web:actix-files", "<crate::named::NamedFileService as crate::Service>::call", "Argument[self].Field[crate::named::NamedFileService::path]", "ReturnValue.Reference", "value", "dfc-generated"]
       - ["repo:https://github.com/actix/actix-web:actix-files", "<crate::path_buf::PathBufWrap as crate::convert::AsRef>::as_ref", "Argument[self]", "ReturnValue", "taint", "df-generated"]
+      - ["repo:https://github.com/actix/actix-web:actix-files", "<crate::service::FilesService as crate::Service>::call", "Argument[0]", "ReturnValue.Reference", "value", "dfc-generated"]
+      - ["repo:https://github.com/actix/actix-web:actix-files", "<crate::service::FilesService as crate::Service>::call", "Argument[self].Reference", "ReturnValue.Reference", "value", "dfc-generated"]
       - ["repo:https://github.com/actix/actix-web:actix-files", "<crate::service::FilesService as crate::ops::deref::Deref>::deref", "Argument[self].Field[0]", "ReturnValue.Reference", "value", "dfc-generated"]
       - ["repo:https://github.com/actix/actix-web:actix-files", "<crate::service::FilesService as crate::ops::deref::Deref>::deref", "Argument[self].Field[crate::service::FilesService(0)]", "ReturnValue.Reference", "value", "dfc-generated"]
       - ["repo:https://github.com/actix/actix-web:actix-files", "crate::chunked::new_chunked_read", "Argument[0]", "ReturnValue.Field[crate::chunked::ChunkedReadFile::size]", "value", "dfc-generated"]
       - ["repo:https://github.com/actix/actix-web:actix-files", "crate::chunked::new_chunked_read", "Argument[1]", "ReturnValue.Field[crate::chunked::ChunkedReadFile::offset]", "value", "dfc-generated"]
       - ["repo:https://github.com/actix/actix-web:actix-files", "crate::directory::directory_listing", "Argument[1].Reference", "ReturnValue.Field[crate::result::Result::Ok(0)].Field[crate::service::ServiceResponse::request]", "value", "dfc-generated"]
       - ["repo:https://github.com/actix/actix-web:actix-files", "crate::encoding::equiv_utf8_text", "Argument[0]", "ReturnValue", "value", "dfc-generated"]
+  - addsTo:
+      pack: codeql/rust-all
+      extensible: sinkModel
+    data:
+      - ["repo:https://github.com/actix/actix-web:actix-files", "<crate::named::NamedFile as crate::response::responder::Responder>::respond_to", "Argument[self]", "pointer-access", "df-generated"]
+      - ["repo:https://github.com/actix/actix-web:actix-files", "<crate::named::NamedFile>::into_response", "Argument[self]", "pointer-access", "df-generated"]
+      - ["repo:https://github.com/actix/actix-web:actix-files", "<crate::named::NamedFile>::last_modified", "Argument[self]", "pointer-access", "df-generated"]
+      - ["repo:https://github.com/actix/actix-web:actix-files", "crate::directory::directory_listing", "Argument[0]", "path-injection", "df-generated"]
diff --git a/rust/ql/lib/ext/generated/actix-web/repo-https-github.com-actix-actix-web-actix-http-test.model.yml b/rust/ql/lib/ext/generated/actix-web/repo-https-github.com-actix-actix-web-actix-http-test.model.yml
index e76569692ab..71c599dd54e 100644
--- a/rust/ql/lib/ext/generated/actix-web/repo-https-github.com-actix-actix-web-actix-http-test.model.yml
+++ b/rust/ql/lib/ext/generated/actix-web/repo-https-github.com-actix-actix-web-actix-http-test.model.yml
@@ -5,36 +5,6 @@ extensions:
       extensible: summaryModel
     data:
       - ["repo:https://github.com/actix/actix-web:actix-http-test", "<crate::TestServer>::addr", "Argument[self].Field[crate::TestServer::addr]", "ReturnValue", "value", "dfc-generated"]
-      - ["repo:https://github.com/actix/actix-web:actix-http-test", "<crate::TestServer>::delete", "Argument[self].Field[crate::TestServer::client].Field[0]", "ReturnValue.Field[crate::request::ClientRequest::config]", "value", "dfc-generated"]
-      - ["repo:https://github.com/actix/actix-web:actix-http-test", "<crate::TestServer>::delete", "Argument[self].Field[crate::TestServer::client].Field[crate::client::Client(0)]", "ReturnValue.Field[crate::request::ClientRequest::config]", "value", "dfc-generated"]
-      - ["repo:https://github.com/actix/actix-web:actix-http-test", "<crate::TestServer>::get", "Argument[self].Field[crate::TestServer::client].Field[0]", "ReturnValue.Field[crate::request::ClientRequest::config]", "value", "dfc-generated"]
-      - ["repo:https://github.com/actix/actix-web:actix-http-test", "<crate::TestServer>::get", "Argument[self].Field[crate::TestServer::client].Field[crate::client::Client(0)]", "ReturnValue.Field[crate::request::ClientRequest::config]", "value", "dfc-generated"]
-      - ["repo:https://github.com/actix/actix-web:actix-http-test", "<crate::TestServer>::head", "Argument[self].Field[crate::TestServer::client].Field[0]", "ReturnValue.Field[crate::request::ClientRequest::config]", "value", "dfc-generated"]
-      - ["repo:https://github.com/actix/actix-web:actix-http-test", "<crate::TestServer>::head", "Argument[self].Field[crate::TestServer::client].Field[crate::client::Client(0)]", "ReturnValue.Field[crate::request::ClientRequest::config]", "value", "dfc-generated"]
-      - ["repo:https://github.com/actix/actix-web:actix-http-test", "<crate::TestServer>::options", "Argument[self].Field[crate::TestServer::client].Field[0]", "ReturnValue.Field[crate::request::ClientRequest::config]", "value", "dfc-generated"]
-      - ["repo:https://github.com/actix/actix-web:actix-http-test", "<crate::TestServer>::options", "Argument[self].Field[crate::TestServer::client].Field[crate::client::Client(0)]", "ReturnValue.Field[crate::request::ClientRequest::config]", "value", "dfc-generated"]
-      - ["repo:https://github.com/actix/actix-web:actix-http-test", "<crate::TestServer>::patch", "Argument[self].Field[crate::TestServer::client].Field[0]", "ReturnValue.Field[crate::request::ClientRequest::config]", "value", "dfc-generated"]
-      - ["repo:https://github.com/actix/actix-web:actix-http-test", "<crate::TestServer>::patch", "Argument[self].Field[crate::TestServer::client].Field[crate::client::Client(0)]", "ReturnValue.Field[crate::request::ClientRequest::config]", "value", "dfc-generated"]
-      - ["repo:https://github.com/actix/actix-web:actix-http-test", "<crate::TestServer>::post", "Argument[self].Field[crate::TestServer::client].Field[0]", "ReturnValue.Field[crate::request::ClientRequest::config]", "value", "dfc-generated"]
-      - ["repo:https://github.com/actix/actix-web:actix-http-test", "<crate::TestServer>::post", "Argument[self].Field[crate::TestServer::client].Field[crate::client::Client(0)]", "ReturnValue.Field[crate::request::ClientRequest::config]", "value", "dfc-generated"]
-      - ["repo:https://github.com/actix/actix-web:actix-http-test", "<crate::TestServer>::put", "Argument[self].Field[crate::TestServer::client].Field[0]", "ReturnValue.Field[crate::request::ClientRequest::config]", "value", "dfc-generated"]
-      - ["repo:https://github.com/actix/actix-web:actix-http-test", "<crate::TestServer>::put", "Argument[self].Field[crate::TestServer::client].Field[crate::client::Client(0)]", "ReturnValue.Field[crate::request::ClientRequest::config]", "value", "dfc-generated"]
       - ["repo:https://github.com/actix/actix-web:actix-http-test", "<crate::TestServer>::request", "Argument[0]", "ReturnValue.Field[crate::request::ClientRequest::head].Field[crate::requests::head::RequestHead::method]", "value", "dfc-generated"]
-      - ["repo:https://github.com/actix/actix-web:actix-http-test", "<crate::TestServer>::request", "Argument[self].Field[crate::TestServer::client].Field[0]", "ReturnValue.Field[crate::request::ClientRequest::config]", "value", "dfc-generated"]
-      - ["repo:https://github.com/actix/actix-web:actix-http-test", "<crate::TestServer>::request", "Argument[self].Field[crate::TestServer::client].Field[crate::client::Client(0)]", "ReturnValue.Field[crate::request::ClientRequest::config]", "value", "dfc-generated"]
-      - ["repo:https://github.com/actix/actix-web:actix-http-test", "<crate::TestServer>::sdelete", "Argument[self].Field[crate::TestServer::client].Field[0]", "ReturnValue.Field[crate::request::ClientRequest::config]", "value", "dfc-generated"]
-      - ["repo:https://github.com/actix/actix-web:actix-http-test", "<crate::TestServer>::sdelete", "Argument[self].Field[crate::TestServer::client].Field[crate::client::Client(0)]", "ReturnValue.Field[crate::request::ClientRequest::config]", "value", "dfc-generated"]
-      - ["repo:https://github.com/actix/actix-web:actix-http-test", "<crate::TestServer>::sget", "Argument[self].Field[crate::TestServer::client].Field[0]", "ReturnValue.Field[crate::request::ClientRequest::config]", "value", "dfc-generated"]
-      - ["repo:https://github.com/actix/actix-web:actix-http-test", "<crate::TestServer>::sget", "Argument[self].Field[crate::TestServer::client].Field[crate::client::Client(0)]", "ReturnValue.Field[crate::request::ClientRequest::config]", "value", "dfc-generated"]
-      - ["repo:https://github.com/actix/actix-web:actix-http-test", "<crate::TestServer>::shead", "Argument[self].Field[crate::TestServer::client].Field[0]", "ReturnValue.Field[crate::request::ClientRequest::config]", "value", "dfc-generated"]
-      - ["repo:https://github.com/actix/actix-web:actix-http-test", "<crate::TestServer>::shead", "Argument[self].Field[crate::TestServer::client].Field[crate::client::Client(0)]", "ReturnValue.Field[crate::request::ClientRequest::config]", "value", "dfc-generated"]
-      - ["repo:https://github.com/actix/actix-web:actix-http-test", "<crate::TestServer>::soptions", "Argument[self].Field[crate::TestServer::client].Field[0]", "ReturnValue.Field[crate::request::ClientRequest::config]", "value", "dfc-generated"]
-      - ["repo:https://github.com/actix/actix-web:actix-http-test", "<crate::TestServer>::soptions", "Argument[self].Field[crate::TestServer::client].Field[crate::client::Client(0)]", "ReturnValue.Field[crate::request::ClientRequest::config]", "value", "dfc-generated"]
-      - ["repo:https://github.com/actix/actix-web:actix-http-test", "<crate::TestServer>::spatch", "Argument[self].Field[crate::TestServer::client].Field[0]", "ReturnValue.Field[crate::request::ClientRequest::config]", "value", "dfc-generated"]
-      - ["repo:https://github.com/actix/actix-web:actix-http-test", "<crate::TestServer>::spatch", "Argument[self].Field[crate::TestServer::client].Field[crate::client::Client(0)]", "ReturnValue.Field[crate::request::ClientRequest::config]", "value", "dfc-generated"]
-      - ["repo:https://github.com/actix/actix-web:actix-http-test", "<crate::TestServer>::spost", "Argument[self].Field[crate::TestServer::client].Field[0]", "ReturnValue.Field[crate::request::ClientRequest::config]", "value", "dfc-generated"]
-      - ["repo:https://github.com/actix/actix-web:actix-http-test", "<crate::TestServer>::spost", "Argument[self].Field[crate::TestServer::client].Field[crate::client::Client(0)]", "ReturnValue.Field[crate::request::ClientRequest::config]", "value", "dfc-generated"]
-      - ["repo:https://github.com/actix/actix-web:actix-http-test", "<crate::TestServer>::sput", "Argument[self].Field[crate::TestServer::client].Field[0]", "ReturnValue.Field[crate::request::ClientRequest::config]", "value", "dfc-generated"]
-      - ["repo:https://github.com/actix/actix-web:actix-http-test", "<crate::TestServer>::sput", "Argument[self].Field[crate::TestServer::client].Field[crate::client::Client(0)]", "ReturnValue.Field[crate::request::ClientRequest::config]", "value", "dfc-generated"]
       - ["repo:https://github.com/actix/actix-web:actix-http-test", "<crate::TestServer>::surl", "Argument[0]", "ReturnValue", "taint", "df-generated"]
       - ["repo:https://github.com/actix/actix-web:actix-http-test", "<crate::TestServer>::url", "Argument[0]", "ReturnValue", "taint", "df-generated"]
diff --git a/rust/ql/lib/ext/generated/actix-web/repo-https-github.com-actix-actix-web-actix-http.model.yml b/rust/ql/lib/ext/generated/actix-web/repo-https-github.com-actix-actix-web-actix-http.model.yml
index f1e7d73e129..45decf0071c 100644
--- a/rust/ql/lib/ext/generated/actix-web/repo-https-github.com-actix-actix-web-actix-http.model.yml
+++ b/rust/ql/lib/ext/generated/actix-web/repo-https-github.com-actix-actix-web-actix-http.model.yml
@@ -7,21 +7,37 @@ extensions:
       - ["repo:https://github.com/actix/actix-web:actix-http", "<&crate::header::value::HeaderValue as crate::header::into_value::TryIntoHeaderValue>::try_into_value", "Argument[self].Reference", "ReturnValue.Field[crate::result::Result::Ok(0)]", "value", "dfc-generated"]
       - ["repo:https://github.com/actix/actix-web:actix-http", "<&str as crate::header::into_value::TryIntoHeaderValue>::try_into_value", "Argument[self]", "ReturnValue", "taint", "df-generated"]
       - ["repo:https://github.com/actix/actix-web:actix-http", "<crate::OnConnectData>::from_io", "Argument[1]", "Argument[0]", "taint", "df-generated"]
+      - ["repo:https://github.com/actix/actix-web:actix-http", "<crate::WsService as crate::Service>::call", "Argument[0]", "ReturnValue.Reference", "value", "dfc-generated"]
       - ["repo:https://github.com/actix/actix-web:actix-http", "<crate::body::body_stream::BodyStream>::new", "Argument[0]", "ReturnValue.Field[crate::body::body_stream::BodyStream::stream]", "value", "dfc-generated"]
       - ["repo:https://github.com/actix/actix-web:actix-http", "<crate::body::boxed::BoxBody as crate::body::message_body::MessageBody>::boxed", "Argument[self]", "ReturnValue", "value", "dfc-generated"]
       - ["repo:https://github.com/actix/actix-web:actix-http", "<crate::body::boxed::BoxBody as crate::body::message_body::MessageBody>::try_into_bytes", "Argument[self]", "ReturnValue.Field[crate::result::Result::Err(0)]", "value", "dfc-generated"]
+      - ["repo:https://github.com/actix/actix-web:actix-http", "<crate::body::boxed::BoxBody>::as_pin_mut", "Argument[self].Reference", "ReturnValue", "value", "dfc-generated"]
+      - ["repo:https://github.com/actix/actix-web:actix-http", "<crate::body::boxed::BoxBody>::as_pin_mut", "Argument[self]", "ReturnValue", "value", "dfc-generated"]
       - ["repo:https://github.com/actix/actix-web:actix-http", "<crate::body::message_body::MessageBodyMapErr>::new", "Argument[0]", "ReturnValue.Field[crate::body::message_body::MessageBodyMapErr::body]", "value", "dfc-generated"]
       - ["repo:https://github.com/actix/actix-web:actix-http", "<crate::body::message_body::MessageBodyMapErr>::new", "Argument[1]", "ReturnValue.Field[crate::body::message_body::MessageBodyMapErr::mapper].Field[crate::option::Option::Some(0)]", "value", "dfc-generated"]
       - ["repo:https://github.com/actix/actix-web:actix-http", "<crate::body::sized_stream::SizedStream as crate::body::message_body::MessageBody>::size", "Argument[self].Field[crate::body::sized_stream::SizedStream::size]", "ReturnValue.Field[crate::body::size::BodySize::Sized(0)]", "value", "dfc-generated"]
       - ["repo:https://github.com/actix/actix-web:actix-http", "<crate::body::sized_stream::SizedStream>::new", "Argument[0]", "ReturnValue.Field[crate::body::sized_stream::SizedStream::size]", "value", "dfc-generated"]
       - ["repo:https://github.com/actix/actix-web:actix-http", "<crate::body::sized_stream::SizedStream>::new", "Argument[1]", "ReturnValue.Field[crate::body::sized_stream::SizedStream::stream]", "value", "dfc-generated"]
+      - ["repo:https://github.com/actix/actix-web:actix-http", "<crate::builder::HttpServiceBuilder>::client_disconnect", "Argument[0]", "Argument[self].Field[crate::builder::HttpServiceBuilder::client_disconnect_timeout]", "value", "dfc-generated"]
+      - ["repo:https://github.com/actix/actix-web:actix-http", "<crate::builder::HttpServiceBuilder>::client_disconnect", "Argument[0]", "ReturnValue.Field[crate::builder::HttpServiceBuilder::client_disconnect_timeout]", "value", "dfc-generated"]
+      - ["repo:https://github.com/actix/actix-web:actix-http", "<crate::builder::HttpServiceBuilder>::client_disconnect", "Argument[self]", "ReturnValue", "value", "dfc-generated"]
       - ["repo:https://github.com/actix/actix-web:actix-http", "<crate::builder::HttpServiceBuilder>::client_disconnect_timeout", "Argument[0]", "Argument[self].Field[crate::builder::HttpServiceBuilder::client_disconnect_timeout]", "value", "dfc-generated"]
       - ["repo:https://github.com/actix/actix-web:actix-http", "<crate::builder::HttpServiceBuilder>::client_disconnect_timeout", "Argument[0]", "ReturnValue.Field[crate::builder::HttpServiceBuilder::client_disconnect_timeout]", "value", "dfc-generated"]
       - ["repo:https://github.com/actix/actix-web:actix-http", "<crate::builder::HttpServiceBuilder>::client_disconnect_timeout", "Argument[self]", "ReturnValue", "value", "dfc-generated"]
       - ["repo:https://github.com/actix/actix-web:actix-http", "<crate::builder::HttpServiceBuilder>::client_request_timeout", "Argument[0]", "Argument[self].Field[crate::builder::HttpServiceBuilder::client_request_timeout]", "value", "dfc-generated"]
       - ["repo:https://github.com/actix/actix-web:actix-http", "<crate::builder::HttpServiceBuilder>::client_request_timeout", "Argument[0]", "ReturnValue.Field[crate::builder::HttpServiceBuilder::client_request_timeout]", "value", "dfc-generated"]
       - ["repo:https://github.com/actix/actix-web:actix-http", "<crate::builder::HttpServiceBuilder>::client_request_timeout", "Argument[self]", "ReturnValue", "value", "dfc-generated"]
+      - ["repo:https://github.com/actix/actix-web:actix-http", "<crate::builder::HttpServiceBuilder>::client_timeout", "Argument[0]", "Argument[self].Field[crate::builder::HttpServiceBuilder::client_request_timeout]", "value", "dfc-generated"]
+      - ["repo:https://github.com/actix/actix-web:actix-http", "<crate::builder::HttpServiceBuilder>::client_timeout", "Argument[0]", "ReturnValue.Field[crate::builder::HttpServiceBuilder::client_request_timeout]", "value", "dfc-generated"]
+      - ["repo:https://github.com/actix/actix-web:actix-http", "<crate::builder::HttpServiceBuilder>::client_timeout", "Argument[self]", "ReturnValue", "value", "dfc-generated"]
       - ["repo:https://github.com/actix/actix-web:actix-http", "<crate::builder::HttpServiceBuilder>::expect", "Argument[self]", "ReturnValue", "taint", "df-generated"]
+      - ["repo:https://github.com/actix/actix-web:actix-http", "<crate::builder::HttpServiceBuilder>::finish", "Argument[self].Field[crate::builder::HttpServiceBuilder::expect]", "ReturnValue.Field[crate::service::HttpService::expect]", "value", "dfc-generated"]
+      - ["repo:https://github.com/actix/actix-web:actix-http", "<crate::builder::HttpServiceBuilder>::finish", "Argument[self].Field[crate::builder::HttpServiceBuilder::on_connect_ext]", "ReturnValue.Field[crate::service::HttpService::on_connect_ext]", "value", "dfc-generated"]
+      - ["repo:https://github.com/actix/actix-web:actix-http", "<crate::builder::HttpServiceBuilder>::finish", "Argument[self].Field[crate::builder::HttpServiceBuilder::upgrade]", "ReturnValue.Field[crate::service::HttpService::upgrade]", "value", "dfc-generated"]
+      - ["repo:https://github.com/actix/actix-web:actix-http", "<crate::builder::HttpServiceBuilder>::h1", "Argument[self].Field[crate::builder::HttpServiceBuilder::expect]", "ReturnValue.Field[crate::h1::service::H1Service::expect]", "value", "dfc-generated"]
+      - ["repo:https://github.com/actix/actix-web:actix-http", "<crate::builder::HttpServiceBuilder>::h1", "Argument[self].Field[crate::builder::HttpServiceBuilder::on_connect_ext]", "ReturnValue.Field[crate::h1::service::H1Service::on_connect_ext]", "value", "dfc-generated"]
+      - ["repo:https://github.com/actix/actix-web:actix-http", "<crate::builder::HttpServiceBuilder>::h1", "Argument[self].Field[crate::builder::HttpServiceBuilder::upgrade]", "ReturnValue.Field[crate::h1::service::H1Service::upgrade]", "value", "dfc-generated"]
+      - ["repo:https://github.com/actix/actix-web:actix-http", "<crate::builder::HttpServiceBuilder>::h2", "Argument[self].Field[crate::builder::HttpServiceBuilder::on_connect_ext]", "ReturnValue.Field[crate::h2::service::H2Service::on_connect_ext]", "value", "dfc-generated"]
       - ["repo:https://github.com/actix/actix-web:actix-http", "<crate::builder::HttpServiceBuilder>::keep_alive", "Argument[self]", "ReturnValue", "value", "dfc-generated"]
       - ["repo:https://github.com/actix/actix-web:actix-http", "<crate::builder::HttpServiceBuilder>::local_addr", "Argument[0]", "Argument[self].Field[crate::builder::HttpServiceBuilder::local_addr].Field[crate::option::Option::Some(0)]", "value", "dfc-generated"]
       - ["repo:https://github.com/actix/actix-web:actix-http", "<crate::builder::HttpServiceBuilder>::local_addr", "Argument[0]", "ReturnValue.Field[crate::builder::HttpServiceBuilder::local_addr].Field[crate::option::Option::Some(0)]", "value", "dfc-generated"]
@@ -30,8 +46,11 @@ extensions:
       - ["repo:https://github.com/actix/actix-web:actix-http", "<crate::builder::HttpServiceBuilder>::secure", "Argument[self]", "ReturnValue", "value", "dfc-generated"]
       - ["repo:https://github.com/actix/actix-web:actix-http", "<crate::builder::HttpServiceBuilder>::upgrade", "Argument[self]", "ReturnValue", "taint", "df-generated"]
       - ["repo:https://github.com/actix/actix-web:actix-http", "<crate::bytes::Bytes as crate::body::message_body::MessageBody>::try_into_bytes", "Argument[self]", "ReturnValue.Field[crate::result::Result::Ok(0)]", "value", "dfc-generated"]
+      - ["repo:https://github.com/actix/actix-web:actix-http", "<crate::date::DateService>::now", "Argument[self]", "ReturnValue", "taint", "df-generated"]
+      - ["repo:https://github.com/actix/actix-web:actix-http", "<crate::date::DateService>::with_date", "Argument[self]", "Argument[0]", "taint", "df-generated"]
       - ["repo:https://github.com/actix/actix-web:actix-http", "<crate::encoding::decoder::Decoder>::from_headers", "Argument[0]", "ReturnValue.Field[crate::encoding::decoder::Decoder::stream]", "value", "dfc-generated"]
       - ["repo:https://github.com/actix/actix-web:actix-http", "<crate::encoding::decoder::Decoder>::new", "Argument[0]", "ReturnValue.Field[crate::encoding::decoder::Decoder::stream]", "value", "dfc-generated"]
+      - ["repo:https://github.com/actix/actix-web:actix-http", "<crate::encoding::encoder::Encoder as crate::body::message_body::MessageBody>::try_into_bytes", "Argument[self].Field[crate::encoding::encoder::Encoder::body]", "ReturnValue.Field[crate::result::Result::Err(0)].Field[crate::encoding::encoder::Encoder::body]", "value", "dfc-generated"]
       - ["repo:https://github.com/actix/actix-web:actix-http", "<crate::encoding::encoder::Encoder as crate::body::message_body::MessageBody>::try_into_bytes", "Argument[self]", "ReturnValue.Field[crate::result::Result::Err(0)]", "value", "dfc-generated"]
       - ["repo:https://github.com/actix/actix-web:actix-http", "<crate::encoding::encoder::Encoder>::response", "Argument[2]", "ReturnValue.Field[crate::encoding::encoder::Encoder::body].Field[crate::encoding::encoder::EncoderBody::Stream::body]", "value", "dfc-generated"]
       - ["repo:https://github.com/actix/actix-web:actix-http", "<crate::encoding::encoder::EncoderBody as crate::body::message_body::MessageBody>::try_into_bytes", "Argument[self]", "ReturnValue.Field[crate::result::Result::Err(0)]", "value", "dfc-generated"]
@@ -66,6 +85,9 @@ extensions:
       - ["repo:https://github.com/actix/actix-web:actix-http", "<crate::h1::decoder::PayloadType>::unwrap", "Argument[self].Field[crate::h1::decoder::PayloadType::Payload(0)]", "ReturnValue", "value", "dfc-generated"]
       - ["repo:https://github.com/actix/actix-web:actix-http", "<crate::h1::encoder::TransferEncoding>::encode", "Argument[self].Field[crate::h1::encoder::TransferEncoding::kind].Field[crate::h1::encoder::TransferEncodingKind::Chunked(0)]", "ReturnValue.Field[crate::result::Result::Ok(0)]", "value", "dfc-generated"]
       - ["repo:https://github.com/actix/actix-web:actix-http", "<crate::h1::encoder::TransferEncoding>::length", "Argument[0]", "ReturnValue.Field[crate::h1::encoder::TransferEncoding::kind].Field[crate::h1::encoder::TransferEncodingKind::Length(0)]", "value", "dfc-generated"]
+      - ["repo:https://github.com/actix/actix-web:actix-http", "<crate::h1::service::H1Service as crate::ServiceFactory>::new_service", "Argument[self].Field[crate::h1::service::H1Service::cfg].Reference", "ReturnValue.Reference", "value", "dfc-generated"]
+      - ["repo:https://github.com/actix/actix-web:actix-http", "<crate::h1::service::H1Service as crate::ServiceFactory>::new_service", "Argument[self].Field[crate::h1::service::H1Service::on_connect_ext].Reference", "ReturnValue.Reference", "value", "dfc-generated"]
+      - ["repo:https://github.com/actix/actix-web:actix-http", "<crate::h1::service::H1Service as crate::ServiceFactory>::new_service", "Argument[self].Field[crate::h1::service::H1Service::on_connect_ext]", "ReturnValue.Reference", "value", "dfc-generated"]
       - ["repo:https://github.com/actix/actix-web:actix-http", "<crate::h1::service::H1Service>::expect", "Argument[0]", "ReturnValue.Field[crate::h1::service::H1Service::expect]", "value", "dfc-generated"]
       - ["repo:https://github.com/actix/actix-web:actix-http", "<crate::h1::service::H1Service>::on_connect_ext", "Argument[0]", "Argument[self].Field[crate::h1::service::H1Service::on_connect_ext]", "value", "dfc-generated"]
       - ["repo:https://github.com/actix/actix-web:actix-http", "<crate::h1::service::H1Service>::on_connect_ext", "Argument[0]", "ReturnValue.Field[crate::h1::service::H1Service::on_connect_ext]", "value", "dfc-generated"]
@@ -79,6 +101,9 @@ extensions:
       - ["repo:https://github.com/actix/actix-web:actix-http", "<crate::h2::dispatcher::Dispatcher>::new", "Argument[1]", "ReturnValue.Field[crate::h2::dispatcher::Dispatcher::flow]", "value", "dfc-generated"]
       - ["repo:https://github.com/actix/actix-web:actix-http", "<crate::h2::dispatcher::Dispatcher>::new", "Argument[2]", "ReturnValue.Field[crate::h2::dispatcher::Dispatcher::config]", "value", "dfc-generated"]
       - ["repo:https://github.com/actix/actix-web:actix-http", "<crate::h2::dispatcher::Dispatcher>::new", "Argument[3]", "ReturnValue.Field[crate::h2::dispatcher::Dispatcher::peer_addr]", "value", "dfc-generated"]
+      - ["repo:https://github.com/actix/actix-web:actix-http", "<crate::h2::service::H2Service as crate::ServiceFactory>::new_service", "Argument[self].Field[crate::h2::service::H2Service::cfg].Reference", "ReturnValue.Reference", "value", "dfc-generated"]
+      - ["repo:https://github.com/actix/actix-web:actix-http", "<crate::h2::service::H2Service as crate::ServiceFactory>::new_service", "Argument[self].Field[crate::h2::service::H2Service::on_connect_ext].Reference", "ReturnValue.Reference", "value", "dfc-generated"]
+      - ["repo:https://github.com/actix/actix-web:actix-http", "<crate::h2::service::H2Service as crate::ServiceFactory>::new_service", "Argument[self].Field[crate::h2::service::H2Service::on_connect_ext]", "ReturnValue.Reference", "value", "dfc-generated"]
       - ["repo:https://github.com/actix/actix-web:actix-http", "<crate::h2::service::H2Service>::on_connect_ext", "Argument[0]", "Argument[self].Field[crate::h2::service::H2Service::on_connect_ext]", "value", "dfc-generated"]
       - ["repo:https://github.com/actix/actix-web:actix-http", "<crate::h2::service::H2Service>::on_connect_ext", "Argument[0]", "ReturnValue.Field[crate::h2::service::H2Service::on_connect_ext]", "value", "dfc-generated"]
       - ["repo:https://github.com/actix/actix-web:actix-http", "<crate::h2::service::H2Service>::on_connect_ext", "Argument[self]", "ReturnValue", "value", "dfc-generated"]
@@ -106,7 +131,6 @@ extensions:
       - ["repo:https://github.com/actix/actix-web:actix-http", "<crate::payload::Payload as crate::convert::From>::from", "Argument[0]", "ReturnValue.Field[crate::payload::Payload::H2::payload].Field[crate::h2::Payload::stream]", "value", "dfc-generated"]
       - ["repo:https://github.com/actix/actix-web:actix-http", "<crate::payload::Payload as crate::convert::From>::from", "Argument[0]", "ReturnValue.Field[crate::payload::Payload::H2::payload]", "value", "dfc-generated"]
       - ["repo:https://github.com/actix/actix-web:actix-http", "<crate::payload::Payload as crate::convert::From>::from", "Argument[0]", "ReturnValue.Field[crate::payload::Payload::Stream::payload]", "value", "dfc-generated"]
-      - ["repo:https://github.com/actix/actix-web:actix-http", "<crate::payload::Payload>::take", "Argument[self].Reference", "ReturnValue", "value", "dfc-generated"]
       - ["repo:https://github.com/actix/actix-web:actix-http", "<crate::requests::head::RequestHead as crate::message::Head>::with_pool", "Argument[0].ReturnValue", "ReturnValue", "value", "dfc-generated"]
       - ["repo:https://github.com/actix/actix-web:actix-http", "<crate::requests::head::RequestHead>::headers", "Argument[self].Field[crate::requests::head::RequestHead::headers]", "ReturnValue.Reference", "value", "dfc-generated"]
       - ["repo:https://github.com/actix/actix-web:actix-http", "<crate::requests::head::RequestHead>::headers_mut", "Argument[self].Field[crate::requests::head::RequestHead::headers]", "ReturnValue.Reference", "value", "dfc-generated"]
@@ -115,8 +139,9 @@ extensions:
       - ["repo:https://github.com/actix/actix-web:actix-http", "<crate::requests::head::RequestHeadType as crate::h1::encoder::MessageType>::headers", "Argument[self].Field[crate::requests::head::RequestHeadType::Owned(0)].Field[crate::requests::head::RequestHead::headers]", "ReturnValue.Reference", "value", "dfc-generated"]
       - ["repo:https://github.com/actix/actix-web:actix-http", "<crate::requests::request::Request as crate::convert::From>::from", "Argument[0]", "ReturnValue.Field[crate::requests::request::Request::head]", "value", "dfc-generated"]
       - ["repo:https://github.com/actix/actix-web:actix-http", "<crate::requests::request::Request as crate::h1::decoder::MessageType>::headers_mut", "Argument[self]", "ReturnValue", "taint", "df-generated"]
+      - ["repo:https://github.com/actix/actix-web:actix-http", "<crate::requests::request::Request as crate::http_message::HttpMessage>::extensions", "Argument[self]", "ReturnValue", "taint", "df-generated"]
+      - ["repo:https://github.com/actix/actix-web:actix-http", "<crate::requests::request::Request as crate::http_message::HttpMessage>::extensions_mut", "Argument[self]", "ReturnValue", "taint", "df-generated"]
       - ["repo:https://github.com/actix/actix-web:actix-http", "<crate::requests::request::Request as crate::http_message::HttpMessage>::headers", "Argument[self]", "ReturnValue", "taint", "df-generated"]
-      - ["repo:https://github.com/actix/actix-web:actix-http", "<crate::requests::request::Request as crate::http_message::HttpMessage>::take_payload", "Argument[self].Field[crate::requests::request::Request::payload]", "ReturnValue", "value", "dfc-generated"]
       - ["repo:https://github.com/actix/actix-web:actix-http", "<crate::requests::request::Request>::head", "Argument[self].Field[crate::requests::request::Request::head]", "ReturnValue.Reference", "value", "dfc-generated"]
       - ["repo:https://github.com/actix/actix-web:actix-http", "<crate::requests::request::Request>::head_mut", "Argument[self].Field[crate::requests::request::Request::head]", "ReturnValue.Reference", "value", "dfc-generated"]
       - ["repo:https://github.com/actix/actix-web:actix-http", "<crate::requests::request::Request>::into_parts", "Argument[self].Field[crate::requests::request::Request::head]", "ReturnValue.Field[0]", "value", "dfc-generated"]
@@ -125,9 +150,6 @@ extensions:
       - ["repo:https://github.com/actix/actix-web:actix-http", "<crate::requests::request::Request>::payload", "Argument[self].Field[crate::requests::request::Request::payload]", "ReturnValue.Reference", "value", "dfc-generated"]
       - ["repo:https://github.com/actix/actix-web:actix-http", "<crate::requests::request::Request>::peer_addr", "Argument[self]", "ReturnValue", "taint", "df-generated"]
       - ["repo:https://github.com/actix/actix-web:actix-http", "<crate::requests::request::Request>::replace_payload", "Argument[0]", "ReturnValue.Field[0].Field[crate::requests::request::Request::payload]", "value", "dfc-generated"]
-      - ["repo:https://github.com/actix/actix-web:actix-http", "<crate::requests::request::Request>::take_conn_data", "Argument[self].Field[crate::requests::request::Request::conn_data].Reference", "ReturnValue", "value", "dfc-generated"]
-      - ["repo:https://github.com/actix/actix-web:actix-http", "<crate::requests::request::Request>::take_conn_data", "Argument[self].Field[crate::requests::request::Request::conn_data]", "ReturnValue", "value", "dfc-generated"]
-      - ["repo:https://github.com/actix/actix-web:actix-http", "<crate::requests::request::Request>::take_payload", "Argument[self].Field[crate::requests::request::Request::payload]", "ReturnValue", "value", "dfc-generated"]
       - ["repo:https://github.com/actix/actix-web:actix-http", "<crate::requests::request::Request>::uri", "Argument[self]", "ReturnValue", "taint", "df-generated"]
       - ["repo:https://github.com/actix/actix-web:actix-http", "<crate::requests::request::Request>::version", "Argument[self]", "ReturnValue", "taint", "df-generated"]
       - ["repo:https://github.com/actix/actix-web:actix-http", "<crate::requests::request::Request>::with_payload", "Argument[0]", "ReturnValue.Field[crate::requests::request::Request::payload]", "value", "dfc-generated"]
@@ -138,11 +160,9 @@ extensions:
       - ["repo:https://github.com/actix/actix-web:actix-http", "<crate::responses::builder::ResponseBuilder>::insert_header", "Argument[self]", "ReturnValue", "value", "dfc-generated"]
       - ["repo:https://github.com/actix/actix-web:actix-http", "<crate::responses::builder::ResponseBuilder>::keep_alive", "Argument[self]", "ReturnValue", "value", "dfc-generated"]
       - ["repo:https://github.com/actix/actix-web:actix-http", "<crate::responses::builder::ResponseBuilder>::message_body", "Argument[0]", "ReturnValue.Field[crate::result::Result::Ok(0)].Field[crate::responses::response::Response::body]", "value", "dfc-generated"]
-      - ["repo:https://github.com/actix/actix-web:actix-http", "<crate::responses::builder::ResponseBuilder>::message_body", "Argument[self].Field[crate::responses::builder::ResponseBuilder::head].Field[crate::option::Option::Some(0)]", "ReturnValue.Field[crate::result::Result::Ok(0)].Field[crate::responses::response::Response::head]", "value", "dfc-generated"]
       - ["repo:https://github.com/actix/actix-web:actix-http", "<crate::responses::builder::ResponseBuilder>::no_chunking", "Argument[self]", "ReturnValue", "value", "dfc-generated"]
       - ["repo:https://github.com/actix/actix-web:actix-http", "<crate::responses::builder::ResponseBuilder>::reason", "Argument[self]", "ReturnValue", "value", "dfc-generated"]
       - ["repo:https://github.com/actix/actix-web:actix-http", "<crate::responses::builder::ResponseBuilder>::status", "Argument[self]", "ReturnValue", "value", "dfc-generated"]
-      - ["repo:https://github.com/actix/actix-web:actix-http", "<crate::responses::builder::ResponseBuilder>::take", "Argument[self]", "ReturnValue", "taint", "df-generated"]
       - ["repo:https://github.com/actix/actix-web:actix-http", "<crate::responses::builder::ResponseBuilder>::upgrade", "Argument[self]", "ReturnValue", "value", "dfc-generated"]
       - ["repo:https://github.com/actix/actix-web:actix-http", "<crate::responses::head::BoxedResponseHead as crate::ops::deref::Deref>::deref", "Argument[self].Field[crate::responses::head::BoxedResponseHead::head].Field[crate::option::Option::Some(0)]", "ReturnValue.Reference", "value", "dfc-generated"]
       - ["repo:https://github.com/actix/actix-web:actix-http", "<crate::responses::head::BoxedResponseHead as crate::ops::deref::DerefMut>::deref_mut", "Argument[self].Field[crate::responses::head::BoxedResponseHead::head].Field[crate::option::Option::Some(0)]", "ReturnValue.Reference", "value", "dfc-generated"]
@@ -158,6 +178,8 @@ extensions:
       - ["repo:https://github.com/actix/actix-web:actix-http", "<crate::responses::response::Response>::body", "Argument[self].Field[crate::responses::response::Response::body]", "ReturnValue.Reference", "value", "dfc-generated"]
       - ["repo:https://github.com/actix/actix-web:actix-http", "<crate::responses::response::Response>::drop_body", "Argument[self].Field[crate::responses::response::Response::extensions]", "ReturnValue.Field[crate::responses::response::Response::extensions]", "value", "dfc-generated"]
       - ["repo:https://github.com/actix/actix-web:actix-http", "<crate::responses::response::Response>::drop_body", "Argument[self].Field[crate::responses::response::Response::head]", "ReturnValue.Field[crate::responses::response::Response::head]", "value", "dfc-generated"]
+      - ["repo:https://github.com/actix/actix-web:actix-http", "<crate::responses::response::Response>::extensions", "Argument[self]", "ReturnValue", "taint", "df-generated"]
+      - ["repo:https://github.com/actix/actix-web:actix-http", "<crate::responses::response::Response>::extensions_mut", "Argument[self]", "ReturnValue", "taint", "df-generated"]
       - ["repo:https://github.com/actix/actix-web:actix-http", "<crate::responses::response::Response>::head", "Argument[self].Field[crate::responses::response::Response::head]", "ReturnValue.Reference", "value", "dfc-generated"]
       - ["repo:https://github.com/actix/actix-web:actix-http", "<crate::responses::response::Response>::head_mut", "Argument[self].Field[crate::responses::response::Response::head]", "ReturnValue.Reference", "value", "dfc-generated"]
       - ["repo:https://github.com/actix/actix-web:actix-http", "<crate::responses::response::Response>::into_body", "Argument[self].Field[crate::responses::response::Response::body]", "ReturnValue", "value", "dfc-generated"]
@@ -177,6 +199,9 @@ extensions:
       - ["repo:https://github.com/actix/actix-web:actix-http", "<crate::responses::response::Response>::set_body", "Argument[self].Field[crate::responses::response::Response::extensions]", "ReturnValue.Field[crate::responses::response::Response::extensions]", "value", "dfc-generated"]
       - ["repo:https://github.com/actix/actix-web:actix-http", "<crate::responses::response::Response>::set_body", "Argument[self].Field[crate::responses::response::Response::head]", "ReturnValue.Field[crate::responses::response::Response::head]", "value", "dfc-generated"]
       - ["repo:https://github.com/actix/actix-web:actix-http", "<crate::responses::response::Response>::with_body", "Argument[1]", "ReturnValue.Field[crate::responses::response::Response::body]", "value", "dfc-generated"]
+      - ["repo:https://github.com/actix/actix-web:actix-http", "<crate::service::HttpService as crate::ServiceFactory>::new_service", "Argument[self].Field[crate::service::HttpService::cfg].Reference", "ReturnValue.Reference", "value", "dfc-generated"]
+      - ["repo:https://github.com/actix/actix-web:actix-http", "<crate::service::HttpService as crate::ServiceFactory>::new_service", "Argument[self].Field[crate::service::HttpService::on_connect_ext].Reference", "ReturnValue.Reference", "value", "dfc-generated"]
+      - ["repo:https://github.com/actix/actix-web:actix-http", "<crate::service::HttpService as crate::ServiceFactory>::new_service", "Argument[self].Field[crate::service::HttpService::on_connect_ext]", "ReturnValue.Reference", "value", "dfc-generated"]
       - ["repo:https://github.com/actix/actix-web:actix-http", "<crate::service::HttpService>::expect", "Argument[0]", "ReturnValue.Field[crate::service::HttpService::expect]", "value", "dfc-generated"]
       - ["repo:https://github.com/actix/actix-web:actix-http", "<crate::service::HttpService>::on_connect_ext", "Argument[0]", "Argument[self].Field[crate::service::HttpService::on_connect_ext]", "value", "dfc-generated"]
       - ["repo:https://github.com/actix/actix-web:actix-http", "<crate::service::HttpService>::on_connect_ext", "Argument[0]", "ReturnValue.Field[crate::service::HttpService::on_connect_ext]", "value", "dfc-generated"]
@@ -186,14 +211,12 @@ extensions:
       - ["repo:https://github.com/actix/actix-web:actix-http", "<crate::service::HttpServiceHandler>::new", "Argument[0]", "ReturnValue.Field[crate::service::HttpServiceHandler::cfg]", "value", "dfc-generated"]
       - ["repo:https://github.com/actix/actix-web:actix-http", "<crate::service::HttpServiceHandler>::new", "Argument[4]", "ReturnValue.Field[crate::service::HttpServiceHandler::on_connect_ext]", "value", "dfc-generated"]
       - ["repo:https://github.com/actix/actix-web:actix-http", "<crate::service::TlsAcceptorConfig>::handshake_timeout", "Argument[0]", "ReturnValue.Field[crate::service::TlsAcceptorConfig::handshake_timeout].Field[crate::option::Option::Some(0)]", "value", "dfc-generated"]
-      - ["repo:https://github.com/actix/actix-web:actix-http", "<crate::test::TestBuffer>::clone", "Argument[self].Field[crate::test::TestBuffer::err].Field[crate::option::Option::Some(0)]", "ReturnValue.Field[crate::test::TestBuffer::err].Field[crate::option::Option::Some(0)]", "value", "dfc-generated"]
       - ["repo:https://github.com/actix/actix-web:actix-http", "<crate::test::TestBuffer>::clone", "Argument[self].Field[crate::test::TestBuffer::err].Reference", "ReturnValue.Field[crate::test::TestBuffer::err]", "value", "dfc-generated"]
       - ["repo:https://github.com/actix/actix-web:actix-http", "<crate::test::TestBuffer>::clone", "Argument[self].Field[crate::test::TestBuffer::err]", "ReturnValue.Field[crate::test::TestBuffer::err]", "value", "dfc-generated"]
       - ["repo:https://github.com/actix/actix-web:actix-http", "<crate::test::TestRequest>::append_header", "Argument[self]", "ReturnValue", "value", "dfc-generated"]
       - ["repo:https://github.com/actix/actix-web:actix-http", "<crate::test::TestRequest>::insert_header", "Argument[self]", "ReturnValue", "value", "dfc-generated"]
       - ["repo:https://github.com/actix/actix-web:actix-http", "<crate::test::TestRequest>::method", "Argument[self]", "ReturnValue", "value", "dfc-generated"]
       - ["repo:https://github.com/actix/actix-web:actix-http", "<crate::test::TestRequest>::set_payload", "Argument[self]", "ReturnValue", "value", "dfc-generated"]
-      - ["repo:https://github.com/actix/actix-web:actix-http", "<crate::test::TestRequest>::take", "Argument[self]", "ReturnValue", "taint", "df-generated"]
       - ["repo:https://github.com/actix/actix-web:actix-http", "<crate::test::TestRequest>::uri", "Argument[self]", "ReturnValue", "value", "dfc-generated"]
       - ["repo:https://github.com/actix/actix-web:actix-http", "<crate::test::TestRequest>::version", "Argument[self]", "ReturnValue", "value", "dfc-generated"]
       - ["repo:https://github.com/actix/actix-web:actix-http", "<crate::time::SystemTime as crate::convert::From>::from", "Argument[0].Field[crate::header::shared::http_date::HttpDate(0)]", "ReturnValue", "value", "dfc-generated"]
@@ -223,5 +246,8 @@ extensions:
       pack: codeql/rust-all
       extensible: sinkModel
     data:
+      - ["repo:https://github.com/actix/actix-web:actix-http", "<crate::OnConnectData>::from_io", "Argument[1]", "pointer-access", "df-generated"]
+      - ["repo:https://github.com/actix/actix-web:actix-http", "<crate::h1::dispatcher::Dispatcher>::new", "Argument[4]", "pointer-access", "df-generated"]
+      - ["repo:https://github.com/actix/actix-web:actix-http", "<crate::h2::dispatcher::Dispatcher>::new", "Argument[4]", "pointer-access", "df-generated"]
       - ["repo:https://github.com/actix/actix-web:actix-http", "<crate::service::HttpServiceHandler as crate::Service>::call", "Argument[0]", "log-injection", "df-generated"]
       - ["repo:https://github.com/actix/actix-web:actix-http", "crate::ws::proto::hash_key", "Argument[0]", "hasher-input", "df-generated"]
diff --git a/rust/ql/lib/ext/generated/actix-web/repo-https-github.com-actix-actix-web-actix-multipart.model.yml b/rust/ql/lib/ext/generated/actix-web/repo-https-github.com-actix-actix-web-actix-multipart.model.yml
index f5be3177f5b..c91f3e41db7 100644
--- a/rust/ql/lib/ext/generated/actix-web/repo-https-github.com-actix-actix-web-actix-multipart.model.yml
+++ b/rust/ql/lib/ext/generated/actix-web/repo-https-github.com-actix-actix-web-actix-multipart.model.yml
@@ -4,6 +4,11 @@ extensions:
       pack: codeql/rust-all
       extensible: summaryModel
     data:
+      - ["repo:https://github.com/actix/actix-web:actix-multipart", "<_ as crate::form::FieldGroupReader>::from_state", "Argument[0]", "ReturnValue.Field[crate::result::Result::Err(0)]", "value", "dfc-generated"]
+      - ["repo:https://github.com/actix/actix-web:actix-multipart", "<_ as crate::form::FieldGroupReader>::handle_field", "Argument[0]", "ReturnValue.Reference", "value", "dfc-generated"]
+      - ["repo:https://github.com/actix/actix-web:actix-multipart", "<_ as crate::form::FieldGroupReader>::handle_field", "Argument[1]", "ReturnValue.Reference", "value", "dfc-generated"]
+      - ["repo:https://github.com/actix/actix-web:actix-multipart", "<_ as crate::form::FieldGroupReader>::handle_field", "Argument[2]", "ReturnValue.Reference", "value", "dfc-generated"]
+      - ["repo:https://github.com/actix/actix-web:actix-multipart", "<_ as crate::form::FieldGroupReader>::handle_field", "Argument[3]", "ReturnValue.Reference", "value", "dfc-generated"]
       - ["repo:https://github.com/actix/actix-web:actix-multipart", "<crate::field::Field>::content_disposition", "Argument[self].Field[crate::field::Field::content_disposition].Field[crate::option::Option::Some(0)]", "ReturnValue.Field[crate::option::Option::Some(0)].Reference", "value", "dfc-generated"]
       - ["repo:https://github.com/actix/actix-web:actix-multipart", "<crate::field::Field>::content_type", "Argument[self].Field[crate::field::Field::content_type].Field[crate::option::Option::Some(0)]", "ReturnValue.Field[crate::option::Option::Some(0)].Reference", "value", "dfc-generated"]
       - ["repo:https://github.com/actix/actix-web:actix-multipart", "<crate::field::Field>::headers", "Argument[self].Field[crate::field::Field::headers]", "ReturnValue.Reference", "value", "dfc-generated"]
@@ -26,18 +31,40 @@ extensions:
       - ["repo:https://github.com/actix/actix-web:actix-multipart", "<crate::form::MultipartFormConfig>::total_limit", "Argument[0]", "Argument[self].Field[crate::form::MultipartFormConfig::total_limit]", "value", "dfc-generated"]
       - ["repo:https://github.com/actix/actix-web:actix-multipart", "<crate::form::MultipartFormConfig>::total_limit", "Argument[0]", "ReturnValue.Field[crate::form::MultipartFormConfig::total_limit]", "value", "dfc-generated"]
       - ["repo:https://github.com/actix/actix-web:actix-multipart", "<crate::form::MultipartFormConfig>::total_limit", "Argument[self]", "ReturnValue", "value", "dfc-generated"]
+      - ["repo:https://github.com/actix/actix-web:actix-multipart", "<crate::form::bytes::Bytes as crate::form::FieldReader>::read_field", "Argument[1]", "ReturnValue.Reference", "value", "dfc-generated"]
+      - ["repo:https://github.com/actix/actix-web:actix-multipart", "<crate::form::bytes::Bytes as crate::form::FieldReader>::read_field", "Argument[2]", "ReturnValue.Reference", "value", "dfc-generated"]
+      - ["repo:https://github.com/actix/actix-web:actix-multipart", "<crate::form::json::Json as crate::form::FieldReader>::read_field", "Argument[0]", "ReturnValue.Reference", "value", "dfc-generated"]
+      - ["repo:https://github.com/actix/actix-web:actix-multipart", "<crate::form::json::Json as crate::form::FieldReader>::read_field", "Argument[1]", "ReturnValue.Reference", "value", "dfc-generated"]
+      - ["repo:https://github.com/actix/actix-web:actix-multipart", "<crate::form::json::Json as crate::form::FieldReader>::read_field", "Argument[2]", "ReturnValue.Reference", "value", "dfc-generated"]
       - ["repo:https://github.com/actix/actix-web:actix-multipart", "<crate::form::json::Json>::into_inner", "Argument[self].Field[0]", "ReturnValue", "value", "dfc-generated"]
       - ["repo:https://github.com/actix/actix-web:actix-multipart", "<crate::form::json::Json>::into_inner", "Argument[self].Field[crate::form::json::Json(0)]", "ReturnValue", "value", "dfc-generated"]
       - ["repo:https://github.com/actix/actix-web:actix-multipart", "<crate::form::json::JsonConfig>::error_handler", "Argument[self]", "ReturnValue", "value", "dfc-generated"]
       - ["repo:https://github.com/actix/actix-web:actix-multipart", "<crate::form::json::JsonConfig>::validate_content_type", "Argument[0]", "Argument[self].Field[crate::form::json::JsonConfig::validate_content_type]", "value", "dfc-generated"]
       - ["repo:https://github.com/actix/actix-web:actix-multipart", "<crate::form::json::JsonConfig>::validate_content_type", "Argument[0]", "ReturnValue.Field[crate::form::json::JsonConfig::validate_content_type]", "value", "dfc-generated"]
       - ["repo:https://github.com/actix/actix-web:actix-multipart", "<crate::form::json::JsonConfig>::validate_content_type", "Argument[self]", "ReturnValue", "value", "dfc-generated"]
+      - ["repo:https://github.com/actix/actix-web:actix-multipart", "<crate::form::tempfile::TempFile as crate::form::FieldReader>::read_field", "Argument[0]", "ReturnValue.Reference", "value", "dfc-generated"]
+      - ["repo:https://github.com/actix/actix-web:actix-multipart", "<crate::form::tempfile::TempFile as crate::form::FieldReader>::read_field", "Argument[1]", "ReturnValue.Reference", "value", "dfc-generated"]
+      - ["repo:https://github.com/actix/actix-web:actix-multipart", "<crate::form::tempfile::TempFile as crate::form::FieldReader>::read_field", "Argument[2]", "ReturnValue.Reference", "value", "dfc-generated"]
       - ["repo:https://github.com/actix/actix-web:actix-multipart", "<crate::form::tempfile::TempFileConfig>::directory", "Argument[self]", "ReturnValue", "value", "dfc-generated"]
       - ["repo:https://github.com/actix/actix-web:actix-multipart", "<crate::form::tempfile::TempFileConfig>::error_handler", "Argument[self]", "ReturnValue", "value", "dfc-generated"]
+      - ["repo:https://github.com/actix/actix-web:actix-multipart", "<crate::form::text::Text as crate::form::FieldReader>::read_field", "Argument[0]", "ReturnValue.Reference", "value", "dfc-generated"]
+      - ["repo:https://github.com/actix/actix-web:actix-multipart", "<crate::form::text::Text as crate::form::FieldReader>::read_field", "Argument[1]", "ReturnValue.Reference", "value", "dfc-generated"]
+      - ["repo:https://github.com/actix/actix-web:actix-multipart", "<crate::form::text::Text as crate::form::FieldReader>::read_field", "Argument[2]", "ReturnValue.Reference", "value", "dfc-generated"]
       - ["repo:https://github.com/actix/actix-web:actix-multipart", "<crate::form::text::Text>::into_inner", "Argument[self].Field[0]", "ReturnValue", "value", "dfc-generated"]
       - ["repo:https://github.com/actix/actix-web:actix-multipart", "<crate::form::text::Text>::into_inner", "Argument[self].Field[crate::form::text::Text(0)]", "ReturnValue", "value", "dfc-generated"]
       - ["repo:https://github.com/actix/actix-web:actix-multipart", "<crate::form::text::TextConfig>::error_handler", "Argument[self]", "ReturnValue", "value", "dfc-generated"]
       - ["repo:https://github.com/actix/actix-web:actix-multipart", "<crate::form::text::TextConfig>::validate_content_type", "Argument[0]", "Argument[self].Field[crate::form::text::TextConfig::validate_content_type]", "value", "dfc-generated"]
       - ["repo:https://github.com/actix/actix-web:actix-multipart", "<crate::form::text::TextConfig>::validate_content_type", "Argument[0]", "ReturnValue.Field[crate::form::text::TextConfig::validate_content_type]", "value", "dfc-generated"]
       - ["repo:https://github.com/actix/actix-web:actix-multipart", "<crate::form::text::TextConfig>::validate_content_type", "Argument[self]", "ReturnValue", "value", "dfc-generated"]
+      - ["repo:https://github.com/actix/actix-web:actix-multipart", "<crate::option::Option as crate::form::FieldGroupReader>::handle_field", "Argument[0]", "ReturnValue.Reference", "value", "dfc-generated"]
+      - ["repo:https://github.com/actix/actix-web:actix-multipart", "<crate::option::Option as crate::form::FieldGroupReader>::handle_field", "Argument[1]", "ReturnValue.Reference", "value", "dfc-generated"]
+      - ["repo:https://github.com/actix/actix-web:actix-multipart", "<crate::option::Option as crate::form::FieldGroupReader>::handle_field", "Argument[2]", "ReturnValue.Reference", "value", "dfc-generated"]
+      - ["repo:https://github.com/actix/actix-web:actix-multipart", "<crate::option::Option as crate::form::FieldGroupReader>::handle_field", "Argument[3]", "ReturnValue.Reference", "value", "dfc-generated"]
+      - ["repo:https://github.com/actix/actix-web:actix-multipart", "<crate::payload::PayloadBuffer>::new", "Argument[0]", "ReturnValue.Field[crate::payload::PayloadBuffer::stream].Reference", "value", "dfc-generated"]
+      - ["repo:https://github.com/actix/actix-web:actix-multipart", "<crate::payload::PayloadRef>::get_mut", "Argument[self]", "ReturnValue", "taint", "df-generated"]
       - ["repo:https://github.com/actix/actix-web:actix-multipart", "<crate::safety::Safety>::clone", "Argument[self].Field[crate::safety::Safety::clean].Reference", "ReturnValue.Field[crate::safety::Safety::clean]", "value", "dfc-generated"]
+      - ["repo:https://github.com/actix/actix-web:actix-multipart", "<crate::safety::Safety>::is_clean", "Argument[self]", "ReturnValue", "taint", "df-generated"]
+      - ["repo:https://github.com/actix/actix-web:actix-multipart", "<crate::vec::Vec as crate::form::FieldGroupReader>::handle_field", "Argument[0]", "ReturnValue.Reference", "value", "dfc-generated"]
+      - ["repo:https://github.com/actix/actix-web:actix-multipart", "<crate::vec::Vec as crate::form::FieldGroupReader>::handle_field", "Argument[1]", "ReturnValue.Reference", "value", "dfc-generated"]
+      - ["repo:https://github.com/actix/actix-web:actix-multipart", "<crate::vec::Vec as crate::form::FieldGroupReader>::handle_field", "Argument[2]", "ReturnValue.Reference", "value", "dfc-generated"]
+      - ["repo:https://github.com/actix/actix-web:actix-multipart", "<crate::vec::Vec as crate::form::FieldGroupReader>::handle_field", "Argument[3]", "ReturnValue.Reference", "value", "dfc-generated"]
diff --git a/rust/ql/lib/ext/generated/actix-web/repo-https-github.com-actix-actix-web-actix-test.model.yml b/rust/ql/lib/ext/generated/actix-web/repo-https-github.com-actix-actix-web-actix-test.model.yml
index 092daa5214e..b911c3357f7 100644
--- a/rust/ql/lib/ext/generated/actix-web/repo-https-github.com-actix-actix-web-actix-test.model.yml
+++ b/rust/ql/lib/ext/generated/actix-web/repo-https-github.com-actix-actix-web-actix-test.model.yml
@@ -5,23 +5,7 @@ extensions:
       extensible: summaryModel
     data:
       - ["repo:https://github.com/actix/actix-web:actix-test", "<crate::TestServer>::addr", "Argument[self].Field[crate::TestServer::addr]", "ReturnValue", "value", "dfc-generated"]
-      - ["repo:https://github.com/actix/actix-web:actix-test", "<crate::TestServer>::delete", "Argument[self].Field[crate::TestServer::client].Field[0]", "ReturnValue.Field[crate::request::ClientRequest::config]", "value", "dfc-generated"]
-      - ["repo:https://github.com/actix/actix-web:actix-test", "<crate::TestServer>::delete", "Argument[self].Field[crate::TestServer::client].Field[crate::client::Client(0)]", "ReturnValue.Field[crate::request::ClientRequest::config]", "value", "dfc-generated"]
-      - ["repo:https://github.com/actix/actix-web:actix-test", "<crate::TestServer>::get", "Argument[self].Field[crate::TestServer::client].Field[0]", "ReturnValue.Field[crate::request::ClientRequest::config]", "value", "dfc-generated"]
-      - ["repo:https://github.com/actix/actix-web:actix-test", "<crate::TestServer>::get", "Argument[self].Field[crate::TestServer::client].Field[crate::client::Client(0)]", "ReturnValue.Field[crate::request::ClientRequest::config]", "value", "dfc-generated"]
-      - ["repo:https://github.com/actix/actix-web:actix-test", "<crate::TestServer>::head", "Argument[self].Field[crate::TestServer::client].Field[0]", "ReturnValue.Field[crate::request::ClientRequest::config]", "value", "dfc-generated"]
-      - ["repo:https://github.com/actix/actix-web:actix-test", "<crate::TestServer>::head", "Argument[self].Field[crate::TestServer::client].Field[crate::client::Client(0)]", "ReturnValue.Field[crate::request::ClientRequest::config]", "value", "dfc-generated"]
-      - ["repo:https://github.com/actix/actix-web:actix-test", "<crate::TestServer>::options", "Argument[self].Field[crate::TestServer::client].Field[0]", "ReturnValue.Field[crate::request::ClientRequest::config]", "value", "dfc-generated"]
-      - ["repo:https://github.com/actix/actix-web:actix-test", "<crate::TestServer>::options", "Argument[self].Field[crate::TestServer::client].Field[crate::client::Client(0)]", "ReturnValue.Field[crate::request::ClientRequest::config]", "value", "dfc-generated"]
-      - ["repo:https://github.com/actix/actix-web:actix-test", "<crate::TestServer>::patch", "Argument[self].Field[crate::TestServer::client].Field[0]", "ReturnValue.Field[crate::request::ClientRequest::config]", "value", "dfc-generated"]
-      - ["repo:https://github.com/actix/actix-web:actix-test", "<crate::TestServer>::patch", "Argument[self].Field[crate::TestServer::client].Field[crate::client::Client(0)]", "ReturnValue.Field[crate::request::ClientRequest::config]", "value", "dfc-generated"]
-      - ["repo:https://github.com/actix/actix-web:actix-test", "<crate::TestServer>::post", "Argument[self].Field[crate::TestServer::client].Field[0]", "ReturnValue.Field[crate::request::ClientRequest::config]", "value", "dfc-generated"]
-      - ["repo:https://github.com/actix/actix-web:actix-test", "<crate::TestServer>::post", "Argument[self].Field[crate::TestServer::client].Field[crate::client::Client(0)]", "ReturnValue.Field[crate::request::ClientRequest::config]", "value", "dfc-generated"]
-      - ["repo:https://github.com/actix/actix-web:actix-test", "<crate::TestServer>::put", "Argument[self].Field[crate::TestServer::client].Field[0]", "ReturnValue.Field[crate::request::ClientRequest::config]", "value", "dfc-generated"]
-      - ["repo:https://github.com/actix/actix-web:actix-test", "<crate::TestServer>::put", "Argument[self].Field[crate::TestServer::client].Field[crate::client::Client(0)]", "ReturnValue.Field[crate::request::ClientRequest::config]", "value", "dfc-generated"]
       - ["repo:https://github.com/actix/actix-web:actix-test", "<crate::TestServer>::request", "Argument[0]", "ReturnValue.Field[crate::request::ClientRequest::head].Field[crate::requests::head::RequestHead::method]", "value", "dfc-generated"]
-      - ["repo:https://github.com/actix/actix-web:actix-test", "<crate::TestServer>::request", "Argument[self].Field[crate::TestServer::client].Field[0]", "ReturnValue.Field[crate::request::ClientRequest::config]", "value", "dfc-generated"]
-      - ["repo:https://github.com/actix/actix-web:actix-test", "<crate::TestServer>::request", "Argument[self].Field[crate::TestServer::client].Field[crate::client::Client(0)]", "ReturnValue.Field[crate::request::ClientRequest::config]", "value", "dfc-generated"]
       - ["repo:https://github.com/actix/actix-web:actix-test", "<crate::TestServer>::url", "Argument[0]", "ReturnValue", "taint", "df-generated"]
       - ["repo:https://github.com/actix/actix-web:actix-test", "<crate::TestServer>::url", "Argument[self]", "ReturnValue", "taint", "df-generated"]
       - ["repo:https://github.com/actix/actix-web:actix-test", "<crate::TestServerConfig>::client_request_timeout", "Argument[0]", "Argument[self].Field[crate::TestServerConfig::client_request_timeout]", "value", "dfc-generated"]
diff --git a/rust/ql/lib/ext/generated/actix-web/repo-https-github.com-actix-actix-web-actix-web-actors.model.yml b/rust/ql/lib/ext/generated/actix-web/repo-https-github.com-actix-actix-web-actix-web-actors.model.yml
index 6c1bd84c988..710508a6fee 100644
--- a/rust/ql/lib/ext/generated/actix-web/repo-https-github.com-actix-actix-web-actix-web-actors.model.yml
+++ b/rust/ql/lib/ext/generated/actix-web/repo-https-github.com-actix-actix-web-actix-web-actors.model.yml
@@ -19,3 +19,15 @@ extensions:
       - ["repo:https://github.com/actix/actix-web:actix-web-actors", "<crate::ws::WsResponseBuilder>::protocols", "Argument[0]", "Argument[self].Field[crate::ws::WsResponseBuilder::protocols].Field[crate::option::Option::Some(0)]", "value", "dfc-generated"]
       - ["repo:https://github.com/actix/actix-web:actix-web-actors", "<crate::ws::WsResponseBuilder>::protocols", "Argument[0]", "ReturnValue.Field[crate::ws::WsResponseBuilder::protocols].Field[crate::option::Option::Some(0)]", "value", "dfc-generated"]
       - ["repo:https://github.com/actix/actix-web:actix-web-actors", "<crate::ws::WsResponseBuilder>::protocols", "Argument[self]", "ReturnValue", "value", "dfc-generated"]
+  - addsTo:
+      pack: codeql/rust-all
+      extensible: sinkModel
+    data:
+      - ["repo:https://github.com/actix/actix-web:actix-web-actors", "<crate::context::HttpContext>::write", "Argument[self]", "log-injection", "df-generated"]
+      - ["repo:https://github.com/actix/actix-web:actix-web-actors", "<crate::context::HttpContext>::write_eof", "Argument[self]", "log-injection", "df-generated"]
+      - ["repo:https://github.com/actix/actix-web:actix-web-actors", "<crate::ws::WebsocketContext>::binary", "Argument[self]", "log-injection", "df-generated"]
+      - ["repo:https://github.com/actix/actix-web:actix-web-actors", "<crate::ws::WebsocketContext>::close", "Argument[self]", "log-injection", "df-generated"]
+      - ["repo:https://github.com/actix/actix-web:actix-web-actors", "<crate::ws::WebsocketContext>::ping", "Argument[self]", "log-injection", "df-generated"]
+      - ["repo:https://github.com/actix/actix-web:actix-web-actors", "<crate::ws::WebsocketContext>::pong", "Argument[self]", "log-injection", "df-generated"]
+      - ["repo:https://github.com/actix/actix-web:actix-web-actors", "<crate::ws::WebsocketContext>::text", "Argument[self]", "log-injection", "df-generated"]
+      - ["repo:https://github.com/actix/actix-web:actix-web-actors", "<crate::ws::WebsocketContext>::write_raw", "Argument[self]", "log-injection", "df-generated"]
diff --git a/rust/ql/lib/ext/generated/actix-web/repo-https-github.com-actix-actix-web-actix-web-codegen.model.yml b/rust/ql/lib/ext/generated/actix-web/repo-https-github.com-actix-actix-web-actix-web-codegen.model.yml
index da04e3d3bf0..1e95c79ef74 100644
--- a/rust/ql/lib/ext/generated/actix-web/repo-https-github.com-actix-actix-web-actix-web-codegen.model.yml
+++ b/rust/ql/lib/ext/generated/actix-web/repo-https-github.com-actix-actix-web-actix-web-codegen.model.yml
@@ -7,7 +7,6 @@ extensions:
       - ["repo:https://github.com/actix/actix-web:actix-web-codegen", "<crate::route::MethodTypeExt as crate::convert::TryFrom>::try_from", "Argument[0].Reference", "ReturnValue.Field[crate::result::Result::Ok(0)].Field[crate::route::MethodTypeExt::Custom(0)]", "value", "dfc-generated"]
       - ["repo:https://github.com/actix/actix-web:actix-web-codegen", "<crate::route::Route>::new", "Argument[0].Field[crate::route::RouteArgs::path]", "ReturnValue.Field[crate::route::Args::path]", "value", "dfc-generated"]
       - ["repo:https://github.com/actix/actix-web:actix-web-codegen", "<crate::route::Route>::new", "Argument[1]", "ReturnValue.Field[crate::result::Result::Ok(0)].Field[crate::route::Route::ast]", "value", "dfc-generated"]
-      - ["repo:https://github.com/actix/actix-web:actix-web-codegen", "<crate::route::Route>::new", "Argument[1]", "ReturnValue.Field[crate::result::Result::Ok(0)].Field[crate::route::Route::name]", "value", "dfc-generated"]
       - ["repo:https://github.com/actix/actix-web:actix-web-codegen", "crate::connect", "Argument[1]", "ReturnValue", "value", "dfc-generated"]
       - ["repo:https://github.com/actix/actix-web:actix-web-codegen", "crate::delete", "Argument[1]", "ReturnValue", "value", "dfc-generated"]
       - ["repo:https://github.com/actix/actix-web:actix-web-codegen", "crate::get", "Argument[1]", "ReturnValue", "value", "dfc-generated"]
diff --git a/rust/ql/lib/ext/generated/actix-web/repo-https-github.com-actix-actix-web-actix-web.model.yml b/rust/ql/lib/ext/generated/actix-web/repo-https-github.com-actix-actix-web-actix-web.model.yml
index 71d89fea272..c4a38af8be2 100644
--- a/rust/ql/lib/ext/generated/actix-web/repo-https-github.com-actix-actix-web-actix-web.model.yml
+++ b/rust/ql/lib/ext/generated/actix-web/repo-https-github.com-actix-actix-web-actix-web.model.yml
@@ -7,14 +7,17 @@ extensions:
       - ["repo:https://github.com/actix/actix-web:actix-web", "<_ as crate::guard::Guard>::check", "Argument[0]", "Argument[self].Parameter[0]", "value", "dfc-generated"]
       - ["repo:https://github.com/actix/actix-web:actix-web", "<_ as crate::guard::Guard>::check", "Argument[self].ReturnValue", "ReturnValue", "value", "dfc-generated"]
       - ["repo:https://github.com/actix/actix-web:actix-web", "<_ as crate::handler::Handler>::call", "Argument[self].ReturnValue", "ReturnValue", "value", "dfc-generated"]
+      - ["repo:https://github.com/actix/actix-web:actix-web", "<crate::Middleware as crate::Service>::call", "Argument[self].Field[crate::Middleware::was_error].Reference", "ReturnValue.Reference", "value", "dfc-generated"]
       - ["repo:https://github.com/actix/actix-web:actix-web", "<crate::app::App as crate::IntoServiceFactory>::into_factory", "Argument[self].Field[crate::app::App::default]", "ReturnValue.Field[crate::app_service::AppInit::default]", "value", "dfc-generated"]
       - ["repo:https://github.com/actix/actix-web:actix-web", "<crate::app::App as crate::IntoServiceFactory>::into_factory", "Argument[self].Field[crate::app::App::endpoint]", "ReturnValue.Field[crate::app_service::AppInit::endpoint]", "value", "dfc-generated"]
       - ["repo:https://github.com/actix/actix-web:actix-web", "<crate::app::App as crate::IntoServiceFactory>::into_factory", "Argument[self].Field[crate::app::App::factory_ref]", "ReturnValue.Field[crate::app_service::AppInit::factory_ref]", "value", "dfc-generated"]
       - ["repo:https://github.com/actix/actix-web:actix-web", "<crate::app::App>::app_data", "Argument[self]", "ReturnValue", "value", "dfc-generated"]
       - ["repo:https://github.com/actix/actix-web:actix-web", "<crate::app::App>::configure", "Argument[self]", "ReturnValue", "value", "dfc-generated"]
+      - ["repo:https://github.com/actix/actix-web:actix-web", "<crate::app::App>::data", "Argument[self]", "ReturnValue", "value", "dfc-generated"]
       - ["repo:https://github.com/actix/actix-web:actix-web", "<crate::app::App>::data_factory", "Argument[self]", "ReturnValue", "value", "dfc-generated"]
       - ["repo:https://github.com/actix/actix-web:actix-web", "<crate::app::App>::default_service", "Argument[self]", "ReturnValue", "value", "dfc-generated"]
       - ["repo:https://github.com/actix/actix-web:actix-web", "<crate::app::App>::external_resource", "Argument[self]", "ReturnValue", "value", "dfc-generated"]
+      - ["repo:https://github.com/actix/actix-web:actix-web", "<crate::app::App>::route", "Argument[self]", "ReturnValue", "value", "dfc-generated"]
       - ["repo:https://github.com/actix/actix-web:actix-web", "<crate::app::App>::service", "Argument[self]", "ReturnValue", "value", "dfc-generated"]
       - ["repo:https://github.com/actix/actix-web:actix-web", "<crate::app::App>::wrap", "Argument[self]", "ReturnValue", "taint", "df-generated"]
       - ["repo:https://github.com/actix/actix-web:actix-web", "<crate::app::App>::wrap_fn", "Argument[self]", "ReturnValue", "taint", "df-generated"]
@@ -32,7 +35,6 @@ extensions:
       - ["repo:https://github.com/actix/actix-web:actix-web", "<crate::config::AppConfig>::new", "Argument[2]", "ReturnValue.Field[crate::config::AppConfig::addr]", "value", "dfc-generated"]
       - ["repo:https://github.com/actix/actix-web:actix-web", "<crate::config::AppConfig>::secure", "Argument[self].Field[crate::config::AppConfig::secure]", "ReturnValue", "value", "dfc-generated"]
       - ["repo:https://github.com/actix/actix-web:actix-web", "<crate::config::AppService>::clone_config", "Argument[self].Field[crate::config::AppService::config].Reference", "ReturnValue.Field[crate::config::AppService::config]", "value", "dfc-generated"]
-      - ["repo:https://github.com/actix/actix-web:actix-web", "<crate::config::AppService>::clone_config", "Argument[self].Field[crate::config::AppService::config]", "ReturnValue.Field[crate::config::AppService::config]", "value", "dfc-generated"]
       - ["repo:https://github.com/actix/actix-web:actix-web", "<crate::config::AppService>::config", "Argument[self].Field[crate::config::AppService::config]", "ReturnValue.Reference", "value", "dfc-generated"]
       - ["repo:https://github.com/actix/actix-web:actix-web", "<crate::config::AppService>::into_services", "Argument[self].Field[crate::config::AppService::config]", "ReturnValue.Field[0]", "value", "dfc-generated"]
       - ["repo:https://github.com/actix/actix-web:actix-web", "<crate::config::AppService>::into_services", "Argument[self].Field[crate::config::AppService::services]", "ReturnValue.Field[1]", "value", "dfc-generated"]
@@ -53,6 +55,7 @@ extensions:
       - ["repo:https://github.com/actix/actix-web:actix-web", "<crate::data::Data>::into_inner", "Argument[self].Field[0]", "ReturnValue", "value", "dfc-generated"]
       - ["repo:https://github.com/actix/actix-web:actix-web", "<crate::data::Data>::into_inner", "Argument[self].Field[crate::data::Data(0)]", "ReturnValue", "value", "dfc-generated"]
       - ["repo:https://github.com/actix/actix-web:actix-web", "<crate::error::error::Error as crate::convert::From>::from", "Argument[0].Field[crate::types::either::EitherExtractError::Bytes(0)]", "ReturnValue", "value", "dfc-generated"]
+      - ["repo:https://github.com/actix/actix-web:actix-web", "<crate::error::error::Error as crate::convert::From>::from", "Argument[0]", "ReturnValue.Field[crate::error::error::Error::cause].Reference", "value", "dfc-generated"]
       - ["repo:https://github.com/actix/actix-web:actix-web", "<crate::error::error::Error as crate::convert::From>::from", "Argument[0]", "ReturnValue.Field[crate::error::error::Error::cause]", "value", "dfc-generated"]
       - ["repo:https://github.com/actix/actix-web:actix-web", "<crate::error::error::Error as crate::convert::From>::from", "Argument[0]", "ReturnValue", "value", "dfc-generated"]
       - ["repo:https://github.com/actix/actix-web:actix-web", "<crate::error::internal::InternalError as crate::error::response_error::ResponseError>::status_code", "Argument[self].Field[crate::error::internal::InternalError::status].Field[crate::error::internal::InternalErrorType::Status(0)]", "ReturnValue", "value", "dfc-generated"]
@@ -66,7 +69,6 @@ extensions:
       - ["repo:https://github.com/actix/actix-web:actix-web", "<crate::guard::acceptable::Acceptable>::match_star_star", "Argument[self]", "ReturnValue", "value", "dfc-generated"]
       - ["repo:https://github.com/actix/actix-web:actix-web", "<crate::guard::acceptable::Acceptable>::new", "Argument[0]", "ReturnValue.Field[crate::guard::acceptable::Acceptable::mime]", "value", "dfc-generated"]
       - ["repo:https://github.com/actix/actix-web:actix-web", "<crate::guard::host::HostGuard>::scheme", "Argument[self]", "ReturnValue", "value", "dfc-generated"]
-      - ["repo:https://github.com/actix/actix-web:actix-web", "<crate::http::header::accept_encoding::AcceptEncoding>::preference", "Argument[self]", "ReturnValue", "taint", "df-generated"]
       - ["repo:https://github.com/actix/actix-web:actix-web", "<crate::http::header::content_disposition::DispositionParam>::as_filename", "Argument[self].Field[crate::http::header::content_disposition::DispositionParam::Filename(0)]", "ReturnValue.Field[crate::option::Option::Some(0)]", "value", "dfc-generated"]
       - ["repo:https://github.com/actix/actix-web:actix-web", "<crate::http::header::content_disposition::DispositionParam>::as_filename_ext", "Argument[self].Field[crate::http::header::content_disposition::DispositionParam::FilenameExt(0)]", "ReturnValue.Field[crate::option::Option::Some(0)]", "value", "dfc-generated"]
       - ["repo:https://github.com/actix/actix-web:actix-web", "<crate::http::header::content_disposition::DispositionParam>::as_name", "Argument[self].Field[crate::http::header::content_disposition::DispositionParam::Name(0)]", "ReturnValue.Field[crate::option::Option::Some(0)]", "value", "dfc-generated"]
@@ -98,9 +100,11 @@ extensions:
       - ["repo:https://github.com/actix/actix-web:actix-web", "<crate::middleware::default_headers::DefaultHeaders>::add", "Argument[self]", "ReturnValue", "value", "dfc-generated"]
       - ["repo:https://github.com/actix/actix-web:actix-web", "<crate::middleware::default_headers::DefaultHeaders>::add_content_type", "Argument[self]", "ReturnValue", "value", "dfc-generated"]
       - ["repo:https://github.com/actix/actix-web:actix-web", "<crate::middleware::default_headers::DefaultHeaders>::header", "Argument[self]", "ReturnValue", "value", "dfc-generated"]
+      - ["repo:https://github.com/actix/actix-web:actix-web", "<crate::middleware::err_handlers::ErrorHandlers as crate::transform::Transform>::new_transform", "Argument[0]", "ReturnValue.Reference", "value", "dfc-generated"]
       - ["repo:https://github.com/actix/actix-web:actix-web", "<crate::middleware::err_handlers::ErrorHandlers>::handler", "Argument[self]", "ReturnValue", "value", "dfc-generated"]
       - ["repo:https://github.com/actix/actix-web:actix-web", "<crate::middleware::err_handlers::ErrorHandlersMiddleware as crate::Service>::call", "Argument[self]", "ReturnValue", "taint", "df-generated"]
       - ["repo:https://github.com/actix/actix-web:actix-web", "<crate::middleware::from_fn::MiddlewareFnService as crate::Service>::call", "Argument[0]", "Argument[self]", "taint", "df-generated"]
+      - ["repo:https://github.com/actix/actix-web:actix-web", "<crate::middleware::from_fn::MiddlewareFnService as crate::Service>::call", "Argument[0]", "ReturnValue.Reference", "value", "dfc-generated"]
       - ["repo:https://github.com/actix/actix-web:actix-web", "<crate::middleware::from_fn::MiddlewareFnService as crate::Service>::call", "Argument[self]", "ReturnValue", "taint", "df-generated"]
       - ["repo:https://github.com/actix/actix-web:actix-web", "<crate::middleware::logger::FormatDisplay as crate::fmt::Display>::fmt", "Argument[0]", "Argument[self]", "taint", "df-generated"]
       - ["repo:https://github.com/actix/actix-web:actix-web", "<crate::middleware::logger::FormatDisplay as crate::fmt::Display>::fmt", "Argument[self]", "ReturnValue", "taint", "df-generated"]
@@ -123,6 +127,7 @@ extensions:
       - ["repo:https://github.com/actix/actix-web:actix-web", "<crate::request_data::ReqData>::into_inner", "Argument[self].Field[crate::request_data::ReqData(0)]", "ReturnValue", "value", "dfc-generated"]
       - ["repo:https://github.com/actix/actix-web:actix-web", "<crate::resource::Resource>::add_guards", "Argument[self]", "ReturnValue", "value", "dfc-generated"]
       - ["repo:https://github.com/actix/actix-web:actix-web", "<crate::resource::Resource>::app_data", "Argument[self]", "ReturnValue", "value", "dfc-generated"]
+      - ["repo:https://github.com/actix/actix-web:actix-web", "<crate::resource::Resource>::data", "Argument[self]", "ReturnValue", "value", "dfc-generated"]
       - ["repo:https://github.com/actix/actix-web:actix-web", "<crate::resource::Resource>::default_service", "Argument[self]", "ReturnValue", "value", "dfc-generated"]
       - ["repo:https://github.com/actix/actix-web:actix-web", "<crate::resource::Resource>::guard", "Argument[self]", "ReturnValue", "value", "dfc-generated"]
       - ["repo:https://github.com/actix/actix-web:actix-web", "<crate::resource::Resource>::name", "Argument[self]", "ReturnValue", "value", "dfc-generated"]
@@ -141,12 +146,12 @@ extensions:
       - ["repo:https://github.com/actix/actix-web:actix-web", "<crate::response::builder::HttpResponseBuilder>::reason", "Argument[self]", "ReturnValue", "value", "dfc-generated"]
       - ["repo:https://github.com/actix/actix-web:actix-web", "<crate::response::builder::HttpResponseBuilder>::set_header", "Argument[self]", "ReturnValue", "value", "dfc-generated"]
       - ["repo:https://github.com/actix/actix-web:actix-web", "<crate::response::builder::HttpResponseBuilder>::status", "Argument[self]", "ReturnValue", "value", "dfc-generated"]
-      - ["repo:https://github.com/actix/actix-web:actix-web", "<crate::response::builder::HttpResponseBuilder>::take", "Argument[self]", "ReturnValue", "taint", "df-generated"]
       - ["repo:https://github.com/actix/actix-web:actix-web", "<crate::response::builder::HttpResponseBuilder>::upgrade", "Argument[self]", "ReturnValue", "value", "dfc-generated"]
       - ["repo:https://github.com/actix/actix-web:actix-web", "<crate::response::customize_responder::CustomizeResponder>::add_cookie", "Argument[self]", "ReturnValue", "value", "dfc-generated"]
       - ["repo:https://github.com/actix/actix-web:actix-web", "<crate::response::customize_responder::CustomizeResponder>::append_header", "Argument[self]", "ReturnValue", "value", "dfc-generated"]
       - ["repo:https://github.com/actix/actix-web:actix-web", "<crate::response::customize_responder::CustomizeResponder>::insert_header", "Argument[self]", "ReturnValue", "value", "dfc-generated"]
       - ["repo:https://github.com/actix/actix-web:actix-web", "<crate::response::customize_responder::CustomizeResponder>::new", "Argument[0]", "ReturnValue.Field[crate::response::customize_responder::CustomizeResponder::inner].Field[crate::response::customize_responder::CustomizeResponderInner::responder]", "value", "dfc-generated"]
+      - ["repo:https://github.com/actix/actix-web:actix-web", "<crate::response::customize_responder::CustomizeResponder>::with_header", "Argument[self]", "ReturnValue", "value", "dfc-generated"]
       - ["repo:https://github.com/actix/actix-web:actix-web", "<crate::response::customize_responder::CustomizeResponder>::with_status", "Argument[self]", "ReturnValue", "value", "dfc-generated"]
       - ["repo:https://github.com/actix/actix-web:actix-web", "<crate::response::response::HttpResponse as crate::convert::From>::from", "Argument[0].Field[crate::service::ServiceResponse::response]", "ReturnValue", "value", "dfc-generated"]
       - ["repo:https://github.com/actix/actix-web:actix-web", "<crate::response::response::HttpResponse as crate::convert::From>::from", "Argument[0]", "ReturnValue.Field[crate::response::response::HttpResponse::res]", "value", "dfc-generated"]
@@ -156,6 +161,8 @@ extensions:
       - ["repo:https://github.com/actix/actix-web:actix-web", "<crate::response::response::HttpResponse>::drop_body", "Argument[self].Field[crate::response::response::HttpResponse::res].Field[crate::responses::response::Response::extensions]", "ReturnValue.Field[crate::response::response::HttpResponse::res].Field[crate::responses::response::Response::extensions]", "value", "dfc-generated"]
       - ["repo:https://github.com/actix/actix-web:actix-web", "<crate::response::response::HttpResponse>::drop_body", "Argument[self].Field[crate::response::response::HttpResponse::res].Field[crate::responses::response::Response::head]", "ReturnValue.Field[crate::response::response::HttpResponse::res].Field[crate::responses::response::Response::head]", "value", "dfc-generated"]
       - ["repo:https://github.com/actix/actix-web:actix-web", "<crate::response::response::HttpResponse>::error", "Argument[self].Field[crate::response::response::HttpResponse::error].Field[crate::option::Option::Some(0)]", "ReturnValue.Field[crate::option::Option::Some(0)].Reference", "value", "dfc-generated"]
+      - ["repo:https://github.com/actix/actix-web:actix-web", "<crate::response::response::HttpResponse>::extensions", "Argument[self]", "ReturnValue", "taint", "df-generated"]
+      - ["repo:https://github.com/actix/actix-web:actix-web", "<crate::response::response::HttpResponse>::extensions_mut", "Argument[self]", "ReturnValue", "taint", "df-generated"]
       - ["repo:https://github.com/actix/actix-web:actix-web", "<crate::response::response::HttpResponse>::head", "Argument[self].Field[crate::response::response::HttpResponse::res].Field[crate::responses::response::Response::head]", "ReturnValue.Reference", "value", "dfc-generated"]
       - ["repo:https://github.com/actix/actix-web:actix-web", "<crate::response::response::HttpResponse>::head_mut", "Argument[self].Field[crate::response::response::HttpResponse::res].Field[crate::responses::response::Response::head]", "ReturnValue.Reference", "value", "dfc-generated"]
       - ["repo:https://github.com/actix/actix-web:actix-web", "<crate::response::response::HttpResponse>::into_body", "Argument[self].Field[crate::response::response::HttpResponse::res].Field[crate::responses::response::Response::body]", "ReturnValue", "value", "dfc-generated"]
@@ -189,9 +196,11 @@ extensions:
       - ["repo:https://github.com/actix/actix-web:actix-web", "<crate::route::Route>::wrap", "Argument[self].Field[crate::route::Route::guards]", "ReturnValue.Field[crate::route::Route::guards]", "value", "dfc-generated"]
       - ["repo:https://github.com/actix/actix-web:actix-web", "<crate::scope::Scope>::app_data", "Argument[self]", "ReturnValue", "value", "dfc-generated"]
       - ["repo:https://github.com/actix/actix-web:actix-web", "<crate::scope::Scope>::configure", "Argument[self]", "ReturnValue", "value", "dfc-generated"]
+      - ["repo:https://github.com/actix/actix-web:actix-web", "<crate::scope::Scope>::data", "Argument[self]", "ReturnValue", "value", "dfc-generated"]
       - ["repo:https://github.com/actix/actix-web:actix-web", "<crate::scope::Scope>::default_service", "Argument[self]", "ReturnValue", "value", "dfc-generated"]
       - ["repo:https://github.com/actix/actix-web:actix-web", "<crate::scope::Scope>::guard", "Argument[self]", "ReturnValue", "value", "dfc-generated"]
       - ["repo:https://github.com/actix/actix-web:actix-web", "<crate::scope::Scope>::new", "Argument[0]", "ReturnValue", "taint", "df-generated"]
+      - ["repo:https://github.com/actix/actix-web:actix-web", "<crate::scope::Scope>::route", "Argument[self]", "ReturnValue", "value", "dfc-generated"]
       - ["repo:https://github.com/actix/actix-web:actix-web", "<crate::scope::Scope>::service", "Argument[self]", "ReturnValue", "value", "dfc-generated"]
       - ["repo:https://github.com/actix/actix-web:actix-web", "<crate::scope::Scope>::wrap", "Argument[self]", "ReturnValue", "taint", "df-generated"]
       - ["repo:https://github.com/actix/actix-web:actix-web", "<crate::scope::Scope>::wrap_fn", "Argument[self]", "ReturnValue", "taint", "df-generated"]
@@ -208,10 +217,17 @@ extensions:
       - ["repo:https://github.com/actix/actix-web:actix-web", "<crate::server::HttpServer>::bind_uds", "Argument[self]", "ReturnValue.Field[crate::result::Result::Ok(0)]", "value", "dfc-generated"]
       - ["repo:https://github.com/actix/actix-web:actix-web", "<crate::server::HttpServer>::client_disconnect_timeout", "Argument[self]", "ReturnValue", "value", "dfc-generated"]
       - ["repo:https://github.com/actix/actix-web:actix-web", "<crate::server::HttpServer>::client_request_timeout", "Argument[self]", "ReturnValue", "value", "dfc-generated"]
+      - ["repo:https://github.com/actix/actix-web:actix-web", "<crate::server::HttpServer>::client_shutdown", "Argument[self]", "ReturnValue", "value", "dfc-generated"]
+      - ["repo:https://github.com/actix/actix-web:actix-web", "<crate::server::HttpServer>::client_timeout", "Argument[self]", "ReturnValue", "value", "dfc-generated"]
       - ["repo:https://github.com/actix/actix-web:actix-web", "<crate::server::HttpServer>::disable_signals", "Argument[self]", "ReturnValue", "value", "dfc-generated"]
       - ["repo:https://github.com/actix/actix-web:actix-web", "<crate::server::HttpServer>::keep_alive", "Argument[self]", "ReturnValue", "value", "dfc-generated"]
       - ["repo:https://github.com/actix/actix-web:actix-web", "<crate::server::HttpServer>::listen", "Argument[self]", "ReturnValue.Field[crate::result::Result::Ok(0)]", "value", "dfc-generated"]
       - ["repo:https://github.com/actix/actix-web:actix-web", "<crate::server::HttpServer>::listen_auto_h2c", "Argument[self]", "ReturnValue.Field[crate::result::Result::Ok(0)]", "value", "dfc-generated"]
+      - ["repo:https://github.com/actix/actix-web:actix-web", "<crate::server::HttpServer>::listen_openssl", "Argument[self]", "ReturnValue.Field[crate::result::Result::Ok(0)]", "value", "dfc-generated"]
+      - ["repo:https://github.com/actix/actix-web:actix-web", "<crate::server::HttpServer>::listen_rustls", "Argument[self]", "ReturnValue.Field[crate::result::Result::Ok(0)]", "value", "dfc-generated"]
+      - ["repo:https://github.com/actix/actix-web:actix-web", "<crate::server::HttpServer>::listen_rustls_0_21", "Argument[self]", "ReturnValue.Field[crate::result::Result::Ok(0)]", "value", "dfc-generated"]
+      - ["repo:https://github.com/actix/actix-web:actix-web", "<crate::server::HttpServer>::listen_rustls_0_22", "Argument[self]", "ReturnValue.Field[crate::result::Result::Ok(0)]", "value", "dfc-generated"]
+      - ["repo:https://github.com/actix/actix-web:actix-web", "<crate::server::HttpServer>::listen_rustls_0_23", "Argument[self]", "ReturnValue.Field[crate::result::Result::Ok(0)]", "value", "dfc-generated"]
       - ["repo:https://github.com/actix/actix-web:actix-web", "<crate::server::HttpServer>::listen_uds", "Argument[self]", "ReturnValue.Field[crate::result::Result::Ok(0)]", "value", "dfc-generated"]
       - ["repo:https://github.com/actix/actix-web:actix-web", "<crate::server::HttpServer>::max_connection_rate", "Argument[self]", "ReturnValue", "value", "dfc-generated"]
       - ["repo:https://github.com/actix/actix-web:actix-web", "<crate::server::HttpServer>::max_connections", "Argument[self]", "ReturnValue", "value", "dfc-generated"]
@@ -225,8 +241,6 @@ extensions:
       - ["repo:https://github.com/actix/actix-web:actix-web", "<crate::server::HttpServer>::worker_max_blocking_threads", "Argument[self]", "ReturnValue", "value", "dfc-generated"]
       - ["repo:https://github.com/actix/actix-web:actix-web", "<crate::server::HttpServer>::workers", "Argument[self]", "ReturnValue", "value", "dfc-generated"]
       - ["repo:https://github.com/actix/actix-web:actix-web", "<crate::service::ServiceFactoryWrapper>::new", "Argument[0]", "ReturnValue.Field[crate::service::ServiceFactoryWrapper::factory].Field[crate::option::Option::Some(0)]", "value", "dfc-generated"]
-      - ["repo:https://github.com/actix/actix-web:actix-web", "<crate::service::ServiceRequest as crate::http_message::HttpMessage>::take_payload", "Argument[self].Field[crate::service::ServiceRequest::payload].Reference", "ReturnValue", "value", "dfc-generated"]
-      - ["repo:https://github.com/actix/actix-web:actix-web", "<crate::service::ServiceRequest as crate::http_message::HttpMessage>::take_payload", "Argument[self].Field[crate::service::ServiceRequest::payload]", "ReturnValue", "value", "dfc-generated"]
       - ["repo:https://github.com/actix/actix-web:actix-web", "<crate::service::ServiceRequest>::error_response", "Argument[self].Field[crate::service::ServiceRequest::req]", "ReturnValue.Field[crate::service::ServiceResponse::request]", "value", "dfc-generated"]
       - ["repo:https://github.com/actix/actix-web:actix-web", "<crate::service::ServiceRequest>::from_parts", "Argument[0]", "ReturnValue.Field[crate::service::ServiceRequest::req]", "value", "dfc-generated"]
       - ["repo:https://github.com/actix/actix-web:actix-web", "<crate::service::ServiceRequest>::from_parts", "Argument[1]", "ReturnValue.Field[crate::service::ServiceRequest::payload]", "value", "dfc-generated"]
@@ -373,13 +387,20 @@ extensions:
       pack: codeql/rust-all
       extensible: sinkModel
     data:
+      - ["repo:https://github.com/actix/actix-web:actix-web", "<crate::http::header::accept::Accept>::ranked", "Argument[self]", "pointer-access", "df-generated"]
+      - ["repo:https://github.com/actix/actix-web:actix-web", "<crate::http::header::accept_encoding::AcceptEncoding>::negotiate", "Argument[self]", "pointer-access", "df-generated"]
+      - ["repo:https://github.com/actix/actix-web:actix-web", "<crate::http::header::accept_encoding::AcceptEncoding>::ranked", "Argument[self]", "pointer-access", "df-generated"]
+      - ["repo:https://github.com/actix/actix-web:actix-web", "<crate::http::header::accept_language::AcceptLanguage>::ranked", "Argument[self]", "pointer-access", "df-generated"]
       - ["repo:https://github.com/actix/actix-web:actix-web", "<crate::http::header::entity::EntityTag>::new", "Argument[1]", "log-injection", "df-generated"]
       - ["repo:https://github.com/actix/actix-web:actix-web", "<crate::http::header::entity::EntityTag>::new_strong", "Argument[0]", "log-injection", "df-generated"]
       - ["repo:https://github.com/actix/actix-web:actix-web", "<crate::http::header::entity::EntityTag>::new_weak", "Argument[0]", "log-injection", "df-generated"]
       - ["repo:https://github.com/actix/actix-web:actix-web", "<crate::http::header::entity::EntityTag>::strong", "Argument[0]", "log-injection", "df-generated"]
       - ["repo:https://github.com/actix/actix-web:actix-web", "<crate::http::header::entity::EntityTag>::weak", "Argument[0]", "log-injection", "df-generated"]
+      - ["repo:https://github.com/actix/actix-web:actix-web", "<crate::info::ConnectionInfo>::new", "Argument[0]", "pointer-access", "df-generated"]
       - ["repo:https://github.com/actix/actix-web:actix-web", "<crate::middleware::logger::Format>::new", "Argument[0]", "log-injection", "df-generated"]
       - ["repo:https://github.com/actix/actix-web:actix-web", "<crate::middleware::logger::Logger>::custom_request_replace", "Argument[0]", "log-injection", "df-generated"]
       - ["repo:https://github.com/actix/actix-web:actix-web", "<crate::middleware::logger::Logger>::custom_response_replace", "Argument[0]", "log-injection", "df-generated"]
       - ["repo:https://github.com/actix/actix-web:actix-web", "<crate::middleware::logger::Logger>::new", "Argument[0]", "log-injection", "df-generated"]
       - ["repo:https://github.com/actix/actix-web:actix-web", "<crate::redirect::Redirect as crate::response::responder::Responder>::respond_to", "Argument[self]", "log-injection", "df-generated"]
+      - ["repo:https://github.com/actix/actix-web:actix-web", "<crate::resource::Resource as crate::service::HttpServiceFactory>::register", "Argument[self]", "pointer-access", "df-generated"]
+      - ["repo:https://github.com/actix/actix-web:actix-web", "<crate::scope::Scope as crate::service::HttpServiceFactory>::register", "Argument[self]", "pointer-access", "df-generated"]
diff --git a/rust/ql/lib/ext/generated/actix-web/repo-https-github.com-actix-actix-web-awc.model.yml b/rust/ql/lib/ext/generated/actix-web/repo-https-github.com-actix-actix-web-awc.model.yml
index 30828f012fa..89bb79bf279 100644
--- a/rust/ql/lib/ext/generated/actix-web/repo-https-github.com-actix-actix-web-awc.model.yml
+++ b/rust/ql/lib/ext/generated/actix-web/repo-https-github.com-actix-actix-web-awc.model.yml
@@ -5,9 +5,12 @@ extensions:
       extensible: summaryModel
     data:
       - ["repo:https://github.com/actix/actix-web:awc", "<crate::builder::ClientBuilder>::add_default_header", "Argument[self]", "ReturnValue", "value", "dfc-generated"]
+      - ["repo:https://github.com/actix/actix-web:awc", "<crate::builder::ClientBuilder>::basic_auth", "Argument[self]", "ReturnValue", "value", "dfc-generated"]
+      - ["repo:https://github.com/actix/actix-web:awc", "<crate::builder::ClientBuilder>::bearer_auth", "Argument[self]", "ReturnValue", "value", "dfc-generated"]
       - ["repo:https://github.com/actix/actix-web:awc", "<crate::builder::ClientBuilder>::connector", "Argument[0]", "ReturnValue.Field[crate::builder::ClientBuilder::connector]", "value", "dfc-generated"]
       - ["repo:https://github.com/actix/actix-web:awc", "<crate::builder::ClientBuilder>::disable_redirects", "Argument[self]", "ReturnValue", "value", "dfc-generated"]
       - ["repo:https://github.com/actix/actix-web:awc", "<crate::builder::ClientBuilder>::disable_timeout", "Argument[self]", "ReturnValue", "value", "dfc-generated"]
+      - ["repo:https://github.com/actix/actix-web:awc", "<crate::builder::ClientBuilder>::finish", "Argument[self].Field[crate::builder::ClientBuilder::timeout]", "ReturnValue.Field[crate::client::Client(0)].Field[crate::client::ClientConfig::timeout]", "value", "dfc-generated"]
       - ["repo:https://github.com/actix/actix-web:awc", "<crate::builder::ClientBuilder>::header", "Argument[self]", "ReturnValue", "value", "dfc-generated"]
       - ["repo:https://github.com/actix/actix-web:awc", "<crate::builder::ClientBuilder>::initial_connection_window_size", "Argument[0]", "Argument[self].Field[crate::builder::ClientBuilder::conn_window_size].Field[crate::option::Option::Some(0)]", "value", "dfc-generated"]
       - ["repo:https://github.com/actix/actix-web:awc", "<crate::builder::ClientBuilder>::initial_connection_window_size", "Argument[0]", "ReturnValue.Field[crate::builder::ClientBuilder::conn_window_size].Field[crate::option::Option::Some(0)]", "value", "dfc-generated"]
@@ -29,18 +32,34 @@ extensions:
       - ["repo:https://github.com/actix/actix-web:awc", "<crate::builder::ClientBuilder>::timeout", "Argument[0]", "ReturnValue.Field[crate::builder::ClientBuilder::timeout].Field[crate::option::Option::Some(0)]", "value", "dfc-generated"]
       - ["repo:https://github.com/actix/actix-web:awc", "<crate::builder::ClientBuilder>::timeout", "Argument[self]", "ReturnValue", "value", "dfc-generated"]
       - ["repo:https://github.com/actix/actix-web:awc", "<crate::builder::ClientBuilder>::wrap", "Argument[0]", "ReturnValue.Field[crate::builder::ClientBuilder::middleware].Field[crate::middleware::NestTransform::parent]", "value", "dfc-generated"]
-      - ["repo:https://github.com/actix/actix-web:awc", "<crate::client::Client>::delete", "Argument[self]", "ReturnValue", "taint", "df-generated"]
-      - ["repo:https://github.com/actix/actix-web:awc", "<crate::client::Client>::get", "Argument[self]", "ReturnValue", "taint", "df-generated"]
-      - ["repo:https://github.com/actix/actix-web:awc", "<crate::client::Client>::head", "Argument[self]", "ReturnValue", "taint", "df-generated"]
-      - ["repo:https://github.com/actix/actix-web:awc", "<crate::client::Client>::options", "Argument[self]", "ReturnValue", "taint", "df-generated"]
-      - ["repo:https://github.com/actix/actix-web:awc", "<crate::client::Client>::patch", "Argument[self]", "ReturnValue", "taint", "df-generated"]
-      - ["repo:https://github.com/actix/actix-web:awc", "<crate::client::Client>::post", "Argument[self]", "ReturnValue", "taint", "df-generated"]
-      - ["repo:https://github.com/actix/actix-web:awc", "<crate::client::Client>::put", "Argument[self]", "ReturnValue", "taint", "df-generated"]
+      - ["repo:https://github.com/actix/actix-web:awc", "<crate::client::Client>::delete", "Argument[self].Field[0].Reference", "ReturnValue.Field[crate::request::ClientRequest::config]", "value", "dfc-generated"]
+      - ["repo:https://github.com/actix/actix-web:awc", "<crate::client::Client>::delete", "Argument[self].Field[crate::client::Client(0)].Reference", "ReturnValue.Field[crate::request::ClientRequest::config]", "value", "dfc-generated"]
+      - ["repo:https://github.com/actix/actix-web:awc", "<crate::client::Client>::get", "Argument[self].Field[0].Reference", "ReturnValue.Field[crate::request::ClientRequest::config]", "value", "dfc-generated"]
+      - ["repo:https://github.com/actix/actix-web:awc", "<crate::client::Client>::get", "Argument[self].Field[crate::client::Client(0)].Reference", "ReturnValue.Field[crate::request::ClientRequest::config]", "value", "dfc-generated"]
+      - ["repo:https://github.com/actix/actix-web:awc", "<crate::client::Client>::head", "Argument[self].Field[0].Reference", "ReturnValue.Field[crate::request::ClientRequest::config]", "value", "dfc-generated"]
+      - ["repo:https://github.com/actix/actix-web:awc", "<crate::client::Client>::head", "Argument[self].Field[crate::client::Client(0)].Reference", "ReturnValue.Field[crate::request::ClientRequest::config]", "value", "dfc-generated"]
+      - ["repo:https://github.com/actix/actix-web:awc", "<crate::client::Client>::options", "Argument[self].Field[0].Reference", "ReturnValue.Field[crate::request::ClientRequest::config]", "value", "dfc-generated"]
+      - ["repo:https://github.com/actix/actix-web:awc", "<crate::client::Client>::options", "Argument[self].Field[crate::client::Client(0)].Reference", "ReturnValue.Field[crate::request::ClientRequest::config]", "value", "dfc-generated"]
+      - ["repo:https://github.com/actix/actix-web:awc", "<crate::client::Client>::patch", "Argument[self].Field[0].Reference", "ReturnValue.Field[crate::request::ClientRequest::config]", "value", "dfc-generated"]
+      - ["repo:https://github.com/actix/actix-web:awc", "<crate::client::Client>::patch", "Argument[self].Field[crate::client::Client(0)].Reference", "ReturnValue.Field[crate::request::ClientRequest::config]", "value", "dfc-generated"]
+      - ["repo:https://github.com/actix/actix-web:awc", "<crate::client::Client>::post", "Argument[self].Field[0].Reference", "ReturnValue.Field[crate::request::ClientRequest::config]", "value", "dfc-generated"]
+      - ["repo:https://github.com/actix/actix-web:awc", "<crate::client::Client>::post", "Argument[self].Field[crate::client::Client(0)].Reference", "ReturnValue.Field[crate::request::ClientRequest::config]", "value", "dfc-generated"]
+      - ["repo:https://github.com/actix/actix-web:awc", "<crate::client::Client>::put", "Argument[self].Field[0].Reference", "ReturnValue.Field[crate::request::ClientRequest::config]", "value", "dfc-generated"]
+      - ["repo:https://github.com/actix/actix-web:awc", "<crate::client::Client>::put", "Argument[self].Field[crate::client::Client(0)].Reference", "ReturnValue.Field[crate::request::ClientRequest::config]", "value", "dfc-generated"]
       - ["repo:https://github.com/actix/actix-web:awc", "<crate::client::Client>::request", "Argument[0]", "ReturnValue.Field[crate::request::ClientRequest::head].Field[crate::requests::head::RequestHead::method]", "value", "dfc-generated"]
+      - ["repo:https://github.com/actix/actix-web:awc", "<crate::client::Client>::request", "Argument[self].Field[0].Reference", "ReturnValue.Field[crate::request::ClientRequest::config]", "value", "dfc-generated"]
+      - ["repo:https://github.com/actix/actix-web:awc", "<crate::client::Client>::request", "Argument[self].Field[crate::client::Client(0)].Reference", "ReturnValue.Field[crate::request::ClientRequest::config]", "value", "dfc-generated"]
       - ["repo:https://github.com/actix/actix-web:awc", "<crate::client::Client>::request_from", "Argument[1].Field[crate::requests::head::RequestHead::method].Reference", "ReturnValue.Field[crate::request::ClientRequest::head].Field[crate::requests::head::RequestHead::method]", "value", "dfc-generated"]
-      - ["repo:https://github.com/actix/actix-web:awc", "<crate::client::Client>::request_from", "Argument[1].Field[crate::requests::head::RequestHead::method]", "ReturnValue.Field[crate::request::ClientRequest::head].Field[crate::requests::head::RequestHead::method]", "value", "dfc-generated"]
-      - ["repo:https://github.com/actix/actix-web:awc", "<crate::client::Client>::ws", "Argument[self]", "ReturnValue", "taint", "df-generated"]
+      - ["repo:https://github.com/actix/actix-web:awc", "<crate::client::Client>::request_from", "Argument[self].Field[0].Reference", "ReturnValue.Field[crate::request::ClientRequest::config]", "value", "dfc-generated"]
+      - ["repo:https://github.com/actix/actix-web:awc", "<crate::client::Client>::request_from", "Argument[self].Field[crate::client::Client(0)].Reference", "ReturnValue.Field[crate::request::ClientRequest::config]", "value", "dfc-generated"]
+      - ["repo:https://github.com/actix/actix-web:awc", "<crate::client::Client>::ws", "Argument[self].Field[0].Reference", "ReturnValue.Field[crate::ws::WebsocketsRequest::config]", "value", "dfc-generated"]
+      - ["repo:https://github.com/actix/actix-web:awc", "<crate::client::Client>::ws", "Argument[self].Field[crate::client::Client(0)].Reference", "ReturnValue.Field[crate::ws::WebsocketsRequest::config]", "value", "dfc-generated"]
       - ["repo:https://github.com/actix/actix-web:awc", "<crate::client::config::ConnectorConfig>::no_disconnect_timeout", "Argument[self].Reference", "ReturnValue", "value", "dfc-generated"]
+      - ["repo:https://github.com/actix/actix-web:awc", "<crate::client::connection::Connection>::open_tunnel", "Argument[0]", "ReturnValue.Reference", "value", "dfc-generated"]
+      - ["repo:https://github.com/actix/actix-web:awc", "<crate::client::connection::Connection>::open_tunnel", "Argument[self]", "ReturnValue.Reference", "value", "dfc-generated"]
+      - ["repo:https://github.com/actix/actix-web:awc", "<crate::client::connection::Connection>::send_request", "Argument[0]", "ReturnValue.Reference", "value", "dfc-generated"]
+      - ["repo:https://github.com/actix/actix-web:awc", "<crate::client::connection::Connection>::send_request", "Argument[1]", "ReturnValue.Reference", "value", "dfc-generated"]
+      - ["repo:https://github.com/actix/actix-web:awc", "<crate::client::connection::Connection>::send_request", "Argument[self]", "ReturnValue.Reference", "value", "dfc-generated"]
       - ["repo:https://github.com/actix/actix-web:awc", "<crate::client::connection::H2ConnectionInner>::new", "Argument[0]", "ReturnValue.Field[crate::client::connection::H2ConnectionInner::sender]", "value", "dfc-generated"]
       - ["repo:https://github.com/actix/actix-web:awc", "<crate::client::connector::Connector>::conn_keep_alive", "Argument[0]", "Argument[self].Field[crate::client::connector::Connector::config].Field[crate::client::config::ConnectorConfig::conn_keep_alive]", "value", "dfc-generated"]
       - ["repo:https://github.com/actix/actix-web:awc", "<crate::client::connector::Connector>::conn_keep_alive", "Argument[0]", "ReturnValue.Field[crate::client::connector::Connector::config].Field[crate::client::config::ConnectorConfig::conn_keep_alive]", "value", "dfc-generated"]
@@ -88,21 +107,23 @@ extensions:
       - ["repo:https://github.com/actix/actix-web:awc", "<crate::client::connector::Connector>::timeout", "Argument[0]", "Argument[self].Field[crate::client::connector::Connector::config].Field[crate::client::config::ConnectorConfig::timeout]", "value", "dfc-generated"]
       - ["repo:https://github.com/actix/actix-web:awc", "<crate::client::connector::Connector>::timeout", "Argument[0]", "ReturnValue.Field[crate::client::connector::Connector::config].Field[crate::client::config::ConnectorConfig::timeout]", "value", "dfc-generated"]
       - ["repo:https://github.com/actix/actix-web:awc", "<crate::client::connector::Connector>::timeout", "Argument[self]", "ReturnValue", "value", "dfc-generated"]
+      - ["repo:https://github.com/actix/actix-web:awc", "<crate::client::connector::ConnectorServicePriv as crate::Service>::call", "Argument[0]", "ReturnValue", "taint", "df-generated"]
+      - ["repo:https://github.com/actix/actix-web:awc", "<crate::client::connector::ConnectorServicePriv as crate::Service>::call", "Argument[self]", "ReturnValue", "taint", "df-generated"]
       - ["repo:https://github.com/actix/actix-web:awc", "<crate::client::connector::TlsConnectorService as crate::Service>::call", "Argument[self].Field[crate::client::connector::TlsConnectorService::timeout]", "ReturnValue.Field[crate::client::connector::TlsConnectorFuture::TcpConnect::timeout]", "value", "dfc-generated"]
       - ["repo:https://github.com/actix/actix-web:awc", "<crate::client::connector::TlsConnectorService as crate::Service>::call", "Argument[self].Field[crate::client::connector::TlsConnectorService::tls_service].Reference", "ReturnValue.Field[crate::client::connector::TlsConnectorFuture::TcpConnect::tls_service].Field[crate::option::Option::Some(0)]", "value", "dfc-generated"]
       - ["repo:https://github.com/actix/actix-web:awc", "<crate::client::connector::TlsConnectorService as crate::Service>::call", "Argument[self].Field[crate::client::connector::TlsConnectorService::tls_service]", "ReturnValue.Field[crate::client::connector::TlsConnectorFuture::TcpConnect::tls_service].Field[crate::option::Option::Some(0)]", "value", "dfc-generated"]
       - ["repo:https://github.com/actix/actix-web:awc", "<crate::client::error::ConnectError as crate::convert::From>::from", "Argument[0]", "ReturnValue.Field[crate::client::error::ConnectError::Io(0)]", "value", "dfc-generated"]
       - ["repo:https://github.com/actix/actix-web:awc", "<crate::client::error::ConnectError as crate::convert::From>::from", "Argument[0]", "ReturnValue.Field[crate::client::error::ConnectError::Resolver(0)]", "value", "dfc-generated"]
-      - ["repo:https://github.com/actix/actix-web:awc", "<crate::client::error::FreezeRequestError as crate::convert::From>::from", "Argument[0].Field[crate::sender::PrepForSendingError::Http(0)]", "ReturnValue.Field[crate::client::error::FreezeRequestError::Http(0)]", "value", "dfc-generated"]
-      - ["repo:https://github.com/actix/actix-web:awc", "<crate::client::error::FreezeRequestError as crate::convert::From>::from", "Argument[0].Field[crate::sender::PrepForSendingError::Url(0)]", "ReturnValue.Field[crate::client::error::FreezeRequestError::Url(0)]", "value", "dfc-generated"]
+      - ["repo:https://github.com/actix/actix-web:awc", "<crate::client::error::FreezeRequestError as crate::convert::From>::from", "Argument[0]", "ReturnValue", "taint", "df-generated"]
       - ["repo:https://github.com/actix/actix-web:awc", "<crate::client::error::SendRequestError as crate::convert::From>::from", "Argument[0].Field[crate::client::error::FreezeRequestError::Custom(0)]", "ReturnValue.Field[crate::client::error::SendRequestError::Custom(0)]", "value", "dfc-generated"]
       - ["repo:https://github.com/actix/actix-web:awc", "<crate::client::error::SendRequestError as crate::convert::From>::from", "Argument[0].Field[crate::client::error::FreezeRequestError::Custom(1)]", "ReturnValue.Field[crate::client::error::SendRequestError::Custom(1)]", "value", "dfc-generated"]
-      - ["repo:https://github.com/actix/actix-web:awc", "<crate::client::error::SendRequestError as crate::convert::From>::from", "Argument[0].Field[crate::sender::PrepForSendingError::Http(0)]", "ReturnValue.Field[crate::client::error::SendRequestError::Http(0)]", "value", "dfc-generated"]
-      - ["repo:https://github.com/actix/actix-web:awc", "<crate::client::error::SendRequestError as crate::convert::From>::from", "Argument[0].Field[crate::sender::PrepForSendingError::Url(0)]", "ReturnValue.Field[crate::client::error::SendRequestError::Url(0)]", "value", "dfc-generated"]
+      - ["repo:https://github.com/actix/actix-web:awc", "<crate::client::error::SendRequestError as crate::convert::From>::from", "Argument[0]", "ReturnValue", "taint", "df-generated"]
+      - ["repo:https://github.com/actix/actix-web:awc", "<crate::client::pool::ConnectionPool as crate::Service>::call", "Argument[0]", "ReturnValue.Reference", "value", "dfc-generated"]
       - ["repo:https://github.com/actix/actix-web:awc", "<crate::client::pool::ConnectionPool>::new", "Argument[0]", "ReturnValue.Field[crate::client::pool::ConnectionPool::connector]", "value", "dfc-generated"]
       - ["repo:https://github.com/actix/actix-web:awc", "<crate::client::pool::ConnectionPoolInner as crate::ops::deref::Deref>::deref", "Argument[self].Field[0]", "ReturnValue.Reference", "value", "dfc-generated"]
       - ["repo:https://github.com/actix/actix-web:awc", "<crate::client::pool::ConnectionPoolInner as crate::ops::deref::Deref>::deref", "Argument[self].Field[crate::client::pool::ConnectionPoolInner(0)]", "ReturnValue.Reference", "value", "dfc-generated"]
       - ["repo:https://github.com/actix/actix-web:awc", "<crate::client::pool::Key as crate::convert::From>::from", "Argument[0]", "ReturnValue.Field[crate::client::pool::Key::authority]", "value", "dfc-generated"]
+      - ["repo:https://github.com/actix/actix-web:awc", "<crate::client::pool::test::TestPoolConnector as crate::Service>::call", "Argument[self].Field[crate::client::pool::test::TestPoolConnector::generated].Reference", "ReturnValue.Reference", "value", "dfc-generated"]
       - ["repo:https://github.com/actix/actix-web:awc", "<crate::connect::ConnectResponse>::into_client_response", "Argument[self].Field[crate::connect::ConnectResponse::Client(0)]", "ReturnValue", "value", "dfc-generated"]
       - ["repo:https://github.com/actix/actix-web:awc", "<crate::connect::ConnectResponse>::into_tunnel_response", "Argument[self].Field[crate::connect::ConnectResponse::Tunnel(0)]", "ReturnValue.Field[0]", "value", "dfc-generated"]
       - ["repo:https://github.com/actix/actix-web:awc", "<crate::connect::ConnectResponse>::into_tunnel_response", "Argument[self].Field[crate::connect::ConnectResponse::Tunnel(1)]", "ReturnValue.Field[1]", "value", "dfc-generated"]
@@ -167,18 +188,16 @@ extensions:
       - ["repo:https://github.com/actix/actix-web:awc", "<crate::request::ClientRequest>::version", "Argument[0]", "ReturnValue.Field[crate::request::ClientRequest::head].Field[crate::requests::head::RequestHead::version]", "value", "dfc-generated"]
       - ["repo:https://github.com/actix/actix-web:awc", "<crate::request::ClientRequest>::version", "Argument[self]", "ReturnValue", "value", "dfc-generated"]
       - ["repo:https://github.com/actix/actix-web:awc", "<crate::responses::json_body::JsonBody>::limit", "Argument[self]", "ReturnValue", "value", "dfc-generated"]
-      - ["repo:https://github.com/actix/actix-web:awc", "<crate::responses::json_body::JsonBody>::new", "Argument[0].Field[crate::responses::response::ClientResponse::timeout]", "ReturnValue.Field[crate::responses::json_body::JsonBody::timeout]", "value", "dfc-generated"]
       - ["repo:https://github.com/actix/actix-web:awc", "<crate::responses::read_body::ReadBody>::new", "Argument[0]", "ReturnValue.Field[crate::responses::read_body::ReadBody::stream]", "value", "dfc-generated"]
       - ["repo:https://github.com/actix/actix-web:awc", "<crate::responses::read_body::ReadBody>::new", "Argument[1]", "ReturnValue.Field[crate::responses::read_body::ReadBody::limit]", "value", "dfc-generated"]
+      - ["repo:https://github.com/actix/actix-web:awc", "<crate::responses::response::ClientResponse as crate::http_message::HttpMessage>::extensions", "Argument[self]", "ReturnValue", "taint", "df-generated"]
+      - ["repo:https://github.com/actix/actix-web:awc", "<crate::responses::response::ClientResponse as crate::http_message::HttpMessage>::extensions_mut", "Argument[self]", "ReturnValue", "taint", "df-generated"]
       - ["repo:https://github.com/actix/actix-web:awc", "<crate::responses::response::ClientResponse as crate::http_message::HttpMessage>::headers", "Argument[self].Field[crate::responses::response::ClientResponse::head].Field[crate::responses::head::ResponseHead::headers]", "ReturnValue.Reference", "value", "dfc-generated"]
-      - ["repo:https://github.com/actix/actix-web:awc", "<crate::responses::response::ClientResponse as crate::http_message::HttpMessage>::take_payload", "Argument[self].Field[crate::responses::response::ClientResponse::payload]", "ReturnValue", "value", "dfc-generated"]
       - ["repo:https://github.com/actix/actix-web:awc", "<crate::responses::response::ClientResponse>::_timeout", "Argument[0]", "Argument[self].Field[crate::responses::response::ClientResponse::timeout].Field[crate::responses::ResponseTimeout::Disabled(0)]", "value", "dfc-generated"]
       - ["repo:https://github.com/actix/actix-web:awc", "<crate::responses::response::ClientResponse>::_timeout", "Argument[0]", "ReturnValue.Field[crate::responses::response::ClientResponse::timeout].Field[crate::responses::ResponseTimeout::Disabled(0)]", "value", "dfc-generated"]
       - ["repo:https://github.com/actix/actix-web:awc", "<crate::responses::response::ClientResponse>::_timeout", "Argument[self]", "ReturnValue", "value", "dfc-generated"]
-      - ["repo:https://github.com/actix/actix-web:awc", "<crate::responses::response::ClientResponse>::body", "Argument[self].Field[crate::responses::response::ClientResponse::timeout]", "ReturnValue.Field[crate::responses::response_body::ResponseBody::timeout]", "value", "dfc-generated"]
       - ["repo:https://github.com/actix/actix-web:awc", "<crate::responses::response::ClientResponse>::head", "Argument[self].Field[crate::responses::response::ClientResponse::head]", "ReturnValue.Reference", "value", "dfc-generated"]
       - ["repo:https://github.com/actix/actix-web:awc", "<crate::responses::response::ClientResponse>::headers", "Argument[self]", "ReturnValue", "taint", "df-generated"]
-      - ["repo:https://github.com/actix/actix-web:awc", "<crate::responses::response::ClientResponse>::json", "Argument[self].Field[crate::responses::response::ClientResponse::timeout]", "ReturnValue.Field[crate::responses::json_body::JsonBody::timeout]", "value", "dfc-generated"]
       - ["repo:https://github.com/actix/actix-web:awc", "<crate::responses::response::ClientResponse>::map_body", "Argument[0].ReturnValue", "ReturnValue.Field[crate::responses::response::ClientResponse::payload]", "value", "dfc-generated"]
       - ["repo:https://github.com/actix/actix-web:awc", "<crate::responses::response::ClientResponse>::new", "Argument[0]", "ReturnValue.Field[crate::responses::response::ClientResponse::head]", "value", "dfc-generated"]
       - ["repo:https://github.com/actix/actix-web:awc", "<crate::responses::response::ClientResponse>::new", "Argument[1]", "ReturnValue.Field[crate::responses::response::ClientResponse::payload]", "value", "dfc-generated"]
@@ -186,7 +205,6 @@ extensions:
       - ["repo:https://github.com/actix/actix-web:awc", "<crate::responses::response::ClientResponse>::timeout", "Argument[self]", "ReturnValue", "taint", "df-generated"]
       - ["repo:https://github.com/actix/actix-web:awc", "<crate::responses::response::ClientResponse>::version", "Argument[self]", "ReturnValue", "taint", "df-generated"]
       - ["repo:https://github.com/actix/actix-web:awc", "<crate::responses::response_body::ResponseBody>::limit", "Argument[self]", "ReturnValue", "value", "dfc-generated"]
-      - ["repo:https://github.com/actix/actix-web:awc", "<crate::responses::response_body::ResponseBody>::new", "Argument[0].Field[crate::responses::response::ClientResponse::timeout]", "ReturnValue.Field[crate::responses::response_body::ResponseBody::timeout]", "value", "dfc-generated"]
       - ["repo:https://github.com/actix/actix-web:awc", "<crate::sender::RequestSender>::send", "Argument[1]", "ReturnValue.Field[crate::sender::SendClientRequest::Fut(2)]", "value", "dfc-generated"]
       - ["repo:https://github.com/actix/actix-web:awc", "<crate::sender::RequestSender>::send_body", "Argument[1]", "ReturnValue.Field[crate::sender::SendClientRequest::Fut(2)]", "value", "dfc-generated"]
       - ["repo:https://github.com/actix/actix-web:awc", "<crate::sender::RequestSender>::send_form", "Argument[1]", "ReturnValue.Field[crate::sender::SendClientRequest::Fut(2)]", "value", "dfc-generated"]
@@ -223,4 +241,25 @@ extensions:
       pack: codeql/rust-all
       extensible: sinkModel
     data:
+      - ["repo:https://github.com/actix/actix-web:awc", "<crate::frozen::FrozenClientRequest>::send", "Argument[self]", "pointer-access", "df-generated"]
+      - ["repo:https://github.com/actix/actix-web:awc", "<crate::frozen::FrozenClientRequest>::send_body", "Argument[self]", "pointer-access", "df-generated"]
+      - ["repo:https://github.com/actix/actix-web:awc", "<crate::frozen::FrozenClientRequest>::send_form", "Argument[self]", "pointer-access", "df-generated"]
+      - ["repo:https://github.com/actix/actix-web:awc", "<crate::frozen::FrozenClientRequest>::send_json", "Argument[self]", "pointer-access", "df-generated"]
+      - ["repo:https://github.com/actix/actix-web:awc", "<crate::frozen::FrozenClientRequest>::send_stream", "Argument[self]", "pointer-access", "df-generated"]
+      - ["repo:https://github.com/actix/actix-web:awc", "<crate::frozen::FrozenSendBuilder>::send", "Argument[self]", "pointer-access", "df-generated"]
+      - ["repo:https://github.com/actix/actix-web:awc", "<crate::frozen::FrozenSendBuilder>::send_body", "Argument[self]", "pointer-access", "df-generated"]
+      - ["repo:https://github.com/actix/actix-web:awc", "<crate::frozen::FrozenSendBuilder>::send_form", "Argument[self]", "pointer-access", "df-generated"]
+      - ["repo:https://github.com/actix/actix-web:awc", "<crate::frozen::FrozenSendBuilder>::send_json", "Argument[self]", "pointer-access", "df-generated"]
+      - ["repo:https://github.com/actix/actix-web:awc", "<crate::frozen::FrozenSendBuilder>::send_stream", "Argument[self]", "pointer-access", "df-generated"]
+      - ["repo:https://github.com/actix/actix-web:awc", "<crate::sender::RequestSender>::send", "Argument[2]", "pointer-access", "df-generated"]
+      - ["repo:https://github.com/actix/actix-web:awc", "<crate::sender::RequestSender>::send", "Argument[3]", "pointer-access", "df-generated"]
+      - ["repo:https://github.com/actix/actix-web:awc", "<crate::sender::RequestSender>::send_body", "Argument[2]", "pointer-access", "df-generated"]
+      - ["repo:https://github.com/actix/actix-web:awc", "<crate::sender::RequestSender>::send_body", "Argument[3]", "pointer-access", "df-generated"]
+      - ["repo:https://github.com/actix/actix-web:awc", "<crate::sender::RequestSender>::send_form", "Argument[2]", "pointer-access", "df-generated"]
+      - ["repo:https://github.com/actix/actix-web:awc", "<crate::sender::RequestSender>::send_form", "Argument[3]", "pointer-access", "df-generated"]
+      - ["repo:https://github.com/actix/actix-web:awc", "<crate::sender::RequestSender>::send_json", "Argument[2]", "pointer-access", "df-generated"]
+      - ["repo:https://github.com/actix/actix-web:awc", "<crate::sender::RequestSender>::send_json", "Argument[3]", "pointer-access", "df-generated"]
+      - ["repo:https://github.com/actix/actix-web:awc", "<crate::sender::RequestSender>::send_stream", "Argument[2]", "pointer-access", "df-generated"]
+      - ["repo:https://github.com/actix/actix-web:awc", "<crate::sender::RequestSender>::send_stream", "Argument[3]", "pointer-access", "df-generated"]
+      - ["repo:https://github.com/actix/actix-web:awc", "<crate::sender::SendClientRequest>::new", "Argument[2]", "pointer-access", "df-generated"]
       - ["repo:https://github.com/actix/actix-web:awc", "crate::client::h2proto::send_request", "Argument[1]", "log-injection", "df-generated"]
diff --git a/rust/ql/lib/ext/generated/clap/repo-https-github.com-clap-rs-clap-clap.model.yml b/rust/ql/lib/ext/generated/clap/repo-https-github.com-clap-rs-clap-clap.model.yml
index f6539d8bde1..154e6912173 100644
--- a/rust/ql/lib/ext/generated/clap/repo-https-github.com-clap-rs-clap-clap.model.yml
+++ b/rust/ql/lib/ext/generated/clap/repo-https-github.com-clap-rs-clap-clap.model.yml
@@ -8,10 +8,17 @@ extensions:
       - ["repo:https://github.com/clap-rs/clap:clap", "<crate::CliArgs as crate::derive::Args>::augment_args_for_update", "Argument[0]", "ReturnValue", "value", "dfc-generated"]
       - ["repo:https://github.com/clap-rs/clap:clap", "<crate::CliSub as crate::derive::Subcommand>::augment_subcommands", "Argument[0]", "ReturnValue", "value", "dfc-generated"]
       - ["repo:https://github.com/clap-rs/clap:clap", "<crate::CliSub as crate::derive::Subcommand>::augment_subcommands_for_update", "Argument[0]", "ReturnValue", "value", "dfc-generated"]
+      - ["repo:https://github.com/clap-rs/clap:clap", "<crate::ColorWhen as crate::fmt::Display>::fmt", "Argument[0]", "ReturnValue", "taint", "df-generated"]
+      - ["repo:https://github.com/clap-rs/clap:clap", "<crate::Mode as crate::fmt::Display>::fmt", "Argument[0]", "ReturnValue", "taint", "df-generated"]
       - ["repo:https://github.com/clap-rs/clap:clap", "<crate::Mode as crate::str::traits::FromStr>::from_str", "Argument[0]", "ReturnValue", "taint", "df-generated"]
+      - ["repo:https://github.com/clap-rs/clap:clap", "<crate::foreign_crate::LogLevel as crate::fmt::Display>::fmt", "Argument[0]", "ReturnValue", "taint", "df-generated"]
       - ["repo:https://github.com/clap-rs/clap:clap", "<crate::foreign_crate::LogLevel as crate::str::traits::FromStr>::from_str", "Argument[0]", "ReturnValue", "taint", "df-generated"]
   - addsTo:
       pack: codeql/rust-all
       extensible: sinkModel
     data:
+      - ["repo:https://github.com/clap-rs/clap:clap", "<crate::CliArgs as crate::derive::FromArgMatches>::from_arg_matches", "Argument[0]", "log-injection", "df-generated"]
+      - ["repo:https://github.com/clap-rs/clap:clap", "<crate::CliArgs as crate::derive::FromArgMatches>::from_arg_matches_mut", "Argument[0]", "log-injection", "df-generated"]
+      - ["repo:https://github.com/clap-rs/clap:clap", "<crate::CliArgs as crate::derive::FromArgMatches>::update_from_arg_matches", "Argument[0]", "log-injection", "df-generated"]
+      - ["repo:https://github.com/clap-rs/clap:clap", "<crate::CliArgs as crate::derive::FromArgMatches>::update_from_arg_matches_mut", "Argument[0]", "log-injection", "df-generated"]
       - ["repo:https://github.com/clap-rs/clap:clap", "<crate::Value>::from_matches", "Argument[0]", "log-injection", "df-generated"]
diff --git a/rust/ql/lib/ext/generated/clap/repo-https-github.com-clap-rs-clap-clap_bench.model.yml b/rust/ql/lib/ext/generated/clap/repo-https-github.com-clap-rs-clap-clap_bench.model.yml
index 8daf130e9ea..0e9975300bd 100644
--- a/rust/ql/lib/ext/generated/clap/repo-https-github.com-clap-rs-clap-clap_bench.model.yml
+++ b/rust/ql/lib/ext/generated/clap/repo-https-github.com-clap-rs-clap-clap_bench.model.yml
@@ -4,6 +4,7 @@ extensions:
       pack: codeql/rust-all
       extensible: summaryModel
     data:
+      - ["repo:https://github.com/clap-rs/clap:clap_bench", "<crate::Args as crate::fmt::Display>::fmt", "Argument[0]", "ReturnValue", "taint", "df-generated"]
       - ["repo:https://github.com/clap-rs/clap:clap_bench", "<crate::Args>::args", "Argument[self].Field[1]", "ReturnValue", "value", "dfc-generated"]
       - ["repo:https://github.com/clap-rs/clap:clap_bench", "<crate::Args>::args", "Argument[self].Field[crate::Args(1)]", "ReturnValue", "value", "dfc-generated"]
       - ["repo:https://github.com/clap-rs/clap:clap_bench", "<crate::Args>::name", "Argument[self].Field[0]", "ReturnValue", "value", "dfc-generated"]
diff --git a/rust/ql/lib/ext/generated/clap/repo-https-github.com-clap-rs-clap-clap_builder.model.yml b/rust/ql/lib/ext/generated/clap/repo-https-github.com-clap-rs-clap-clap_builder.model.yml
index a26bc4c1a0b..c58ac26b4fe 100644
--- a/rust/ql/lib/ext/generated/clap/repo-https-github.com-clap-rs-clap-clap_builder.model.yml
+++ b/rust/ql/lib/ext/generated/clap/repo-https-github.com-clap-rs-clap-clap_builder.model.yml
@@ -4,11 +4,13 @@ extensions:
       pack: codeql/rust-all
       extensible: summaryModel
     data:
+      - ["repo:https://github.com/clap-rs/clap:clap_builder", "<_ as crate::builder::value_parser::AnyValueParser>::clone_any", "Argument[self].Reference", "ReturnValue.Reference", "value", "dfc-generated"]
       - ["repo:https://github.com/clap-rs/clap:clap_builder", "<_ as crate::builder::value_parser::TypedValueParser>::parse_ref", "Argument[self]", "ReturnValue", "taint", "df-generated"]
       - ["repo:https://github.com/clap-rs/clap:clap_builder", "<char as crate::builder::resettable::IntoResettable>::into_resettable", "Argument[self]", "ReturnValue.Field[crate::builder::resettable::Resettable::Value(0)]", "value", "dfc-generated"]
       - ["repo:https://github.com/clap-rs/clap:clap_builder", "<crate::builder::action::ArgAction as crate::builder::resettable::IntoResettable>::into_resettable", "Argument[self]", "ReturnValue.Field[crate::builder::resettable::Resettable::Value(0)]", "value", "dfc-generated"]
       - ["repo:https://github.com/clap-rs/clap:clap_builder", "<crate::builder::app_settings::AppFlags as crate::ops::bit::BitOr>::bitor", "Argument[self]", "ReturnValue", "value", "dfc-generated"]
       - ["repo:https://github.com/clap-rs/clap:clap_builder", "<crate::builder::arg::Arg as crate::convert::From>::from", "Argument[0].Reference", "ReturnValue", "value", "dfc-generated"]
+      - ["repo:https://github.com/clap-rs/clap:clap_builder", "<crate::builder::arg::Arg as crate::fmt::Display>::fmt", "Argument[0]", "ReturnValue", "taint", "df-generated"]
       - ["repo:https://github.com/clap-rs/clap:clap_builder", "<crate::builder::arg::Arg>::action", "Argument[self]", "ReturnValue", "value", "dfc-generated"]
       - ["repo:https://github.com/clap-rs/clap:clap_builder", "<crate::builder::arg::Arg>::add", "Argument[self]", "ReturnValue", "value", "dfc-generated"]
       - ["repo:https://github.com/clap-rs/clap:clap_builder", "<crate::builder::arg::Arg>::alias", "Argument[self]", "ReturnValue", "value", "dfc-generated"]
@@ -217,6 +219,7 @@ extensions:
       - ["repo:https://github.com/clap-rs/clap:clap_builder", "<crate::builder::command::Command>::visible_long_flag_aliases", "Argument[self]", "ReturnValue", "value", "dfc-generated"]
       - ["repo:https://github.com/clap-rs/clap:clap_builder", "<crate::builder::command::Command>::visible_short_flag_alias", "Argument[self]", "ReturnValue", "value", "dfc-generated"]
       - ["repo:https://github.com/clap-rs/clap:clap_builder", "<crate::builder::command::Command>::visible_short_flag_aliases", "Argument[self]", "ReturnValue", "value", "dfc-generated"]
+      - ["repo:https://github.com/clap-rs/clap:clap_builder", "<crate::builder::ext::Extensions>::get", "Argument[self]", "ReturnValue", "taint", "df-generated"]
       - ["repo:https://github.com/clap-rs/clap:clap_builder", "<crate::builder::os_str::OsStr as crate::convert::From>::from", "Argument[0].Reference", "ReturnValue", "value", "dfc-generated"]
       - ["repo:https://github.com/clap-rs/clap:clap_builder", "<crate::builder::possible_value::PossibleValue>::alias", "Argument[self]", "ReturnValue", "value", "dfc-generated"]
       - ["repo:https://github.com/clap-rs/clap:clap_builder", "<crate::builder::possible_value::PossibleValue>::aliases", "Argument[self]", "ReturnValue", "value", "dfc-generated"]
@@ -242,6 +245,7 @@ extensions:
       - ["repo:https://github.com/clap-rs/clap:clap_builder", "<crate::builder::styled_str::StyledStr as crate::convert::From>::from", "Argument[0].Reference.Reference", "ReturnValue.Field[crate::builder::styled_str::StyledStr(0)]", "value", "dfc-generated"]
       - ["repo:https://github.com/clap-rs/clap:clap_builder", "<crate::builder::styled_str::StyledStr as crate::convert::From>::from", "Argument[0].Reference", "ReturnValue.Field[crate::builder::styled_str::StyledStr(0)]", "value", "dfc-generated"]
       - ["repo:https://github.com/clap-rs/clap:clap_builder", "<crate::builder::styled_str::StyledStr as crate::convert::From>::from", "Argument[0]", "ReturnValue.Field[crate::builder::styled_str::StyledStr(0)]", "value", "dfc-generated"]
+      - ["repo:https://github.com/clap-rs/clap:clap_builder", "<crate::builder::styled_str::StyledStr as crate::fmt::Display>::fmt", "Argument[0]", "ReturnValue", "taint", "df-generated"]
       - ["repo:https://github.com/clap-rs/clap:clap_builder", "<crate::builder::styled_str::StyledStr>::ansi", "Argument[self].Field[0]", "ReturnValue", "value", "dfc-generated"]
       - ["repo:https://github.com/clap-rs/clap:clap_builder", "<crate::builder::styled_str::StyledStr>::ansi", "Argument[self].Field[crate::builder::styled_str::StyledStr(0)]", "ReturnValue", "value", "dfc-generated"]
       - ["repo:https://github.com/clap-rs/clap:clap_builder", "<crate::builder::styled_str::StyledStr>::as_styled_str", "Argument[self].Field[0]", "ReturnValue.Reference", "value", "dfc-generated"]
@@ -287,16 +291,25 @@ extensions:
       - ["repo:https://github.com/clap-rs/clap:clap_builder", "<crate::builder::value_parser::ValueParser as crate::convert::From>::from", "Argument[0].Field[crate::builder::value_parser::_AnonymousValueParser(0)]", "ReturnValue", "value", "dfc-generated"]
       - ["repo:https://github.com/clap-rs/clap:clap_builder", "<crate::error::Error>::apply", "Argument[self].Field[crate::error::Error::inner]", "ReturnValue.Field[crate::error::Error::inner]", "value", "dfc-generated"]
       - ["repo:https://github.com/clap-rs/clap:clap_builder", "<crate::error::Error>::extend_context_unchecked", "Argument[self]", "ReturnValue", "value", "dfc-generated"]
+      - ["repo:https://github.com/clap-rs/clap:clap_builder", "<crate::error::Error>::format", "Argument[self]", "ReturnValue", "value", "dfc-generated"]
       - ["repo:https://github.com/clap-rs/clap:clap_builder", "<crate::error::Error>::insert_context_unchecked", "Argument[self]", "ReturnValue", "value", "dfc-generated"]
+      - ["repo:https://github.com/clap-rs/clap:clap_builder", "<crate::error::Error>::new", "Argument[0]", "ReturnValue", "taint", "df-generated"]
+      - ["repo:https://github.com/clap-rs/clap:clap_builder", "<crate::error::Error>::raw", "Argument[0]", "ReturnValue", "taint", "df-generated"]
       - ["repo:https://github.com/clap-rs/clap:clap_builder", "<crate::error::Error>::set_color", "Argument[self]", "ReturnValue", "value", "dfc-generated"]
       - ["repo:https://github.com/clap-rs/clap:clap_builder", "<crate::error::Error>::set_colored_help", "Argument[self]", "ReturnValue", "value", "dfc-generated"]
       - ["repo:https://github.com/clap-rs/clap:clap_builder", "<crate::error::Error>::set_help_flag", "Argument[self]", "ReturnValue", "value", "dfc-generated"]
       - ["repo:https://github.com/clap-rs/clap:clap_builder", "<crate::error::Error>::set_message", "Argument[self]", "ReturnValue", "value", "dfc-generated"]
       - ["repo:https://github.com/clap-rs/clap:clap_builder", "<crate::error::Error>::set_source", "Argument[self]", "ReturnValue", "value", "dfc-generated"]
       - ["repo:https://github.com/clap-rs/clap:clap_builder", "<crate::error::Error>::set_styles", "Argument[self]", "ReturnValue", "value", "dfc-generated"]
+      - ["repo:https://github.com/clap-rs/clap:clap_builder", "<crate::error::Error>::with_cmd", "Argument[self]", "ReturnValue", "value", "dfc-generated"]
+      - ["repo:https://github.com/clap-rs/clap:clap_builder", "<crate::error::context::ContextKind as crate::fmt::Display>::fmt", "Argument[0]", "ReturnValue", "taint", "df-generated"]
+      - ["repo:https://github.com/clap-rs/clap:clap_builder", "<crate::error::context::ContextValue as crate::fmt::Display>::fmt", "Argument[0]", "ReturnValue", "taint", "df-generated"]
+      - ["repo:https://github.com/clap-rs/clap:clap_builder", "<crate::error::format::Escape as crate::fmt::Display>::fmt", "Argument[0]", "ReturnValue", "taint", "df-generated"]
+      - ["repo:https://github.com/clap-rs/clap:clap_builder", "<crate::error::kind::ErrorKind as crate::fmt::Display>::fmt", "Argument[0]", "ReturnValue", "taint", "df-generated"]
       - ["repo:https://github.com/clap-rs/clap:clap_builder", "<crate::mkeymap::MKeyMap>::get", "Argument[self]", "ReturnValue", "taint", "df-generated"]
       - ["repo:https://github.com/clap-rs/clap:clap_builder", "<crate::mkeymap::MKeyMap>::remove_by_name", "Argument[self]", "ReturnValue", "taint", "df-generated"]
       - ["repo:https://github.com/clap-rs/clap:clap_builder", "<crate::option::Option as crate::builder::resettable::IntoResettable>::into_resettable", "Argument[self].Field[crate::option::Option::Some(0)]", "ReturnValue.Field[crate::builder::resettable::Resettable::Value(0)]", "value", "dfc-generated"]
+      - ["repo:https://github.com/clap-rs/clap:clap_builder", "<crate::output::fmt::Colorizer as crate::fmt::Display>::fmt", "Argument[0]", "ReturnValue", "taint", "df-generated"]
       - ["repo:https://github.com/clap-rs/clap:clap_builder", "<crate::output::fmt::Colorizer>::new", "Argument[0]", "ReturnValue.Field[crate::output::fmt::Colorizer::stream]", "value", "dfc-generated"]
       - ["repo:https://github.com/clap-rs/clap:clap_builder", "<crate::output::fmt::Colorizer>::new", "Argument[1]", "ReturnValue.Field[crate::output::fmt::Colorizer::color_when]", "value", "dfc-generated"]
       - ["repo:https://github.com/clap-rs/clap:clap_builder", "<crate::output::fmt::Colorizer>::with_content", "Argument[0]", "Argument[self].Field[crate::output::fmt::Colorizer::content]", "value", "dfc-generated"]
@@ -317,12 +330,12 @@ extensions:
       - ["repo:https://github.com/clap-rs/clap:clap_builder", "<crate::output::usage::Usage>::required", "Argument[0]", "ReturnValue.Field[crate::output::usage::Usage::required].Field[crate::option::Option::Some(0)]", "value", "dfc-generated"]
       - ["repo:https://github.com/clap-rs/clap:clap_builder", "<crate::output::usage::Usage>::required", "Argument[self]", "ReturnValue", "value", "dfc-generated"]
       - ["repo:https://github.com/clap-rs/clap:clap_builder", "<crate::parser::arg_matcher::ArgMatcher as crate::ops::deref::Deref>::deref", "Argument[self].Field[crate::parser::arg_matcher::ArgMatcher::matches]", "ReturnValue.Reference", "value", "dfc-generated"]
+      - ["repo:https://github.com/clap-rs/clap:clap_builder", "<crate::parser::arg_matcher::ArgMatcher>::entry", "Argument[0]", "ReturnValue.Field[crate::util::flat_map::Entry::Vacant(0)].Field[crate::util::flat_map::VacantEntry::key]", "value", "dfc-generated"]
+      - ["repo:https://github.com/clap-rs/clap:clap_builder", "<crate::parser::arg_matcher::ArgMatcher>::entry", "Argument[self].Field[crate::parser::arg_matcher::ArgMatcher::matches].Field[crate::parser::matches::arg_matches::ArgMatches::args]", "ReturnValue.Field[crate::util::flat_map::Entry::Occupied(0)].Field[crate::util::flat_map::OccupiedEntry::v]", "value", "dfc-generated"]
+      - ["repo:https://github.com/clap-rs/clap:clap_builder", "<crate::parser::arg_matcher::ArgMatcher>::entry", "Argument[self].Field[crate::parser::arg_matcher::ArgMatcher::matches].Field[crate::parser::matches::arg_matches::ArgMatches::args]", "ReturnValue.Field[crate::util::flat_map::Entry::Vacant(0)].Field[crate::util::flat_map::VacantEntry::v]", "value", "dfc-generated"]
       - ["repo:https://github.com/clap-rs/clap:clap_builder", "<crate::parser::arg_matcher::ArgMatcher>::into_inner", "Argument[self].Field[crate::parser::arg_matcher::ArgMatcher::matches]", "ReturnValue", "value", "dfc-generated"]
       - ["repo:https://github.com/clap-rs/clap:clap_builder", "<crate::parser::arg_matcher::ArgMatcher>::pending_arg_id", "Argument[self]", "ReturnValue", "taint", "df-generated"]
-      - ["repo:https://github.com/clap-rs/clap:clap_builder", "<crate::parser::arg_matcher::ArgMatcher>::take_pending", "Argument[self].Field[crate::parser::arg_matcher::ArgMatcher::pending].Reference", "ReturnValue", "value", "dfc-generated"]
-      - ["repo:https://github.com/clap-rs/clap:clap_builder", "<crate::parser::arg_matcher::ArgMatcher>::take_pending", "Argument[self].Field[crate::parser::arg_matcher::ArgMatcher::pending]", "ReturnValue", "value", "dfc-generated"]
       - ["repo:https://github.com/clap-rs/clap:clap_builder", "<crate::parser::error::MatchesError>::unwrap", "Argument[1].Field[crate::result::Result::Ok(0)]", "ReturnValue", "value", "dfc-generated"]
-      - ["repo:https://github.com/clap-rs/clap:clap_builder", "<crate::parser::matches::arg_matches::ArgMatches>::remove_subcommand", "Argument[self]", "ReturnValue", "taint", "df-generated"]
       - ["repo:https://github.com/clap-rs/clap:clap_builder", "<crate::parser::matches::arg_matches::ArgMatches>::subcommand", "Argument[self]", "ReturnValue", "taint", "df-generated"]
       - ["repo:https://github.com/clap-rs/clap:clap_builder", "<crate::parser::matches::arg_matches::ArgMatches>::subcommand_name", "Argument[self]", "ReturnValue", "taint", "df-generated"]
       - ["repo:https://github.com/clap-rs/clap:clap_builder", "<crate::parser::matches::arg_matches::GroupedValues as crate::iter::traits::iterator::Iterator>::size_hint", "Argument[self].Field[crate::parser::matches::arg_matches::GroupedValues::len]", "ReturnValue.Field[0]", "value", "dfc-generated"]
@@ -359,6 +372,7 @@ extensions:
       - ["repo:https://github.com/clap-rs/clap:clap_builder", "<crate::parser::parser::Parser>::parse", "Argument[self]", "Argument[1]", "taint", "df-generated"]
       - ["repo:https://github.com/clap-rs/clap:clap_builder", "<crate::parser::validator::Validator>::new", "Argument[0]", "ReturnValue.Field[crate::parser::validator::Validator::cmd]", "value", "dfc-generated"]
       - ["repo:https://github.com/clap-rs/clap:clap_builder", "<crate::util::any_value::AnyValue>::type_id", "Argument[self].Field[crate::util::any_value::AnyValue::id]", "ReturnValue", "value", "dfc-generated"]
+      - ["repo:https://github.com/clap-rs/clap:clap_builder", "<crate::util::color::ColorChoice as crate::fmt::Display>::fmt", "Argument[0]", "ReturnValue", "taint", "df-generated"]
       - ["repo:https://github.com/clap-rs/clap:clap_builder", "<crate::util::color::ColorChoice as crate::str::traits::FromStr>::from_str", "Argument[0]", "ReturnValue", "taint", "df-generated"]
       - ["repo:https://github.com/clap-rs/clap:clap_builder", "<crate::util::flat_map::FlatMap>::entry", "Argument[0]", "ReturnValue.Field[crate::util::flat_map::Entry::Vacant(0)].Field[crate::util::flat_map::VacantEntry::key]", "value", "dfc-generated"]
       - ["repo:https://github.com/clap-rs/clap:clap_builder", "<crate::util::flat_map::FlatMap>::entry", "Argument[self]", "ReturnValue.Field[crate::util::flat_map::Entry::Occupied(0)].Field[crate::util::flat_map::OccupiedEntry::v]", "value", "dfc-generated"]
@@ -376,9 +390,28 @@ extensions:
       pack: codeql/rust-all
       extensible: sinkModel
     data:
+      - ["repo:https://github.com/clap-rs/clap:clap_builder", "<_ as crate::builder::value_parser::TypedValueParser>::parse_ref", "Argument[1]", "pointer-access", "df-generated"]
+      - ["repo:https://github.com/clap-rs/clap:clap_builder", "<crate::builder::arg::Arg>::remove", "Argument[self]", "log-injection", "df-generated"]
+      - ["repo:https://github.com/clap-rs/clap:clap_builder", "<crate::builder::arg::Arg>::value_hint", "Argument[self]", "log-injection", "df-generated"]
       - ["repo:https://github.com/clap-rs/clap:clap_builder", "<crate::builder::command::Command>::_panic_on_missing_help", "Argument[self]", "log-injection", "df-generated"]
+      - ["repo:https://github.com/clap-rs/clap:clap_builder", "<crate::builder::command::Command>::mut_group", "Argument[self]", "log-injection", "df-generated"]
+      - ["repo:https://github.com/clap-rs/clap:clap_builder", "<crate::builder::command::Command>::mut_subcommand", "Argument[self]", "log-injection", "df-generated"]
+      - ["repo:https://github.com/clap-rs/clap:clap_builder", "<crate::builder::command::Command>::remove", "Argument[self]", "log-injection", "df-generated"]
+      - ["repo:https://github.com/clap-rs/clap:clap_builder", "<crate::builder::ext::Extensions>::remove", "Argument[self]", "log-injection", "df-generated"]
+      - ["repo:https://github.com/clap-rs/clap:clap_builder", "<crate::builder::value_parser::BoolValueParser as crate::builder::value_parser::TypedValueParser>::parse_ref", "Argument[1]", "pointer-access", "df-generated"]
+      - ["repo:https://github.com/clap-rs/clap:clap_builder", "<crate::builder::value_parser::BoolishValueParser as crate::builder::value_parser::TypedValueParser>::parse_ref", "Argument[1]", "pointer-access", "df-generated"]
+      - ["repo:https://github.com/clap-rs/clap:clap_builder", "<crate::builder::value_parser::EnumValueParser as crate::builder::value_parser::TypedValueParser>::parse_ref", "Argument[1]", "pointer-access", "df-generated"]
+      - ["repo:https://github.com/clap-rs/clap:clap_builder", "<crate::builder::value_parser::NonEmptyStringValueParser as crate::builder::value_parser::TypedValueParser>::parse_ref", "Argument[1]", "pointer-access", "df-generated"]
+      - ["repo:https://github.com/clap-rs/clap:clap_builder", "<crate::builder::value_parser::PathBufValueParser as crate::builder::value_parser::TypedValueParser>::parse", "Argument[1]", "pointer-access", "df-generated"]
+      - ["repo:https://github.com/clap-rs/clap:clap_builder", "<crate::builder::value_parser::PossibleValuesParser as crate::builder::value_parser::TypedValueParser>::parse", "Argument[1]", "pointer-access", "df-generated"]
+      - ["repo:https://github.com/clap-rs/clap:clap_builder", "<crate::builder::value_parser::RangedI64ValueParser as crate::builder::value_parser::TypedValueParser>::parse_ref", "Argument[1]", "pointer-access", "df-generated"]
       - ["repo:https://github.com/clap-rs/clap:clap_builder", "<crate::builder::value_parser::RangedI64ValueParser>::range", "Argument[self]", "log-injection", "df-generated"]
+      - ["repo:https://github.com/clap-rs/clap:clap_builder", "<crate::builder::value_parser::RangedU64ValueParser as crate::builder::value_parser::TypedValueParser>::parse_ref", "Argument[1]", "pointer-access", "df-generated"]
       - ["repo:https://github.com/clap-rs/clap:clap_builder", "<crate::builder::value_parser::RangedU64ValueParser>::range", "Argument[self]", "log-injection", "df-generated"]
+      - ["repo:https://github.com/clap-rs/clap:clap_builder", "<crate::builder::value_parser::TryMapValueParser as crate::builder::value_parser::TypedValueParser>::parse_ref", "Argument[1]", "pointer-access", "df-generated"]
+      - ["repo:https://github.com/clap-rs/clap:clap_builder", "<crate::output::textwrap::wrap_algorithms::LineWrapper>::wrap", "Argument[0]", "log-injection", "df-generated"]
+      - ["repo:https://github.com/clap-rs/clap:clap_builder", "<crate::output::usage::Usage>::get_required_usage_from", "Argument[1]", "pointer-access", "df-generated"]
+      - ["repo:https://github.com/clap-rs/clap:clap_builder", "<crate::parser::arg_matcher::ArgMatcher>::remove", "Argument[self]", "log-injection", "df-generated"]
       - ["repo:https://github.com/clap-rs/clap:clap_builder", "<crate::parser::error::MatchesError>::unwrap", "Argument[0]", "log-injection", "df-generated"]
       - ["repo:https://github.com/clap-rs/clap:clap_builder", "<crate::parser::error::MatchesError>::unwrap", "Argument[1]", "log-injection", "df-generated"]
       - ["repo:https://github.com/clap-rs/clap:clap_builder", "<crate::parser::matches::arg_matches::ArgMatches>::contains_id", "Argument[0]", "log-injection", "df-generated"]
@@ -390,5 +423,20 @@ extensions:
       - ["repo:https://github.com/clap-rs/clap:clap_builder", "<crate::parser::matches::arg_matches::ArgMatches>::get_raw", "Argument[0]", "log-injection", "df-generated"]
       - ["repo:https://github.com/clap-rs/clap:clap_builder", "<crate::parser::matches::arg_matches::ArgMatches>::get_raw_occurrences", "Argument[0]", "log-injection", "df-generated"]
       - ["repo:https://github.com/clap-rs/clap:clap_builder", "<crate::parser::matches::arg_matches::ArgMatches>::remove_many", "Argument[0]", "log-injection", "df-generated"]
+      - ["repo:https://github.com/clap-rs/clap:clap_builder", "<crate::parser::matches::arg_matches::ArgMatches>::remove_many", "Argument[self]", "log-injection", "df-generated"]
       - ["repo:https://github.com/clap-rs/clap:clap_builder", "<crate::parser::matches::arg_matches::ArgMatches>::remove_occurrences", "Argument[0]", "log-injection", "df-generated"]
+      - ["repo:https://github.com/clap-rs/clap:clap_builder", "<crate::parser::matches::arg_matches::ArgMatches>::remove_occurrences", "Argument[self]", "log-injection", "df-generated"]
       - ["repo:https://github.com/clap-rs/clap:clap_builder", "<crate::parser::matches::arg_matches::ArgMatches>::remove_one", "Argument[0]", "log-injection", "df-generated"]
+      - ["repo:https://github.com/clap-rs/clap:clap_builder", "<crate::parser::matches::arg_matches::ArgMatches>::remove_one", "Argument[self]", "log-injection", "df-generated"]
+      - ["repo:https://github.com/clap-rs/clap:clap_builder", "<crate::parser::matches::arg_matches::ArgMatches>::try_clear_id", "Argument[self]", "log-injection", "df-generated"]
+      - ["repo:https://github.com/clap-rs/clap:clap_builder", "<crate::parser::matches::arg_matches::ArgMatches>::try_remove_many", "Argument[self]", "log-injection", "df-generated"]
+      - ["repo:https://github.com/clap-rs/clap:clap_builder", "<crate::parser::matches::arg_matches::ArgMatches>::try_remove_occurrences", "Argument[self]", "log-injection", "df-generated"]
+      - ["repo:https://github.com/clap-rs/clap:clap_builder", "<crate::parser::matches::arg_matches::ArgMatches>::try_remove_one", "Argument[self]", "log-injection", "df-generated"]
+      - ["repo:https://github.com/clap-rs/clap:clap_builder", "<crate::parser::matches::matched_arg::MatchedArg>::check_explicit", "Argument[self]", "pointer-access", "df-generated"]
+      - ["repo:https://github.com/clap-rs/clap:clap_builder", "<crate::parser::parser::Parser>::get_matches_with", "Argument[0]", "log-injection", "df-generated"]
+      - ["repo:https://github.com/clap-rs/clap:clap_builder", "<crate::parser::parser::Parser>::get_matches_with", "Argument[self]", "pointer-access", "df-generated"]
+      - ["repo:https://github.com/clap-rs/clap:clap_builder", "<crate::parser::parser::Parser>::parse", "Argument[0]", "log-injection", "df-generated"]
+      - ["repo:https://github.com/clap-rs/clap:clap_builder", "<crate::parser::parser::Parser>::parse", "Argument[self]", "pointer-access", "df-generated"]
+      - ["repo:https://github.com/clap-rs/clap:clap_builder", "<crate::util::flat_map::FlatMap>::remove", "Argument[self]", "log-injection", "df-generated"]
+      - ["repo:https://github.com/clap-rs/clap:clap_builder", "<crate::util::flat_map::FlatMap>::remove_entry", "Argument[self]", "log-injection", "df-generated"]
+      - ["repo:https://github.com/clap-rs/clap:clap_builder", "<crate::util::flat_set::FlatSet>::sort_by_key", "Argument[self]", "pointer-access", "df-generated"]
diff --git a/rust/ql/lib/ext/generated/clap/repo-https-github.com-clap-rs-clap-clap_complete.model.yml b/rust/ql/lib/ext/generated/clap/repo-https-github.com-clap-rs-clap-clap_complete.model.yml
index b9a0f77c4ed..877a73088d0 100644
--- a/rust/ql/lib/ext/generated/clap/repo-https-github.com-clap-rs-clap-clap_complete.model.yml
+++ b/rust/ql/lib/ext/generated/clap/repo-https-github.com-clap-rs-clap-clap_complete.model.yml
@@ -12,6 +12,7 @@ extensions:
       - ["repo:https://github.com/clap-rs/clap:clap_complete", "<crate::aot::shells::fish::Fish as crate::aot::generator::Generator>::file_name", "Argument[0]", "ReturnValue", "taint", "df-generated"]
       - ["repo:https://github.com/clap-rs/clap:clap_complete", "<crate::aot::shells::powershell::PowerShell as crate::aot::generator::Generator>::file_name", "Argument[0]", "ReturnValue", "taint", "df-generated"]
       - ["repo:https://github.com/clap-rs/clap:clap_complete", "<crate::aot::shells::shell::Shell as crate::aot::generator::Generator>::file_name", "Argument[0]", "ReturnValue", "taint", "df-generated"]
+      - ["repo:https://github.com/clap-rs/clap:clap_complete", "<crate::aot::shells::shell::Shell as crate::fmt::Display>::fmt", "Argument[0]", "ReturnValue", "taint", "df-generated"]
       - ["repo:https://github.com/clap-rs/clap:clap_complete", "<crate::aot::shells::shell::Shell as crate::str::traits::FromStr>::from_str", "Argument[0]", "ReturnValue", "taint", "df-generated"]
       - ["repo:https://github.com/clap-rs/clap:clap_complete", "<crate::aot::shells::zsh::Zsh as crate::aot::generator::Generator>::file_name", "Argument[0]", "ReturnValue", "taint", "df-generated"]
       - ["repo:https://github.com/clap-rs/clap:clap_complete", "<crate::engine::candidate::CompletionCandidate>::add_prefix", "Argument[self]", "ReturnValue", "value", "dfc-generated"]
diff --git a/rust/ql/lib/ext/generated/clap/repo-https-github.com-clap-rs-clap-clap_derive.model.yml b/rust/ql/lib/ext/generated/clap/repo-https-github.com-clap-rs-clap-clap_derive.model.yml
index 4397f956fcf..ebcb8bb114b 100644
--- a/rust/ql/lib/ext/generated/clap/repo-https-github.com-clap-rs-clap-clap_derive.model.yml
+++ b/rust/ql/lib/ext/generated/clap/repo-https-github.com-clap-rs-clap-clap_derive.model.yml
@@ -6,9 +6,9 @@ extensions:
     data:
       - ["repo:https://github.com/clap-rs/clap:clap_derive", "<crate::attr::ClapAttr>::lit_str_or_abort", "Argument[self].Field[crate::attr::ClapAttr::value].Field[crate::option::Option::Some(0)]", "ReturnValue.Reference", "value", "dfc-generated"]
       - ["repo:https://github.com/clap-rs/clap:clap_derive", "<crate::attr::ClapAttr>::value_or_abort", "Argument[self].Field[crate::attr::ClapAttr::value].Field[crate::option::Option::Some(0)]", "ReturnValue.Field[crate::result::Result::Ok(0)].Reference", "value", "dfc-generated"]
+      - ["repo:https://github.com/clap-rs/clap:clap_derive", "<crate::attr::ClapAttr>::value_or_abort", "Argument[self]", "ReturnValue.Field[crate::result::Result::Err(0)]", "value", "dfc-generated"]
       - ["repo:https://github.com/clap-rs/clap:clap_derive", "<crate::item::Item>::action", "Argument[self]", "Argument[0]", "taint", "df-generated"]
       - ["repo:https://github.com/clap-rs/clap:clap_derive", "<crate::item::Item>::action", "Argument[self]", "ReturnValue", "taint", "df-generated"]
-      - ["repo:https://github.com/clap-rs/clap:clap_derive", "<crate::item::Item>::cased_name", "Argument[self].Field[crate::item::Item::name].Field[crate::item::Name::Assigned(0)]", "ReturnValue", "value", "dfc-generated"]
       - ["repo:https://github.com/clap-rs/clap:clap_derive", "<crate::item::Item>::casing", "Argument[self].Field[crate::item::Item::casing]", "ReturnValue", "value", "dfc-generated"]
       - ["repo:https://github.com/clap-rs/clap:clap_derive", "<crate::item::Item>::env_casing", "Argument[self].Field[crate::item::Item::env_casing]", "ReturnValue", "value", "dfc-generated"]
       - ["repo:https://github.com/clap-rs/clap:clap_derive", "<crate::item::Item>::from_args_field", "Argument[1]", "ReturnValue.Field[crate::result::Result::Ok(0)].Field[crate::item::Item::casing]", "value", "dfc-generated"]
@@ -24,9 +24,7 @@ extensions:
       - ["repo:https://github.com/clap-rs/clap:clap_derive", "<crate::item::Item>::id", "Argument[self].Field[crate::item::Item::name]", "ReturnValue.Reference", "value", "dfc-generated"]
       - ["repo:https://github.com/clap-rs/clap:clap_derive", "<crate::item::Item>::is_positional", "Argument[self].Field[crate::item::Item::is_positional]", "ReturnValue", "value", "dfc-generated"]
       - ["repo:https://github.com/clap-rs/clap:clap_derive", "<crate::item::Item>::kind", "Argument[self].Field[crate::item::Item::kind].Reference", "ReturnValue", "value", "dfc-generated"]
-      - ["repo:https://github.com/clap-rs/clap:clap_derive", "<crate::item::Item>::kind", "Argument[self].Field[crate::item::Item::kind]", "ReturnValue", "value", "dfc-generated"]
       - ["repo:https://github.com/clap-rs/clap:clap_derive", "<crate::item::Item>::skip_group", "Argument[self].Field[crate::item::Item::skip_group]", "ReturnValue", "value", "dfc-generated"]
-      - ["repo:https://github.com/clap-rs/clap:clap_derive", "<crate::item::Item>::value_name", "Argument[self].Field[crate::item::Item::name].Field[crate::item::Name::Assigned(0)]", "ReturnValue", "value", "dfc-generated"]
       - ["repo:https://github.com/clap-rs/clap:clap_derive", "<crate::item::Item>::value_parser", "Argument[self]", "Argument[0]", "taint", "df-generated"]
       - ["repo:https://github.com/clap-rs/clap:clap_derive", "<crate::item::Item>::value_parser", "Argument[self]", "ReturnValue", "taint", "df-generated"]
       - ["repo:https://github.com/clap-rs/clap:clap_derive", "<crate::item::Method>::args", "Argument[self].Field[crate::item::Method::args]", "ReturnValue.Reference", "value", "dfc-generated"]
@@ -42,14 +40,16 @@ extensions:
       - ["repo:https://github.com/clap-rs/clap:clap_derive", "<crate::utils::spanned::Sp>::new", "Argument[1]", "ReturnValue.Field[crate::utils::spanned::Sp::span]", "value", "dfc-generated"]
       - ["repo:https://github.com/clap-rs/clap:clap_derive", "<crate::utils::spanned::Sp>::span", "Argument[self].Field[crate::utils::spanned::Sp::span]", "ReturnValue", "value", "dfc-generated"]
       - ["repo:https://github.com/clap-rs/clap:clap_derive", "crate::derives::args::derive_args", "Argument[0].Reference", "ReturnValue.Field[crate::item::Item::group_id].Field[crate::item::Name::Derived(0)]", "value", "dfc-generated"]
-      - ["repo:https://github.com/clap-rs/clap:clap_derive", "crate::derives::args::derive_args", "Argument[0]", "ReturnValue.Field[crate::item::Item::group_id].Field[crate::item::Name::Derived(0)]", "value", "dfc-generated"]
       - ["repo:https://github.com/clap-rs/clap:clap_derive", "crate::derives::args::derive_args", "Argument[0]", "ReturnValue.Field[crate::item::Item::name].Field[crate::item::Name::Derived(0)]", "value", "dfc-generated"]
       - ["repo:https://github.com/clap-rs/clap:clap_derive", "crate::derives::parser::derive_parser", "Argument[0].Reference", "ReturnValue.Field[crate::item::Item::group_id].Field[crate::item::Name::Derived(0)]", "value", "dfc-generated"]
-      - ["repo:https://github.com/clap-rs/clap:clap_derive", "crate::derives::parser::derive_parser", "Argument[0]", "ReturnValue.Field[crate::item::Item::group_id].Field[crate::item::Name::Derived(0)]", "value", "dfc-generated"]
       - ["repo:https://github.com/clap-rs/clap:clap_derive", "crate::derives::subcommand::derive_subcommand", "Argument[0].Reference", "ReturnValue.Field[crate::item::Item::group_id].Field[crate::item::Name::Derived(0)]", "value", "dfc-generated"]
-      - ["repo:https://github.com/clap-rs/clap:clap_derive", "crate::derives::subcommand::derive_subcommand", "Argument[0]", "ReturnValue.Field[crate::item::Item::group_id].Field[crate::item::Name::Derived(0)]", "value", "dfc-generated"]
       - ["repo:https://github.com/clap-rs/clap:clap_derive", "crate::derives::subcommand::derive_subcommand", "Argument[0]", "ReturnValue.Field[crate::item::Item::name].Field[crate::item::Name::Derived(0)]", "value", "dfc-generated"]
       - ["repo:https://github.com/clap-rs/clap:clap_derive", "crate::derives::value_enum::derive_value_enum", "Argument[0].Reference", "ReturnValue.Field[crate::item::Item::group_id].Field[crate::item::Name::Derived(0)]", "value", "dfc-generated"]
-      - ["repo:https://github.com/clap-rs/clap:clap_derive", "crate::derives::value_enum::derive_value_enum", "Argument[0]", "ReturnValue.Field[crate::item::Item::group_id].Field[crate::item::Name::Derived(0)]", "value", "dfc-generated"]
       - ["repo:https://github.com/clap-rs/clap:clap_derive", "crate::derives::value_enum::derive_value_enum", "Argument[0]", "ReturnValue.Field[crate::item::Item::name].Field[crate::item::Name::Derived(0)]", "value", "dfc-generated"]
       - ["repo:https://github.com/clap-rs/clap:clap_derive", "crate::utils::ty::inner_type", "Argument[0]", "ReturnValue", "value", "dfc-generated"]
+  - addsTo:
+      pack: codeql/rust-all
+      extensible: sinkModel
+    data:
+      - ["repo:https://github.com/clap-rs/clap:clap_derive", "<crate::item::Item>::action", "Argument[self]", "pointer-access", "df-generated"]
+      - ["repo:https://github.com/clap-rs/clap:clap_derive", "<crate::item::Item>::value_parser", "Argument[self]", "pointer-access", "df-generated"]
diff --git a/rust/ql/lib/ext/generated/hyper/repo-https-github.com-hyperium-hyper-hyper.model.yml b/rust/ql/lib/ext/generated/hyper/repo-https-github.com-hyperium-hyper-hyper.model.yml
index 3e30d66ced4..eb2472e5765 100644
--- a/rust/ql/lib/ext/generated/hyper/repo-https-github.com-hyperium-hyper-hyper.model.yml
+++ b/rust/ql/lib/ext/generated/hyper/repo-https-github.com-hyperium-hyper-hyper.model.yml
@@ -4,12 +4,13 @@ extensions:
       pack: codeql/rust-all
       extensible: summaryModel
     data:
+      - ["repo:https://github.com/hyperium/hyper:hyper", "<_ as crate::ffi::task::IntoDynTaskType>::into_dyn_task_type", "Argument[self]", "ReturnValue.Reference", "value", "dfc-generated"]
       - ["repo:https://github.com/hyperium/hyper:hyper", "<crate::DebugStream as crate::io::Read>::read", "Argument[self]", "Argument[0]", "taint", "df-generated"]
+      - ["repo:https://github.com/hyperium/hyper:hyper", "<crate::TestService as crate::service::service::Service>::call", "Argument[0]", "ReturnValue.Reference", "value", "dfc-generated"]
       - ["repo:https://github.com/hyperium/hyper:hyper", "<crate::body::incoming::Incoming>::as_ffi_mut", "Argument[self].Field[crate::body::incoming::Incoming::kind].Field[crate::body::incoming::Kind::Ffi(0)]", "ReturnValue.Reference", "value", "dfc-generated"]
       - ["repo:https://github.com/hyperium/hyper:hyper", "<crate::body::incoming::Incoming>::h2", "Argument[0]", "ReturnValue.Field[crate::body::incoming::Incoming::kind].Field[crate::body::incoming::Kind::H2::recv]", "value", "dfc-generated"]
       - ["repo:https://github.com/hyperium/hyper:hyper", "<crate::body::incoming::Incoming>::h2", "Argument[1]", "ReturnValue.Field[crate::body::incoming::Incoming::kind].Field[crate::body::incoming::Kind::H2::content_length]", "value", "dfc-generated"]
       - ["repo:https://github.com/hyperium/hyper:hyper", "<crate::body::incoming::Incoming>::h2", "Argument[2]", "ReturnValue.Field[crate::body::incoming::Incoming::kind].Field[crate::body::incoming::Kind::H2::ping]", "value", "dfc-generated"]
-      - ["repo:https://github.com/hyperium/hyper:hyper", "<crate::body::length::DecodedLength as crate::convert::From>::from", "Argument[0].Field[crate::option::Option::Some(0)].Field[0]", "ReturnValue", "value", "dfc-generated"]
       - ["repo:https://github.com/hyperium/hyper:hyper", "<crate::body::length::DecodedLength>::checked_new", "Argument[0]", "ReturnValue.Field[crate::result::Result::Ok(0)].Field[crate::body::length::DecodedLength(0)]", "value", "dfc-generated"]
       - ["repo:https://github.com/hyperium/hyper:hyper", "<crate::body::length::DecodedLength>::danger_len", "Argument[self].Field[0]", "ReturnValue", "value", "dfc-generated"]
       - ["repo:https://github.com/hyperium/hyper:hyper", "<crate::body::length::DecodedLength>::danger_len", "Argument[self].Field[crate::body::length::DecodedLength(0)]", "ReturnValue", "value", "dfc-generated"]
@@ -77,23 +78,25 @@ extensions:
       - ["repo:https://github.com/hyperium/hyper:hyper", "<crate::client::conn::http2::Builder>::max_send_buf_size", "Argument[self]", "ReturnValue", "value", "dfc-generated"]
       - ["repo:https://github.com/hyperium/hyper:hyper", "<crate::client::conn::http2::Builder>::new", "Argument[0]", "ReturnValue.Field[crate::client::conn::http2::Builder::exec]", "value", "dfc-generated"]
       - ["repo:https://github.com/hyperium/hyper:hyper", "<crate::client::conn::http2::Builder>::timer", "Argument[self]", "ReturnValue", "value", "dfc-generated"]
-      - ["repo:https://github.com/hyperium/hyper:hyper", "<crate::client::conn::http2::SendRequest as crate::clone::Clone>::clone", "Argument[self]", "ReturnValue", "taint", "df-generated"]
+      - ["repo:https://github.com/hyperium/hyper:hyper", "<crate::client::conn::http2::SendRequest as crate::clone::Clone>::clone", "Argument[self].Field[crate::client::conn::http2::SendRequest::dispatch].Field[crate::client::dispatch::UnboundedSender::inner]", "ReturnValue.Field[crate::client::conn::http2::SendRequest::dispatch].Field[crate::client::dispatch::UnboundedSender::inner]", "value", "dfc-generated"]
+      - ["repo:https://github.com/hyperium/hyper:hyper", "<crate::client::conn::http2::SendRequest as crate::clone::Clone>::clone", "Argument[self].Field[crate::client::conn::http2::SendRequest::dispatch].Reference", "ReturnValue.Field[crate::client::conn::http2::SendRequest::dispatch]", "value", "dfc-generated"]
+      - ["repo:https://github.com/hyperium/hyper:hyper", "<crate::client::conn::http2::SendRequest as crate::clone::Clone>::clone", "Argument[self].Field[crate::client::conn::http2::SendRequest::dispatch]", "ReturnValue.Field[crate::client::conn::http2::SendRequest::dispatch]", "value", "dfc-generated"]
       - ["repo:https://github.com/hyperium/hyper:hyper", "<crate::client::dispatch::Sender>::send", "Argument[0]", "ReturnValue.Field[crate::result::Result::Err(0)]", "value", "dfc-generated"]
       - ["repo:https://github.com/hyperium/hyper:hyper", "<crate::client::dispatch::Sender>::try_send", "Argument[0]", "ReturnValue.Field[crate::result::Result::Err(0)]", "value", "dfc-generated"]
       - ["repo:https://github.com/hyperium/hyper:hyper", "<crate::client::dispatch::Sender>::unbound", "Argument[self].Field[crate::client::dispatch::Sender::inner]", "ReturnValue.Field[crate::client::dispatch::UnboundedSender::inner]", "value", "dfc-generated"]
       - ["repo:https://github.com/hyperium/hyper:hyper", "<crate::client::dispatch::TrySendError>::into_error", "Argument[self].Field[crate::client::dispatch::TrySendError::error]", "ReturnValue", "value", "dfc-generated"]
-      - ["repo:https://github.com/hyperium/hyper:hyper", "<crate::client::dispatch::TrySendError>::take_message", "Argument[self].Field[crate::client::dispatch::TrySendError::message].Reference", "ReturnValue", "value", "dfc-generated"]
-      - ["repo:https://github.com/hyperium/hyper:hyper", "<crate::client::dispatch::TrySendError>::take_message", "Argument[self].Field[crate::client::dispatch::TrySendError::message]", "ReturnValue", "value", "dfc-generated"]
-      - ["repo:https://github.com/hyperium/hyper:hyper", "<crate::client::dispatch::UnboundedSender as crate::clone::Clone>::clone", "Argument[self]", "ReturnValue", "taint", "df-generated"]
+      - ["repo:https://github.com/hyperium/hyper:hyper", "<crate::client::dispatch::UnboundedSender as crate::clone::Clone>::clone", "Argument[self].Field[crate::client::dispatch::UnboundedSender::giver].Reference", "ReturnValue.Field[crate::client::dispatch::UnboundedSender::giver]", "value", "dfc-generated"]
+      - ["repo:https://github.com/hyperium/hyper:hyper", "<crate::client::dispatch::UnboundedSender as crate::clone::Clone>::clone", "Argument[self].Field[crate::client::dispatch::UnboundedSender::inner].Reference", "ReturnValue.Field[crate::client::dispatch::UnboundedSender::inner]", "value", "dfc-generated"]
+      - ["repo:https://github.com/hyperium/hyper:hyper", "<crate::client::dispatch::UnboundedSender as crate::clone::Clone>::clone", "Argument[self].Field[crate::client::dispatch::UnboundedSender::inner]", "ReturnValue.Field[crate::client::dispatch::UnboundedSender::inner]", "value", "dfc-generated"]
       - ["repo:https://github.com/hyperium/hyper:hyper", "<crate::common::io::compat::Compat>::new", "Argument[0]", "ReturnValue.Field[crate::common::io::compat::Compat(0)]", "value", "dfc-generated"]
       - ["repo:https://github.com/hyperium/hyper:hyper", "<crate::common::io::rewind::Rewind>::into_inner", "Argument[self].Field[crate::common::io::rewind::Rewind::inner]", "ReturnValue.Field[0]", "value", "dfc-generated"]
-      - ["repo:https://github.com/hyperium/hyper:hyper", "<crate::common::io::rewind::Rewind>::into_inner", "Argument[self].Field[crate::common::io::rewind::Rewind::pre].Field[crate::option::Option::Some(0)]", "ReturnValue.Field[1]", "value", "dfc-generated"]
       - ["repo:https://github.com/hyperium/hyper:hyper", "<crate::common::io::rewind::Rewind>::new", "Argument[0]", "ReturnValue.Field[crate::common::io::rewind::Rewind::inner]", "value", "dfc-generated"]
       - ["repo:https://github.com/hyperium/hyper:hyper", "<crate::common::io::rewind::Rewind>::new_buffered", "Argument[0]", "ReturnValue.Field[crate::common::io::rewind::Rewind::inner]", "value", "dfc-generated"]
       - ["repo:https://github.com/hyperium/hyper:hyper", "<crate::common::io::rewind::Rewind>::new_buffered", "Argument[1]", "ReturnValue.Field[crate::common::io::rewind::Rewind::pre].Field[crate::option::Option::Some(0)]", "value", "dfc-generated"]
       - ["repo:https://github.com/hyperium/hyper:hyper", "<crate::common::io::rewind::Rewind>::rewind", "Argument[0]", "Argument[self].Field[crate::common::io::rewind::Rewind::pre].Field[crate::option::Option::Some(0)]", "value", "dfc-generated"]
       - ["repo:https://github.com/hyperium/hyper:hyper", "<crate::common::time::Time>::check", "Argument[0].Field[crate::common::time::Dur::Configured(0)].Field[crate::option::Option::Some(0)]", "ReturnValue.Field[crate::option::Option::Some(0)]", "value", "dfc-generated"]
       - ["repo:https://github.com/hyperium/hyper:hyper", "<crate::common::time::Time>::check", "Argument[0].Field[crate::common::time::Dur::Default(0)].Field[crate::option::Option::Some(0)]", "ReturnValue.Field[crate::option::Option::Some(0)]", "value", "dfc-generated"]
+      - ["repo:https://github.com/hyperium/hyper:hyper", "<crate::error::Error>::new", "Argument[0]", "ReturnValue", "taint", "df-generated"]
       - ["repo:https://github.com/hyperium/hyper:hyper", "<crate::error::Error>::with", "Argument[self]", "ReturnValue", "value", "dfc-generated"]
       - ["repo:https://github.com/hyperium/hyper:hyper", "<crate::ext::Protocol>::from_inner", "Argument[0]", "ReturnValue.Field[crate::ext::Protocol::inner]", "value", "dfc-generated"]
       - ["repo:https://github.com/hyperium/hyper:hyper", "<crate::ext::Protocol>::into_inner", "Argument[self].Field[crate::ext::Protocol::inner]", "ReturnValue", "value", "dfc-generated"]
@@ -102,8 +105,10 @@ extensions:
       - ["repo:https://github.com/hyperium/hyper:hyper", "<crate::ext::h1_reason_phrase::ReasonPhrase>::as_bytes", "Argument[self].Field[0]", "ReturnValue.Reference", "value", "dfc-generated"]
       - ["repo:https://github.com/hyperium/hyper:hyper", "<crate::ext::h1_reason_phrase::ReasonPhrase>::as_bytes", "Argument[self].Field[crate::ext::h1_reason_phrase::ReasonPhrase(0)]", "ReturnValue.Reference", "value", "dfc-generated"]
       - ["repo:https://github.com/hyperium/hyper:hyper", "<crate::ffi::http_types::hyper_response>::wrap", "Argument[0]", "ReturnValue.Field[crate::ffi::http_types::hyper_response(0)]", "value", "dfc-generated"]
+      - ["repo:https://github.com/hyperium/hyper:hyper", "<crate::ffi::task::hyper_task>::boxed", "Argument[0]", "ReturnValue", "taint", "df-generated"]
+      - ["repo:https://github.com/hyperium/hyper:hyper", "<crate::proto::h1::conn::Conn>::into_inner", "Argument[self].Field[crate::proto::h1::conn::Conn::io].Field[crate::proto::h1::io::Buffered::io]", "ReturnValue.Field[0]", "value", "dfc-generated"]
       - ["repo:https://github.com/hyperium/hyper:hyper", "<crate::proto::h1::conn::Conn>::new", "Argument[0]", "ReturnValue.Field[crate::proto::h1::conn::Conn::io].Field[crate::proto::h1::io::Buffered::io]", "value", "dfc-generated"]
-      - ["repo:https://github.com/hyperium/hyper:hyper", "<crate::proto::h1::conn::Conn>::pending_upgrade", "Argument[self].Field[crate::proto::h1::conn::Conn::state].Field[crate::proto::h1::conn::State::upgrade]", "ReturnValue", "value", "dfc-generated"]
+      - ["repo:https://github.com/hyperium/hyper:hyper", "<crate::proto::h1::conn::Conn>::set_flush_pipeline", "Argument[0]", "Argument[self].Field[crate::proto::h1::conn::Conn::io].Field[crate::proto::h1::io::Buffered::flush_pipeline]", "value", "dfc-generated"]
       - ["repo:https://github.com/hyperium/hyper:hyper", "<crate::proto::h1::conn::Conn>::set_h1_parser_config", "Argument[0]", "Argument[self].Field[crate::proto::h1::conn::Conn::state].Field[crate::proto::h1::conn::State::h1_parser_config]", "value", "dfc-generated"]
       - ["repo:https://github.com/hyperium/hyper:hyper", "<crate::proto::h1::conn::Conn>::set_timer", "Argument[0]", "Argument[self].Field[crate::proto::h1::conn::Conn::state].Field[crate::proto::h1::conn::State::timer]", "value", "dfc-generated"]
       - ["repo:https://github.com/hyperium/hyper:hyper", "<crate::proto::h1::conn::Conn>::wants_read_again", "Argument[self].Field[crate::proto::h1::conn::Conn::state].Field[crate::proto::h1::conn::State::notify_read]", "ReturnValue", "value", "dfc-generated"]
@@ -147,12 +152,14 @@ extensions:
       - ["repo:https://github.com/hyperium/hyper:hyper", "<crate::proto::h1::io::Buffered>::write_buf", "Argument[self].Field[crate::proto::h1::io::Buffered::write_buf]", "ReturnValue.Reference", "value", "dfc-generated"]
       - ["repo:https://github.com/hyperium/hyper:hyper", "<crate::proto::h1::io::Cursor as crate::buf::buf_impl::Buf>::remaining", "Argument[self]", "ReturnValue", "taint", "df-generated"]
       - ["repo:https://github.com/hyperium/hyper:hyper", "<crate::proto::h1::io::Cursor>::new", "Argument[0]", "ReturnValue.Field[crate::proto::h1::io::Cursor::bytes]", "value", "dfc-generated"]
+      - ["repo:https://github.com/hyperium/hyper:hyper", "<crate::proto::h1::io::WriteBuf as crate::buf::buf_impl::Buf>::remaining", "Argument[self]", "ReturnValue", "taint", "df-generated"]
       - ["repo:https://github.com/hyperium/hyper:hyper", "<crate::proto::h2::client::ConnMapErr as crate::future::FusedFuture>::is_terminated", "Argument[self].Field[crate::proto::h2::client::ConnMapErr::is_terminated]", "ReturnValue", "value", "dfc-generated"]
       - ["repo:https://github.com/hyperium/hyper:hyper", "<crate::proto::h2::ping::Recorder>::for_stream", "Argument[self]", "ReturnValue", "value", "dfc-generated"]
       - ["repo:https://github.com/hyperium/hyper:hyper", "<crate::proto::h2::server::Server>::new", "Argument[1]", "ReturnValue.Field[crate::proto::h2::server::Server::service]", "value", "dfc-generated"]
       - ["repo:https://github.com/hyperium/hyper:hyper", "<crate::proto::h2::server::Server>::new", "Argument[2].Field[crate::proto::h2::server::Config::date_header]", "ReturnValue.Field[crate::proto::h2::server::Server::date_header]", "value", "dfc-generated"]
       - ["repo:https://github.com/hyperium/hyper:hyper", "<crate::proto::h2::server::Server>::new", "Argument[3]", "ReturnValue.Field[crate::proto::h2::server::Server::exec]", "value", "dfc-generated"]
       - ["repo:https://github.com/hyperium/hyper:hyper", "<crate::proto::h2::server::Server>::new", "Argument[4]", "ReturnValue.Field[crate::proto::h2::server::Server::timer]", "value", "dfc-generated"]
+      - ["repo:https://github.com/hyperium/hyper:hyper", "<crate::result::Result as crate::ffi::task::IntoDynTaskType>::into_dyn_task_type", "Argument[self].Field[crate::result::Result::Err(0)]", "ReturnValue.Reference", "value", "dfc-generated"]
       - ["repo:https://github.com/hyperium/hyper:hyper", "<crate::rt::io::ReadBuf>::init_len", "Argument[self].Field[crate::rt::io::ReadBuf::init]", "ReturnValue", "value", "dfc-generated"]
       - ["repo:https://github.com/hyperium/hyper:hyper", "<crate::rt::io::ReadBuf>::len", "Argument[self].Field[crate::rt::io::ReadBuf::filled]", "ReturnValue", "value", "dfc-generated"]
       - ["repo:https://github.com/hyperium/hyper:hyper", "<crate::rt::io::ReadBuf>::new", "Argument[0]", "ReturnValue", "taint", "df-generated"]
@@ -210,14 +217,11 @@ extensions:
       - ["repo:https://github.com/hyperium/hyper:hyper", "<crate::server::conn::http2::Builder>::max_header_list_size", "Argument[self]", "ReturnValue", "value", "dfc-generated"]
       - ["repo:https://github.com/hyperium/hyper:hyper", "<crate::server::conn::http2::Builder>::max_local_error_reset_streams", "Argument[self]", "ReturnValue", "value", "dfc-generated"]
       - ["repo:https://github.com/hyperium/hyper:hyper", "<crate::server::conn::http2::Builder>::max_pending_accept_reset_streams", "Argument[self]", "ReturnValue", "value", "dfc-generated"]
-      - ["repo:https://github.com/hyperium/hyper:hyper", "<crate::server::conn::http2::Builder>::max_send_buf_size", "Argument[0]", "Argument[self].Field[crate::server::conn::http2::Builder::h2_builder].Field[crate::proto::h2::server::Config::max_send_buffer_size]", "value", "dfc-generated"]
-      - ["repo:https://github.com/hyperium/hyper:hyper", "<crate::server::conn::http2::Builder>::max_send_buf_size", "Argument[0]", "ReturnValue.Field[crate::server::conn::http2::Builder::h2_builder].Field[crate::proto::h2::server::Config::max_send_buffer_size]", "value", "dfc-generated"]
       - ["repo:https://github.com/hyperium/hyper:hyper", "<crate::server::conn::http2::Builder>::max_send_buf_size", "Argument[self]", "ReturnValue", "value", "dfc-generated"]
       - ["repo:https://github.com/hyperium/hyper:hyper", "<crate::server::conn::http2::Builder>::new", "Argument[0]", "ReturnValue.Field[crate::server::conn::http2::Builder::exec]", "value", "dfc-generated"]
       - ["repo:https://github.com/hyperium/hyper:hyper", "<crate::server::conn::http2::Builder>::serve_connection", "Argument[1]", "ReturnValue.Field[crate::server::conn::http2::Connection::conn].Field[crate::proto::h2::server::Server::service]", "value", "dfc-generated"]
       - ["repo:https://github.com/hyperium/hyper:hyper", "<crate::server::conn::http2::Builder>::serve_connection", "Argument[self].Field[crate::server::conn::http2::Builder::exec].Reference", "ReturnValue.Field[crate::server::conn::http2::Connection::conn].Field[crate::proto::h2::server::Server::exec]", "value", "dfc-generated"]
       - ["repo:https://github.com/hyperium/hyper:hyper", "<crate::server::conn::http2::Builder>::serve_connection", "Argument[self].Field[crate::server::conn::http2::Builder::timer].Reference", "ReturnValue.Field[crate::server::conn::http2::Connection::conn].Field[crate::proto::h2::server::Server::timer]", "value", "dfc-generated"]
-      - ["repo:https://github.com/hyperium/hyper:hyper", "<crate::server::conn::http2::Builder>::serve_connection", "Argument[self].Field[crate::server::conn::http2::Builder::timer]", "ReturnValue.Field[crate::server::conn::http2::Connection::conn].Field[crate::proto::h2::server::Server::timer]", "value", "dfc-generated"]
       - ["repo:https://github.com/hyperium/hyper:hyper", "<crate::server::conn::http2::Builder>::timer", "Argument[self]", "ReturnValue", "value", "dfc-generated"]
       - ["repo:https://github.com/hyperium/hyper:hyper", "<crate::service::util::ServiceFn as crate::clone::Clone>::clone", "Argument[self].Field[crate::service::util::ServiceFn::f].Reference", "ReturnValue.Field[crate::service::util::ServiceFn::f]", "value", "dfc-generated"]
       - ["repo:https://github.com/hyperium/hyper:hyper", "<crate::service::util::ServiceFn as crate::clone::Clone>::clone", "Argument[self].Field[crate::service::util::ServiceFn::f]", "ReturnValue.Field[crate::service::util::ServiceFn::f]", "value", "dfc-generated"]
@@ -229,15 +233,16 @@ extensions:
       - ["repo:https://github.com/hyperium/hyper:hyper", "<crate::support::trailers::StreamBodyWithTrailers>::set_trailers", "Argument[0]", "Argument[self].Field[crate::support::trailers::StreamBodyWithTrailers::trailers].Field[crate::option::Option::Some(0)]", "value", "dfc-generated"]
       - ["repo:https://github.com/hyperium/hyper:hyper", "<crate::support::trailers::StreamBodyWithTrailers>::with_trailers", "Argument[0]", "ReturnValue.Field[crate::support::trailers::StreamBodyWithTrailers::stream]", "value", "dfc-generated"]
       - ["repo:https://github.com/hyperium/hyper:hyper", "<crate::support::trailers::StreamBodyWithTrailers>::with_trailers", "Argument[1]", "ReturnValue.Field[crate::support::trailers::StreamBodyWithTrailers::trailers].Field[crate::option::Option::Some(0)]", "value", "dfc-generated"]
+      - ["repo:https://github.com/hyperium/hyper:hyper", "<crate::upgrade::Upgraded>::new", "Argument[0]", "ReturnValue", "taint", "df-generated"]
       - ["repo:https://github.com/hyperium/hyper:hyper", "crate::proto::h2::client::handshake", "Argument[1]", "ReturnValue.Field[crate::result::Result::Ok(0)].Field[crate::proto::h2::client::ClientTask::req_rx]", "value", "dfc-generated"]
       - ["repo:https://github.com/hyperium/hyper:hyper", "crate::proto::h2::client::handshake", "Argument[3]", "ReturnValue.Field[crate::result::Result::Ok(0)].Field[crate::proto::h2::client::ClientTask::executor]", "value", "dfc-generated"]
-      - ["repo:https://github.com/hyperium/hyper:hyper", "crate::proto::h2::ping::channel", "Argument[1]", "ReturnValue", "taint", "df-generated"]
       - ["repo:https://github.com/hyperium/hyper:hyper", "crate::service::util::service_fn", "Argument[0]", "ReturnValue.Field[crate::service::util::ServiceFn::f]", "value", "dfc-generated"]
   - addsTo:
       pack: codeql/rust-all
       extensible: sinkModel
     data:
       - ["repo:https://github.com/hyperium/hyper:hyper", "<crate::common::time::Time>::check", "Argument[1]", "log-injection", "df-generated"]
+      - ["repo:https://github.com/hyperium/hyper:hyper", "<crate::proto::h1::conn::Conn>::poll_drain_or_close_read", "Argument[self]", "log-injection", "df-generated"]
       - ["repo:https://github.com/hyperium/hyper:hyper", "<crate::proto::h1::conn::Conn>::poll_read_body", "Argument[self]", "log-injection", "df-generated"]
       - ["repo:https://github.com/hyperium/hyper:hyper", "<crate::proto::h1::conn::Conn>::write_body", "Argument[self]", "log-injection", "df-generated"]
       - ["repo:https://github.com/hyperium/hyper:hyper", "<crate::proto::h1::conn::Conn>::write_body_and_end", "Argument[self]", "log-injection", "df-generated"]
diff --git a/rust/ql/lib/ext/generated/libc/repo-https-github.com-rust-lang-libc-libc-test.model.yml b/rust/ql/lib/ext/generated/libc/repo-https-github.com-rust-lang-libc-libc-test.model.yml
index 09c7a61c4f7..5fc2777e7d7 100644
--- a/rust/ql/lib/ext/generated/libc/repo-https-github.com-rust-lang-libc-libc-test.model.yml
+++ b/rust/ql/lib/ext/generated/libc/repo-https-github.com-rust-lang-libc-libc-test.model.yml
@@ -5,7 +5,6 @@ extensions:
       extensible: summaryModel
     data:
       - ["repo:https://github.com/rust-lang/libc:libc-test", "<crate::style::StyleChecker>::check_file", "Argument[0]", "Argument[self]", "taint", "df-generated"]
-      - ["repo:https://github.com/rust-lang/libc:libc-test", "<crate::style::StyleChecker>::reset_state", "Argument[self].Field[crate::style::StyleChecker::errors]", "Argument[self].Reference.Field[crate::style::StyleChecker::errors]", "value", "dfc-generated"]
   - addsTo:
       pack: codeql/rust-all
       extensible: sinkModel
diff --git a/rust/ql/lib/ext/generated/libc/repo-https-github.com-rust-lang-libc-libc.model.yml b/rust/ql/lib/ext/generated/libc/repo-https-github.com-rust-lang-libc-libc.model.yml
index e8dc059dd9d..493fb1c1e16 100644
--- a/rust/ql/lib/ext/generated/libc/repo-https-github.com-rust-lang-libc-libc.model.yml
+++ b/rust/ql/lib/ext/generated/libc/repo-https-github.com-rust-lang-libc-libc.model.yml
@@ -4,25 +4,65 @@ extensions:
       pack: codeql/rust-all
       extensible: summaryModel
     data:
-      - ["repo:https://github.com/rust-lang/libc:libc", "<crate::unix::bsd::apple::qos_class_t as crate::clone::Clone>::clone", "Argument[self].Reference", "ReturnValue", "value", "dfc-generated"]
-      - ["repo:https://github.com/rust-lang/libc:libc", "<crate::unix::bsd::apple::siginfo_t>::si_addr", "Argument[self].Field[crate::unix::bsd::apple::siginfo_t::si_addr]", "ReturnValue", "value", "dfc-generated"]
-      - ["repo:https://github.com/rust-lang/libc:libc", "<crate::unix::bsd::apple::siginfo_t>::si_pid", "Argument[self].Field[crate::unix::bsd::apple::siginfo_t::si_pid]", "ReturnValue", "value", "dfc-generated"]
-      - ["repo:https://github.com/rust-lang/libc:libc", "<crate::unix::bsd::apple::siginfo_t>::si_status", "Argument[self].Field[crate::unix::bsd::apple::siginfo_t::si_status]", "ReturnValue", "value", "dfc-generated"]
-      - ["repo:https://github.com/rust-lang/libc:libc", "<crate::unix::bsd::apple::siginfo_t>::si_uid", "Argument[self].Field[crate::unix::bsd::apple::siginfo_t::si_uid]", "ReturnValue", "value", "dfc-generated"]
-      - ["repo:https://github.com/rust-lang/libc:libc", "<crate::unix::bsd::apple::sysdir_search_path_directory_t as crate::clone::Clone>::clone", "Argument[self].Reference", "ReturnValue", "value", "dfc-generated"]
-      - ["repo:https://github.com/rust-lang/libc:libc", "<crate::unix::bsd::apple::sysdir_search_path_domain_mask_t as crate::clone::Clone>::clone", "Argument[self].Reference", "ReturnValue", "value", "dfc-generated"]
-      - ["repo:https://github.com/rust-lang/libc:libc", "<crate::unix::bsd::apple::timezone as crate::clone::Clone>::clone", "Argument[self].Reference", "ReturnValue", "value", "dfc-generated"]
-      - ["repo:https://github.com/rust-lang/libc:libc", "crate::unix::bsd::QCMD", "Argument[0]", "ReturnValue", "taint", "df-generated"]
-      - ["repo:https://github.com/rust-lang/libc:libc", "crate::unix::bsd::QCMD", "Argument[1]", "ReturnValue", "taint", "df-generated"]
-      - ["repo:https://github.com/rust-lang/libc:libc", "crate::unix::bsd::WEXITSTATUS", "Argument[0]", "ReturnValue", "taint", "df-generated"]
-      - ["repo:https://github.com/rust-lang/libc:libc", "crate::unix::bsd::WTERMSIG", "Argument[0]", "ReturnValue", "taint", "df-generated"]
-      - ["repo:https://github.com/rust-lang/libc:libc", "crate::unix::bsd::apple::CMSG_LEN", "Argument[0]", "ReturnValue", "taint", "df-generated"]
-      - ["repo:https://github.com/rust-lang/libc:libc", "crate::unix::bsd::apple::CMSG_NXTHDR", "Argument[1]", "ReturnValue", "taint", "df-generated"]
-      - ["repo:https://github.com/rust-lang/libc:libc", "crate::unix::bsd::apple::CMSG_SPACE", "Argument[0]", "ReturnValue", "taint", "df-generated"]
-      - ["repo:https://github.com/rust-lang/libc:libc", "crate::unix::bsd::apple::VM_MAKE_TAG", "Argument[0]", "ReturnValue", "taint", "df-generated"]
-      - ["repo:https://github.com/rust-lang/libc:libc", "crate::unix::bsd::apple::WSTOPSIG", "Argument[0]", "ReturnValue", "taint", "df-generated"]
-      - ["repo:https://github.com/rust-lang/libc:libc", "crate::unix::bsd::apple::_WSTATUS", "Argument[0]", "ReturnValue", "taint", "df-generated"]
-      - ["repo:https://github.com/rust-lang/libc:libc", "crate::unix::bsd::apple::major", "Argument[0]", "ReturnValue", "taint", "df-generated"]
-      - ["repo:https://github.com/rust-lang/libc:libc", "crate::unix::bsd::apple::makedev", "Argument[0]", "ReturnValue", "taint", "df-generated"]
-      - ["repo:https://github.com/rust-lang/libc:libc", "crate::unix::bsd::apple::makedev", "Argument[1]", "ReturnValue", "taint", "df-generated"]
-      - ["repo:https://github.com/rust-lang/libc:libc", "crate::unix::bsd::apple::minor", "Argument[0]", "ReturnValue", "taint", "df-generated"]
+      - ["repo:https://github.com/rust-lang/libc:libc", "<crate::unix::linux_like::linux::gnu::__c_anonymous_ptrace_syscall_info_data as crate::clone::Clone>::clone", "Argument[self].Reference", "ReturnValue", "value", "dfc-generated"]
+      - ["repo:https://github.com/rust-lang/libc:libc", "<crate::unix::linux_like::linux::gnu::sifields_sigchld as crate::clone::Clone>::clone", "Argument[self].Reference", "ReturnValue", "value", "dfc-generated"]
+      - ["repo:https://github.com/rust-lang/libc:libc", "crate::unix::linux_like::CMSG_LEN", "Argument[0]", "ReturnValue", "taint", "df-generated"]
+      - ["repo:https://github.com/rust-lang/libc:libc", "crate::unix::linux_like::CMSG_SPACE", "Argument[0]", "ReturnValue", "taint", "df-generated"]
+      - ["repo:https://github.com/rust-lang/libc:libc", "crate::unix::linux_like::IPOPT_CLASS", "Argument[0]", "ReturnValue", "taint", "df-generated"]
+      - ["repo:https://github.com/rust-lang/libc:libc", "crate::unix::linux_like::IPOPT_COPIED", "Argument[0]", "ReturnValue", "taint", "df-generated"]
+      - ["repo:https://github.com/rust-lang/libc:libc", "crate::unix::linux_like::IPOPT_NUMBER", "Argument[0]", "ReturnValue", "taint", "df-generated"]
+      - ["repo:https://github.com/rust-lang/libc:libc", "crate::unix::linux_like::IPTOS_ECN", "Argument[0]", "ReturnValue", "taint", "df-generated"]
+      - ["repo:https://github.com/rust-lang/libc:libc", "crate::unix::linux_like::KERNEL_VERSION", "Argument[0]", "ReturnValue", "taint", "df-generated"]
+      - ["repo:https://github.com/rust-lang/libc:libc", "crate::unix::linux_like::KERNEL_VERSION", "Argument[1]", "ReturnValue", "taint", "df-generated"]
+      - ["repo:https://github.com/rust-lang/libc:libc", "crate::unix::linux_like::KERNEL_VERSION", "Argument[2]", "ReturnValue", "taint", "df-generated"]
+      - ["repo:https://github.com/rust-lang/libc:libc", "crate::unix::linux_like::QCMD", "Argument[0]", "ReturnValue", "taint", "df-generated"]
+      - ["repo:https://github.com/rust-lang/libc:libc", "crate::unix::linux_like::QCMD", "Argument[1]", "ReturnValue", "taint", "df-generated"]
+      - ["repo:https://github.com/rust-lang/libc:libc", "crate::unix::linux_like::WEXITSTATUS", "Argument[0]", "ReturnValue", "taint", "df-generated"]
+      - ["repo:https://github.com/rust-lang/libc:libc", "crate::unix::linux_like::WSTOPSIG", "Argument[0]", "ReturnValue", "taint", "df-generated"]
+      - ["repo:https://github.com/rust-lang/libc:libc", "crate::unix::linux_like::WTERMSIG", "Argument[0]", "ReturnValue", "taint", "df-generated"]
+      - ["repo:https://github.com/rust-lang/libc:libc", "crate::unix::linux_like::W_EXITCODE", "Argument[0]", "ReturnValue", "taint", "df-generated"]
+      - ["repo:https://github.com/rust-lang/libc:libc", "crate::unix::linux_like::W_EXITCODE", "Argument[1]", "ReturnValue", "taint", "df-generated"]
+      - ["repo:https://github.com/rust-lang/libc:libc", "crate::unix::linux_like::W_STOPCODE", "Argument[0]", "ReturnValue", "taint", "df-generated"]
+      - ["repo:https://github.com/rust-lang/libc:libc", "crate::unix::linux_like::linux::BPF_CLASS", "Argument[0]", "ReturnValue", "taint", "df-generated"]
+      - ["repo:https://github.com/rust-lang/libc:libc", "crate::unix::linux_like::linux::BPF_JUMP", "Argument[0]", "ReturnValue.Field[crate::unix::linux_like::linux::sock_filter::code]", "value", "dfc-generated"]
+      - ["repo:https://github.com/rust-lang/libc:libc", "crate::unix::linux_like::linux::BPF_JUMP", "Argument[1]", "ReturnValue.Field[crate::unix::linux_like::linux::sock_filter::k]", "value", "dfc-generated"]
+      - ["repo:https://github.com/rust-lang/libc:libc", "crate::unix::linux_like::linux::BPF_JUMP", "Argument[2]", "ReturnValue.Field[crate::unix::linux_like::linux::sock_filter::jt]", "value", "dfc-generated"]
+      - ["repo:https://github.com/rust-lang/libc:libc", "crate::unix::linux_like::linux::BPF_JUMP", "Argument[3]", "ReturnValue.Field[crate::unix::linux_like::linux::sock_filter::jf]", "value", "dfc-generated"]
+      - ["repo:https://github.com/rust-lang/libc:libc", "crate::unix::linux_like::linux::BPF_MISCOP", "Argument[0]", "ReturnValue", "taint", "df-generated"]
+      - ["repo:https://github.com/rust-lang/libc:libc", "crate::unix::linux_like::linux::BPF_MODE", "Argument[0]", "ReturnValue", "taint", "df-generated"]
+      - ["repo:https://github.com/rust-lang/libc:libc", "crate::unix::linux_like::linux::BPF_OP", "Argument[0]", "ReturnValue", "taint", "df-generated"]
+      - ["repo:https://github.com/rust-lang/libc:libc", "crate::unix::linux_like::linux::BPF_RVAL", "Argument[0]", "ReturnValue", "taint", "df-generated"]
+      - ["repo:https://github.com/rust-lang/libc:libc", "crate::unix::linux_like::linux::BPF_SIZE", "Argument[0]", "ReturnValue", "taint", "df-generated"]
+      - ["repo:https://github.com/rust-lang/libc:libc", "crate::unix::linux_like::linux::BPF_SRC", "Argument[0]", "ReturnValue", "taint", "df-generated"]
+      - ["repo:https://github.com/rust-lang/libc:libc", "crate::unix::linux_like::linux::BPF_STMT", "Argument[0]", "ReturnValue.Field[crate::unix::linux_like::linux::sock_filter::code]", "value", "dfc-generated"]
+      - ["repo:https://github.com/rust-lang/libc:libc", "crate::unix::linux_like::linux::BPF_STMT", "Argument[1]", "ReturnValue.Field[crate::unix::linux_like::linux::sock_filter::k]", "value", "dfc-generated"]
+      - ["repo:https://github.com/rust-lang/libc:libc", "crate::unix::linux_like::linux::CMSG_NXTHDR", "Argument[1]", "ReturnValue", "taint", "df-generated"]
+      - ["repo:https://github.com/rust-lang/libc:libc", "crate::unix::linux_like::linux::CPU_ALLOC_SIZE", "Argument[0]", "ReturnValue", "taint", "df-generated"]
+      - ["repo:https://github.com/rust-lang/libc:libc", "crate::unix::linux_like::linux::ELF32_R_INFO", "Argument[0]", "ReturnValue", "taint", "df-generated"]
+      - ["repo:https://github.com/rust-lang/libc:libc", "crate::unix::linux_like::linux::ELF32_R_INFO", "Argument[1]", "ReturnValue", "taint", "df-generated"]
+      - ["repo:https://github.com/rust-lang/libc:libc", "crate::unix::linux_like::linux::ELF32_R_SYM", "Argument[0]", "ReturnValue", "taint", "df-generated"]
+      - ["repo:https://github.com/rust-lang/libc:libc", "crate::unix::linux_like::linux::ELF32_R_TYPE", "Argument[0]", "ReturnValue", "taint", "df-generated"]
+      - ["repo:https://github.com/rust-lang/libc:libc", "crate::unix::linux_like::linux::ELF64_R_INFO", "Argument[0]", "ReturnValue", "taint", "df-generated"]
+      - ["repo:https://github.com/rust-lang/libc:libc", "crate::unix::linux_like::linux::ELF64_R_INFO", "Argument[1]", "ReturnValue", "taint", "df-generated"]
+      - ["repo:https://github.com/rust-lang/libc:libc", "crate::unix::linux_like::linux::ELF64_R_SYM", "Argument[0]", "ReturnValue", "taint", "df-generated"]
+      - ["repo:https://github.com/rust-lang/libc:libc", "crate::unix::linux_like::linux::ELF64_R_TYPE", "Argument[0]", "ReturnValue", "taint", "df-generated"]
+      - ["repo:https://github.com/rust-lang/libc:libc", "crate::unix::linux_like::linux::FUTEX_OP", "Argument[0]", "ReturnValue", "taint", "df-generated"]
+      - ["repo:https://github.com/rust-lang/libc:libc", "crate::unix::linux_like::linux::FUTEX_OP", "Argument[1]", "ReturnValue", "taint", "df-generated"]
+      - ["repo:https://github.com/rust-lang/libc:libc", "crate::unix::linux_like::linux::FUTEX_OP", "Argument[2]", "ReturnValue", "taint", "df-generated"]
+      - ["repo:https://github.com/rust-lang/libc:libc", "crate::unix::linux_like::linux::FUTEX_OP", "Argument[3]", "ReturnValue", "taint", "df-generated"]
+      - ["repo:https://github.com/rust-lang/libc:libc", "crate::unix::linux_like::linux::IPTOS_PREC", "Argument[0]", "ReturnValue", "taint", "df-generated"]
+      - ["repo:https://github.com/rust-lang/libc:libc", "crate::unix::linux_like::linux::IPTOS_TOS", "Argument[0]", "ReturnValue", "taint", "df-generated"]
+      - ["repo:https://github.com/rust-lang/libc:libc", "crate::unix::linux_like::linux::NLA_ALIGN", "Argument[0]", "ReturnValue", "taint", "df-generated"]
+      - ["repo:https://github.com/rust-lang/libc:libc", "crate::unix::linux_like::linux::RT_ADDRCLASS", "Argument[0]", "ReturnValue", "taint", "df-generated"]
+      - ["repo:https://github.com/rust-lang/libc:libc", "crate::unix::linux_like::linux::RT_TOS", "Argument[0]", "ReturnValue", "taint", "df-generated"]
+      - ["repo:https://github.com/rust-lang/libc:libc", "crate::unix::linux_like::linux::SCTP_PR_INDEX", "Argument[0]", "ReturnValue", "taint", "df-generated"]
+      - ["repo:https://github.com/rust-lang/libc:libc", "crate::unix::linux_like::linux::SCTP_PR_POLICY", "Argument[0]", "ReturnValue", "taint", "df-generated"]
+      - ["repo:https://github.com/rust-lang/libc:libc", "crate::unix::linux_like::linux::TPACKET_ALIGN", "Argument[0]", "ReturnValue", "taint", "df-generated"]
+      - ["repo:https://github.com/rust-lang/libc:libc", "crate::unix::linux_like::linux::_IO", "Argument[0]", "ReturnValue", "taint", "df-generated"]
+      - ["repo:https://github.com/rust-lang/libc:libc", "crate::unix::linux_like::linux::_IO", "Argument[1]", "ReturnValue", "taint", "df-generated"]
+      - ["repo:https://github.com/rust-lang/libc:libc", "crate::unix::linux_like::linux::_IOR", "Argument[0]", "ReturnValue", "taint", "df-generated"]
+      - ["repo:https://github.com/rust-lang/libc:libc", "crate::unix::linux_like::linux::_IOR", "Argument[1]", "ReturnValue", "taint", "df-generated"]
+      - ["repo:https://github.com/rust-lang/libc:libc", "crate::unix::linux_like::linux::_IOW", "Argument[0]", "ReturnValue", "taint", "df-generated"]
+      - ["repo:https://github.com/rust-lang/libc:libc", "crate::unix::linux_like::linux::_IOW", "Argument[1]", "ReturnValue", "taint", "df-generated"]
+      - ["repo:https://github.com/rust-lang/libc:libc", "crate::unix::linux_like::linux::_IOWR", "Argument[0]", "ReturnValue", "taint", "df-generated"]
+      - ["repo:https://github.com/rust-lang/libc:libc", "crate::unix::linux_like::linux::_IOWR", "Argument[1]", "ReturnValue", "taint", "df-generated"]
diff --git a/rust/ql/lib/ext/generated/log/repo-https-github.com-rust-lang-log-log.model.yml b/rust/ql/lib/ext/generated/log/repo-https-github.com-rust-lang-log-log.model.yml
index a894c71018f..f5df04600b6 100644
--- a/rust/ql/lib/ext/generated/log/repo-https-github.com-rust-lang-log-log.model.yml
+++ b/rust/ql/lib/ext/generated/log/repo-https-github.com-rust-lang-log-log.model.yml
@@ -7,7 +7,6 @@ extensions:
       - ["repo:https://github.com/rust-lang/log:log", "<crate::Metadata>::level", "Argument[self].Field[crate::Metadata::level]", "ReturnValue", "value", "dfc-generated"]
       - ["repo:https://github.com/rust-lang/log:log", "<crate::Metadata>::target", "Argument[self].Field[crate::Metadata::target]", "ReturnValue", "value", "dfc-generated"]
       - ["repo:https://github.com/rust-lang/log:log", "<crate::MetadataBuilder>::build", "Argument[self].Field[crate::MetadataBuilder::metadata].Reference", "ReturnValue", "value", "dfc-generated"]
-      - ["repo:https://github.com/rust-lang/log:log", "<crate::MetadataBuilder>::build", "Argument[self].Field[crate::MetadataBuilder::metadata]", "ReturnValue", "value", "dfc-generated"]
       - ["repo:https://github.com/rust-lang/log:log", "<crate::MetadataBuilder>::level", "Argument[0]", "Argument[self].Field[crate::MetadataBuilder::metadata].Field[crate::Metadata::level]", "value", "dfc-generated"]
       - ["repo:https://github.com/rust-lang/log:log", "<crate::MetadataBuilder>::level", "Argument[0]", "ReturnValue.Field[crate::MetadataBuilder::metadata].Field[crate::Metadata::level]", "value", "dfc-generated"]
       - ["repo:https://github.com/rust-lang/log:log", "<crate::MetadataBuilder>::level", "Argument[self]", "ReturnValue", "value", "dfc-generated"]
@@ -15,20 +14,17 @@ extensions:
       - ["repo:https://github.com/rust-lang/log:log", "<crate::MetadataBuilder>::target", "Argument[0]", "ReturnValue.Field[crate::MetadataBuilder::metadata].Field[crate::Metadata::target]", "value", "dfc-generated"]
       - ["repo:https://github.com/rust-lang/log:log", "<crate::MetadataBuilder>::target", "Argument[self]", "ReturnValue", "value", "dfc-generated"]
       - ["repo:https://github.com/rust-lang/log:log", "<crate::Record>::args", "Argument[self].Field[crate::Record::args]", "ReturnValue.Reference", "value", "dfc-generated"]
-      - ["repo:https://github.com/rust-lang/log:log", "<crate::Record>::file", "Argument[self]", "ReturnValue", "taint", "df-generated"]
       - ["repo:https://github.com/rust-lang/log:log", "<crate::Record>::key_values", "Argument[self].Field[crate::Record::key_values].Field[0]", "ReturnValue", "value", "dfc-generated"]
       - ["repo:https://github.com/rust-lang/log:log", "<crate::Record>::key_values", "Argument[self].Field[crate::Record::key_values].Field[crate::KeyValues(0)]", "ReturnValue", "value", "dfc-generated"]
       - ["repo:https://github.com/rust-lang/log:log", "<crate::Record>::level", "Argument[self].Field[crate::Record::metadata].Field[crate::Metadata::level]", "ReturnValue", "value", "dfc-generated"]
       - ["repo:https://github.com/rust-lang/log:log", "<crate::Record>::line", "Argument[self].Field[crate::Record::line]", "ReturnValue", "value", "dfc-generated"]
       - ["repo:https://github.com/rust-lang/log:log", "<crate::Record>::metadata", "Argument[self].Field[crate::Record::metadata]", "ReturnValue.Reference", "value", "dfc-generated"]
-      - ["repo:https://github.com/rust-lang/log:log", "<crate::Record>::module_path", "Argument[self]", "ReturnValue", "taint", "df-generated"]
       - ["repo:https://github.com/rust-lang/log:log", "<crate::Record>::target", "Argument[self].Field[crate::Record::metadata].Field[crate::Metadata::target]", "ReturnValue", "value", "dfc-generated"]
       - ["repo:https://github.com/rust-lang/log:log", "<crate::Record>::to_builder", "Argument[self]", "ReturnValue", "taint", "df-generated"]
       - ["repo:https://github.com/rust-lang/log:log", "<crate::RecordBuilder>::args", "Argument[0]", "Argument[self].Field[crate::RecordBuilder::record].Field[crate::Record::args]", "value", "dfc-generated"]
       - ["repo:https://github.com/rust-lang/log:log", "<crate::RecordBuilder>::args", "Argument[0]", "ReturnValue.Field[crate::RecordBuilder::record].Field[crate::Record::args]", "value", "dfc-generated"]
       - ["repo:https://github.com/rust-lang/log:log", "<crate::RecordBuilder>::args", "Argument[self]", "ReturnValue", "value", "dfc-generated"]
       - ["repo:https://github.com/rust-lang/log:log", "<crate::RecordBuilder>::build", "Argument[self].Field[crate::RecordBuilder::record].Reference", "ReturnValue", "value", "dfc-generated"]
-      - ["repo:https://github.com/rust-lang/log:log", "<crate::RecordBuilder>::build", "Argument[self].Field[crate::RecordBuilder::record]", "ReturnValue", "value", "dfc-generated"]
       - ["repo:https://github.com/rust-lang/log:log", "<crate::RecordBuilder>::file", "Argument[self]", "ReturnValue", "value", "dfc-generated"]
       - ["repo:https://github.com/rust-lang/log:log", "<crate::RecordBuilder>::file_static", "Argument[self]", "ReturnValue", "value", "dfc-generated"]
       - ["repo:https://github.com/rust-lang/log:log", "<crate::RecordBuilder>::key_values", "Argument[self]", "ReturnValue", "value", "dfc-generated"]
@@ -54,6 +50,5 @@ extensions:
       - ["repo:https://github.com/rust-lang/log:log", "<crate::kv::key::Key>::from_str", "Argument[0]", "ReturnValue.Field[crate::kv::key::Key::key]", "value", "dfc-generated"]
       - ["repo:https://github.com/rust-lang/log:log", "<crate::kv::key::Key>::to_borrowed_str", "Argument[self].Field[crate::kv::key::Key::key]", "ReturnValue.Field[crate::option::Option::Some(0)]", "value", "dfc-generated"]
       - ["repo:https://github.com/rust-lang/log:log", "<crate::kv::value::Value as crate::kv::value::ToValue>::to_value", "Argument[self].Field[crate::kv::value::Value::inner].Reference", "ReturnValue.Field[crate::kv::value::Value::inner]", "value", "dfc-generated"]
-      - ["repo:https://github.com/rust-lang/log:log", "<crate::kv::value::Value as crate::kv::value::ToValue>::to_value", "Argument[self].Field[crate::kv::value::Value::inner]", "ReturnValue.Field[crate::kv::value::Value::inner]", "value", "dfc-generated"]
       - ["repo:https://github.com/rust-lang/log:log", "<crate::string::String as crate::kv::key::ToKey>::to_key", "Argument[self]", "ReturnValue.Field[crate::kv::key::Key::key]", "value", "dfc-generated"]
       - ["repo:https://github.com/rust-lang/log:log", "<str as crate::kv::key::ToKey>::to_key", "Argument[self]", "ReturnValue.Field[crate::kv::key::Key::key]", "value", "dfc-generated"]
diff --git a/rust/ql/lib/ext/generated/memchr/repo-https-github.com-BurntSushi-memchr-memchr.model.yml b/rust/ql/lib/ext/generated/memchr/repo-https-github.com-BurntSushi-memchr-memchr.model.yml
index 62617b2b033..2317865e696 100644
--- a/rust/ql/lib/ext/generated/memchr/repo-https-github.com-BurntSushi-memchr-memchr.model.yml
+++ b/rust/ql/lib/ext/generated/memchr/repo-https-github.com-BurntSushi-memchr-memchr.model.yml
@@ -4,24 +4,6 @@ extensions:
       pack: codeql/rust-all
       extensible: summaryModel
     data:
-      - ["repo:https://github.com/BurntSushi/memchr:memchr", "<crate::arch::aarch64::neon::memchr::One>::find", "Argument[0]", "ReturnValue", "taint", "df-generated"]
-      - ["repo:https://github.com/BurntSushi/memchr:memchr", "<crate::arch::aarch64::neon::memchr::One>::find_raw", "Argument[0]", "ReturnValue.Field[crate::option::Option::Some(0)]", "value", "dfc-generated"]
-      - ["repo:https://github.com/BurntSushi/memchr:memchr", "<crate::arch::aarch64::neon::memchr::One>::iter", "Argument[self]", "ReturnValue.Field[crate::arch::aarch64::neon::memchr::OneIter::searcher]", "value", "dfc-generated"]
-      - ["repo:https://github.com/BurntSushi/memchr:memchr", "<crate::arch::aarch64::neon::memchr::One>::new_unchecked", "Argument[0]", "ReturnValue.Field[crate::arch::aarch64::neon::memchr::One(0)].Field[crate::arch::generic::memchr::One::s1]", "value", "dfc-generated"]
-      - ["repo:https://github.com/BurntSushi/memchr:memchr", "<crate::arch::aarch64::neon::memchr::OneIter as crate::iter::traits::iterator::Iterator>::next", "Argument[self].Field[crate::arch::aarch64::neon::memchr::OneIter::it].Field[crate::arch::generic::memchr::Iter::start]", "ReturnValue", "value", "dfc-generated"]
-      - ["repo:https://github.com/BurntSushi/memchr:memchr", "<crate::arch::aarch64::neon::memchr::Three>::find", "Argument[0]", "ReturnValue", "taint", "df-generated"]
-      - ["repo:https://github.com/BurntSushi/memchr:memchr", "<crate::arch::aarch64::neon::memchr::Three>::find_raw", "Argument[0]", "ReturnValue.Field[crate::option::Option::Some(0)]", "value", "dfc-generated"]
-      - ["repo:https://github.com/BurntSushi/memchr:memchr", "<crate::arch::aarch64::neon::memchr::Three>::iter", "Argument[self]", "ReturnValue.Field[crate::arch::aarch64::neon::memchr::ThreeIter::searcher]", "value", "dfc-generated"]
-      - ["repo:https://github.com/BurntSushi/memchr:memchr", "<crate::arch::aarch64::neon::memchr::Three>::new_unchecked", "Argument[0]", "ReturnValue.Field[crate::arch::aarch64::neon::memchr::Three(0)].Field[crate::arch::generic::memchr::Three::s1]", "value", "dfc-generated"]
-      - ["repo:https://github.com/BurntSushi/memchr:memchr", "<crate::arch::aarch64::neon::memchr::Three>::new_unchecked", "Argument[1]", "ReturnValue.Field[crate::arch::aarch64::neon::memchr::Three(0)].Field[crate::arch::generic::memchr::Three::s2]", "value", "dfc-generated"]
-      - ["repo:https://github.com/BurntSushi/memchr:memchr", "<crate::arch::aarch64::neon::memchr::Three>::new_unchecked", "Argument[2]", "ReturnValue.Field[crate::arch::aarch64::neon::memchr::Three(0)].Field[crate::arch::generic::memchr::Three::s3]", "value", "dfc-generated"]
-      - ["repo:https://github.com/BurntSushi/memchr:memchr", "<crate::arch::aarch64::neon::memchr::ThreeIter as crate::iter::traits::iterator::Iterator>::next", "Argument[self].Field[crate::arch::aarch64::neon::memchr::ThreeIter::it].Field[crate::arch::generic::memchr::Iter::start]", "ReturnValue", "value", "dfc-generated"]
-      - ["repo:https://github.com/BurntSushi/memchr:memchr", "<crate::arch::aarch64::neon::memchr::Two>::find", "Argument[0]", "ReturnValue", "taint", "df-generated"]
-      - ["repo:https://github.com/BurntSushi/memchr:memchr", "<crate::arch::aarch64::neon::memchr::Two>::find_raw", "Argument[0]", "ReturnValue.Field[crate::option::Option::Some(0)]", "value", "dfc-generated"]
-      - ["repo:https://github.com/BurntSushi/memchr:memchr", "<crate::arch::aarch64::neon::memchr::Two>::iter", "Argument[self]", "ReturnValue.Field[crate::arch::aarch64::neon::memchr::TwoIter::searcher]", "value", "dfc-generated"]
-      - ["repo:https://github.com/BurntSushi/memchr:memchr", "<crate::arch::aarch64::neon::memchr::Two>::new_unchecked", "Argument[0]", "ReturnValue.Field[crate::arch::aarch64::neon::memchr::Two(0)].Field[crate::arch::generic::memchr::Two::s1]", "value", "dfc-generated"]
-      - ["repo:https://github.com/BurntSushi/memchr:memchr", "<crate::arch::aarch64::neon::memchr::Two>::new_unchecked", "Argument[1]", "ReturnValue.Field[crate::arch::aarch64::neon::memchr::Two(0)].Field[crate::arch::generic::memchr::Two::s2]", "value", "dfc-generated"]
-      - ["repo:https://github.com/BurntSushi/memchr:memchr", "<crate::arch::aarch64::neon::memchr::TwoIter as crate::iter::traits::iterator::Iterator>::next", "Argument[self].Field[crate::arch::aarch64::neon::memchr::TwoIter::it].Field[crate::arch::generic::memchr::Iter::start]", "ReturnValue", "value", "dfc-generated"]
       - ["repo:https://github.com/BurntSushi/memchr:memchr", "<crate::arch::all::memchr::One>::find", "Argument[0]", "ReturnValue", "taint", "df-generated"]
       - ["repo:https://github.com/BurntSushi/memchr:memchr", "<crate::arch::all::memchr::One>::find_raw", "Argument[0]", "ReturnValue.Field[crate::option::Option::Some(0)]", "value", "dfc-generated"]
       - ["repo:https://github.com/BurntSushi/memchr:memchr", "<crate::arch::all::memchr::One>::iter", "Argument[self]", "ReturnValue.Field[crate::arch::all::memchr::OneIter::searcher]", "value", "dfc-generated"]
@@ -83,6 +65,54 @@ extensions:
       - ["repo:https://github.com/BurntSushi/memchr:memchr", "<crate::arch::generic::packedpair::Finder>::min_haystack_len", "Argument[self].Field[crate::arch::generic::packedpair::Finder::min_haystack_len]", "ReturnValue", "value", "dfc-generated"]
       - ["repo:https://github.com/BurntSushi/memchr:memchr", "<crate::arch::generic::packedpair::Finder>::new", "Argument[1]", "ReturnValue.Field[crate::arch::generic::packedpair::Finder::pair]", "value", "dfc-generated"]
       - ["repo:https://github.com/BurntSushi/memchr:memchr", "<crate::arch::generic::packedpair::Finder>::pair", "Argument[self].Field[crate::arch::generic::packedpair::Finder::pair]", "ReturnValue.Reference", "value", "dfc-generated"]
+      - ["repo:https://github.com/BurntSushi/memchr:memchr", "<crate::arch::x86_64::avx2::memchr::One>::find", "Argument[0]", "ReturnValue", "taint", "df-generated"]
+      - ["repo:https://github.com/BurntSushi/memchr:memchr", "<crate::arch::x86_64::avx2::memchr::One>::find_raw", "Argument[0]", "ReturnValue.Field[crate::option::Option::Some(0)]", "value", "dfc-generated"]
+      - ["repo:https://github.com/BurntSushi/memchr:memchr", "<crate::arch::x86_64::avx2::memchr::One>::iter", "Argument[self]", "ReturnValue.Field[crate::arch::x86_64::avx2::memchr::OneIter::searcher]", "value", "dfc-generated"]
+      - ["repo:https://github.com/BurntSushi/memchr:memchr", "<crate::arch::x86_64::avx2::memchr::One>::new_unchecked", "Argument[0]", "ReturnValue.Field[crate::arch::x86_64::avx2::memchr::One::avx2].Field[crate::arch::generic::memchr::One::s1]", "value", "dfc-generated"]
+      - ["repo:https://github.com/BurntSushi/memchr:memchr", "<crate::arch::x86_64::avx2::memchr::One>::new_unchecked", "Argument[0]", "ReturnValue.Field[crate::arch::x86_64::avx2::memchr::One::sse2].Field[crate::arch::generic::memchr::One::s1]", "value", "dfc-generated"]
+      - ["repo:https://github.com/BurntSushi/memchr:memchr", "<crate::arch::x86_64::avx2::memchr::OneIter as crate::iter::traits::iterator::Iterator>::next", "Argument[self].Field[crate::arch::x86_64::avx2::memchr::OneIter::it].Field[crate::arch::generic::memchr::Iter::start]", "ReturnValue", "value", "dfc-generated"]
+      - ["repo:https://github.com/BurntSushi/memchr:memchr", "<crate::arch::x86_64::avx2::memchr::Three>::find", "Argument[0]", "ReturnValue", "taint", "df-generated"]
+      - ["repo:https://github.com/BurntSushi/memchr:memchr", "<crate::arch::x86_64::avx2::memchr::Three>::find_raw", "Argument[0]", "ReturnValue.Field[crate::option::Option::Some(0)]", "value", "dfc-generated"]
+      - ["repo:https://github.com/BurntSushi/memchr:memchr", "<crate::arch::x86_64::avx2::memchr::Three>::iter", "Argument[self]", "ReturnValue.Field[crate::arch::x86_64::avx2::memchr::ThreeIter::searcher]", "value", "dfc-generated"]
+      - ["repo:https://github.com/BurntSushi/memchr:memchr", "<crate::arch::x86_64::avx2::memchr::Three>::new_unchecked", "Argument[0]", "ReturnValue.Field[crate::arch::x86_64::avx2::memchr::Three::avx2].Field[crate::arch::generic::memchr::Three::s1]", "value", "dfc-generated"]
+      - ["repo:https://github.com/BurntSushi/memchr:memchr", "<crate::arch::x86_64::avx2::memchr::Three>::new_unchecked", "Argument[0]", "ReturnValue.Field[crate::arch::x86_64::avx2::memchr::Three::sse2].Field[crate::arch::generic::memchr::Three::s1]", "value", "dfc-generated"]
+      - ["repo:https://github.com/BurntSushi/memchr:memchr", "<crate::arch::x86_64::avx2::memchr::Three>::new_unchecked", "Argument[1]", "ReturnValue.Field[crate::arch::x86_64::avx2::memchr::Three::avx2].Field[crate::arch::generic::memchr::Three::s2]", "value", "dfc-generated"]
+      - ["repo:https://github.com/BurntSushi/memchr:memchr", "<crate::arch::x86_64::avx2::memchr::Three>::new_unchecked", "Argument[1]", "ReturnValue.Field[crate::arch::x86_64::avx2::memchr::Three::sse2].Field[crate::arch::generic::memchr::Three::s2]", "value", "dfc-generated"]
+      - ["repo:https://github.com/BurntSushi/memchr:memchr", "<crate::arch::x86_64::avx2::memchr::Three>::new_unchecked", "Argument[2]", "ReturnValue.Field[crate::arch::x86_64::avx2::memchr::Three::avx2].Field[crate::arch::generic::memchr::Three::s3]", "value", "dfc-generated"]
+      - ["repo:https://github.com/BurntSushi/memchr:memchr", "<crate::arch::x86_64::avx2::memchr::Three>::new_unchecked", "Argument[2]", "ReturnValue.Field[crate::arch::x86_64::avx2::memchr::Three::sse2].Field[crate::arch::generic::memchr::Three::s3]", "value", "dfc-generated"]
+      - ["repo:https://github.com/BurntSushi/memchr:memchr", "<crate::arch::x86_64::avx2::memchr::ThreeIter as crate::iter::traits::iterator::Iterator>::next", "Argument[self].Field[crate::arch::x86_64::avx2::memchr::ThreeIter::it].Field[crate::arch::generic::memchr::Iter::start]", "ReturnValue", "value", "dfc-generated"]
+      - ["repo:https://github.com/BurntSushi/memchr:memchr", "<crate::arch::x86_64::avx2::memchr::Two>::find", "Argument[0]", "ReturnValue", "taint", "df-generated"]
+      - ["repo:https://github.com/BurntSushi/memchr:memchr", "<crate::arch::x86_64::avx2::memchr::Two>::find_raw", "Argument[0]", "ReturnValue.Field[crate::option::Option::Some(0)]", "value", "dfc-generated"]
+      - ["repo:https://github.com/BurntSushi/memchr:memchr", "<crate::arch::x86_64::avx2::memchr::Two>::iter", "Argument[self]", "ReturnValue.Field[crate::arch::x86_64::avx2::memchr::TwoIter::searcher]", "value", "dfc-generated"]
+      - ["repo:https://github.com/BurntSushi/memchr:memchr", "<crate::arch::x86_64::avx2::memchr::Two>::new_unchecked", "Argument[0]", "ReturnValue.Field[crate::arch::x86_64::avx2::memchr::Two::avx2].Field[crate::arch::generic::memchr::Two::s1]", "value", "dfc-generated"]
+      - ["repo:https://github.com/BurntSushi/memchr:memchr", "<crate::arch::x86_64::avx2::memchr::Two>::new_unchecked", "Argument[0]", "ReturnValue.Field[crate::arch::x86_64::avx2::memchr::Two::sse2].Field[crate::arch::generic::memchr::Two::s1]", "value", "dfc-generated"]
+      - ["repo:https://github.com/BurntSushi/memchr:memchr", "<crate::arch::x86_64::avx2::memchr::Two>::new_unchecked", "Argument[1]", "ReturnValue.Field[crate::arch::x86_64::avx2::memchr::Two::avx2].Field[crate::arch::generic::memchr::Two::s2]", "value", "dfc-generated"]
+      - ["repo:https://github.com/BurntSushi/memchr:memchr", "<crate::arch::x86_64::avx2::memchr::Two>::new_unchecked", "Argument[1]", "ReturnValue.Field[crate::arch::x86_64::avx2::memchr::Two::sse2].Field[crate::arch::generic::memchr::Two::s2]", "value", "dfc-generated"]
+      - ["repo:https://github.com/BurntSushi/memchr:memchr", "<crate::arch::x86_64::avx2::memchr::TwoIter as crate::iter::traits::iterator::Iterator>::next", "Argument[self].Field[crate::arch::x86_64::avx2::memchr::TwoIter::it].Field[crate::arch::generic::memchr::Iter::start]", "ReturnValue", "value", "dfc-generated"]
+      - ["repo:https://github.com/BurntSushi/memchr:memchr", "<crate::arch::x86_64::avx2::packedpair::Finder>::min_haystack_len", "Argument[self].Field[crate::arch::x86_64::avx2::packedpair::Finder::sse2].Field[crate::arch::generic::packedpair::Finder::min_haystack_len]", "ReturnValue", "value", "dfc-generated"]
+      - ["repo:https://github.com/BurntSushi/memchr:memchr", "<crate::arch::x86_64::avx2::packedpair::Finder>::pair", "Argument[self].Field[crate::arch::x86_64::avx2::packedpair::Finder::avx2].Field[crate::arch::generic::packedpair::Finder::pair]", "ReturnValue.Reference", "value", "dfc-generated"]
+      - ["repo:https://github.com/BurntSushi/memchr:memchr", "<crate::arch::x86_64::sse2::memchr::One>::find", "Argument[0]", "ReturnValue", "taint", "df-generated"]
+      - ["repo:https://github.com/BurntSushi/memchr:memchr", "<crate::arch::x86_64::sse2::memchr::One>::find_raw", "Argument[0]", "ReturnValue.Field[crate::option::Option::Some(0)]", "value", "dfc-generated"]
+      - ["repo:https://github.com/BurntSushi/memchr:memchr", "<crate::arch::x86_64::sse2::memchr::One>::iter", "Argument[self]", "ReturnValue.Field[crate::arch::x86_64::sse2::memchr::OneIter::searcher]", "value", "dfc-generated"]
+      - ["repo:https://github.com/BurntSushi/memchr:memchr", "<crate::arch::x86_64::sse2::memchr::One>::new_unchecked", "Argument[0]", "ReturnValue.Field[crate::arch::x86_64::sse2::memchr::One(0)].Field[crate::arch::generic::memchr::One::s1]", "value", "dfc-generated"]
+      - ["repo:https://github.com/BurntSushi/memchr:memchr", "<crate::arch::x86_64::sse2::memchr::OneIter as crate::iter::traits::iterator::Iterator>::next", "Argument[self].Field[crate::arch::x86_64::sse2::memchr::OneIter::it].Field[crate::arch::generic::memchr::Iter::start]", "ReturnValue", "value", "dfc-generated"]
+      - ["repo:https://github.com/BurntSushi/memchr:memchr", "<crate::arch::x86_64::sse2::memchr::Three>::find", "Argument[0]", "ReturnValue", "taint", "df-generated"]
+      - ["repo:https://github.com/BurntSushi/memchr:memchr", "<crate::arch::x86_64::sse2::memchr::Three>::find_raw", "Argument[0]", "ReturnValue.Field[crate::option::Option::Some(0)]", "value", "dfc-generated"]
+      - ["repo:https://github.com/BurntSushi/memchr:memchr", "<crate::arch::x86_64::sse2::memchr::Three>::iter", "Argument[self]", "ReturnValue.Field[crate::arch::x86_64::sse2::memchr::ThreeIter::searcher]", "value", "dfc-generated"]
+      - ["repo:https://github.com/BurntSushi/memchr:memchr", "<crate::arch::x86_64::sse2::memchr::Three>::new_unchecked", "Argument[0]", "ReturnValue.Field[crate::arch::x86_64::sse2::memchr::Three(0)].Field[crate::arch::generic::memchr::Three::s1]", "value", "dfc-generated"]
+      - ["repo:https://github.com/BurntSushi/memchr:memchr", "<crate::arch::x86_64::sse2::memchr::Three>::new_unchecked", "Argument[1]", "ReturnValue.Field[crate::arch::x86_64::sse2::memchr::Three(0)].Field[crate::arch::generic::memchr::Three::s2]", "value", "dfc-generated"]
+      - ["repo:https://github.com/BurntSushi/memchr:memchr", "<crate::arch::x86_64::sse2::memchr::Three>::new_unchecked", "Argument[2]", "ReturnValue.Field[crate::arch::x86_64::sse2::memchr::Three(0)].Field[crate::arch::generic::memchr::Three::s3]", "value", "dfc-generated"]
+      - ["repo:https://github.com/BurntSushi/memchr:memchr", "<crate::arch::x86_64::sse2::memchr::ThreeIter as crate::iter::traits::iterator::Iterator>::next", "Argument[self].Field[crate::arch::x86_64::sse2::memchr::ThreeIter::it].Field[crate::arch::generic::memchr::Iter::start]", "ReturnValue", "value", "dfc-generated"]
+      - ["repo:https://github.com/BurntSushi/memchr:memchr", "<crate::arch::x86_64::sse2::memchr::Two>::find", "Argument[0]", "ReturnValue", "taint", "df-generated"]
+      - ["repo:https://github.com/BurntSushi/memchr:memchr", "<crate::arch::x86_64::sse2::memchr::Two>::find_raw", "Argument[0]", "ReturnValue.Field[crate::option::Option::Some(0)]", "value", "dfc-generated"]
+      - ["repo:https://github.com/BurntSushi/memchr:memchr", "<crate::arch::x86_64::sse2::memchr::Two>::iter", "Argument[self]", "ReturnValue.Field[crate::arch::x86_64::sse2::memchr::TwoIter::searcher]", "value", "dfc-generated"]
+      - ["repo:https://github.com/BurntSushi/memchr:memchr", "<crate::arch::x86_64::sse2::memchr::Two>::new_unchecked", "Argument[0]", "ReturnValue.Field[crate::arch::x86_64::sse2::memchr::Two(0)].Field[crate::arch::generic::memchr::Two::s1]", "value", "dfc-generated"]
+      - ["repo:https://github.com/BurntSushi/memchr:memchr", "<crate::arch::x86_64::sse2::memchr::Two>::new_unchecked", "Argument[1]", "ReturnValue.Field[crate::arch::x86_64::sse2::memchr::Two(0)].Field[crate::arch::generic::memchr::Two::s2]", "value", "dfc-generated"]
+      - ["repo:https://github.com/BurntSushi/memchr:memchr", "<crate::arch::x86_64::sse2::memchr::TwoIter as crate::iter::traits::iterator::Iterator>::next", "Argument[self].Field[crate::arch::x86_64::sse2::memchr::TwoIter::it].Field[crate::arch::generic::memchr::Iter::start]", "ReturnValue", "value", "dfc-generated"]
+      - ["repo:https://github.com/BurntSushi/memchr:memchr", "<crate::arch::x86_64::sse2::packedpair::Finder>::min_haystack_len", "Argument[self].Field[0].Field[crate::arch::generic::packedpair::Finder::min_haystack_len]", "ReturnValue", "value", "dfc-generated"]
+      - ["repo:https://github.com/BurntSushi/memchr:memchr", "<crate::arch::x86_64::sse2::packedpair::Finder>::min_haystack_len", "Argument[self].Field[crate::arch::x86_64::sse2::packedpair::Finder(0)].Field[crate::arch::generic::packedpair::Finder::min_haystack_len]", "ReturnValue", "value", "dfc-generated"]
+      - ["repo:https://github.com/BurntSushi/memchr:memchr", "<crate::arch::x86_64::sse2::packedpair::Finder>::pair", "Argument[self].Field[0].Field[crate::arch::generic::packedpair::Finder::pair]", "ReturnValue.Reference", "value", "dfc-generated"]
+      - ["repo:https://github.com/BurntSushi/memchr:memchr", "<crate::arch::x86_64::sse2::packedpair::Finder>::pair", "Argument[self].Field[crate::arch::x86_64::sse2::packedpair::Finder(0)].Field[crate::arch::generic::packedpair::Finder::pair]", "ReturnValue.Reference", "value", "dfc-generated"]
       - ["repo:https://github.com/BurntSushi/memchr:memchr", "<crate::cow::CowBytes>::into_owned", "Argument[self].Field[0].Field[crate::cow::Imp::Owned(0)]", "ReturnValue.Field[crate::cow::CowBytes(0)].Field[crate::cow::Imp::Owned(0)]", "value", "dfc-generated"]
       - ["repo:https://github.com/BurntSushi/memchr:memchr", "<crate::cow::CowBytes>::into_owned", "Argument[self].Field[crate::cow::CowBytes(0)].Field[crate::cow::Imp::Owned(0)]", "ReturnValue.Field[crate::cow::CowBytes(0)].Field[crate::cow::Imp::Owned(0)]", "value", "dfc-generated"]
       - ["repo:https://github.com/BurntSushi/memchr:memchr", "<crate::memchr::Memchr2>::new", "Argument[0]", "ReturnValue.Field[crate::memchr::Memchr2::needle1]", "value", "dfc-generated"]
@@ -92,31 +122,26 @@ extensions:
       - ["repo:https://github.com/BurntSushi/memchr:memchr", "<crate::memchr::Memchr3>::new", "Argument[2]", "ReturnValue.Field[crate::memchr::Memchr3::needle3]", "value", "dfc-generated"]
       - ["repo:https://github.com/BurntSushi/memchr:memchr", "<crate::memchr::Memchr>::new", "Argument[0]", "ReturnValue.Field[crate::memchr::Memchr::needle1]", "value", "dfc-generated"]
       - ["repo:https://github.com/BurntSushi/memchr:memchr", "<crate::memmem::FindIter as crate::iter::traits::iterator::Iterator>::next", "Argument[self]", "ReturnValue", "taint", "df-generated"]
-      - ["repo:https://github.com/BurntSushi/memchr:memchr", "<crate::memmem::FindIter>::into_owned", "Argument[self]", "ReturnValue", "taint", "df-generated"]
+      - ["repo:https://github.com/BurntSushi/memchr:memchr", "<crate::memmem::FindIter>::into_owned", "Argument[self].Field[crate::memmem::FindIter::haystack]", "ReturnValue.Field[crate::memmem::FindIter::haystack]", "value", "dfc-generated"]
+      - ["repo:https://github.com/BurntSushi/memchr:memchr", "<crate::memmem::FindIter>::into_owned", "Argument[self].Field[crate::memmem::FindIter::pos]", "ReturnValue.Field[crate::memmem::FindIter::pos]", "value", "dfc-generated"]
+      - ["repo:https://github.com/BurntSushi/memchr:memchr", "<crate::memmem::FindIter>::into_owned", "Argument[self].Field[crate::memmem::FindIter::prestate]", "ReturnValue.Field[crate::memmem::FindIter::prestate]", "value", "dfc-generated"]
       - ["repo:https://github.com/BurntSushi/memchr:memchr", "<crate::memmem::FindIter>::new", "Argument[0]", "ReturnValue.Field[crate::memmem::FindIter::haystack]", "value", "dfc-generated"]
       - ["repo:https://github.com/BurntSushi/memchr:memchr", "<crate::memmem::FindIter>::new", "Argument[1]", "ReturnValue.Field[crate::memmem::FindIter::finder]", "value", "dfc-generated"]
-      - ["repo:https://github.com/BurntSushi/memchr:memchr", "<crate::memmem::FindRevIter>::into_owned", "Argument[self].Field[crate::memmem::FindRevIter::finder].Field[crate::memmem::FinderRev::searcher]", "ReturnValue.Field[crate::memmem::FindRevIter::finder].Field[crate::memmem::FinderRev::searcher]", "value", "dfc-generated"]
       - ["repo:https://github.com/BurntSushi/memchr:memchr", "<crate::memmem::FindRevIter>::into_owned", "Argument[self].Field[crate::memmem::FindRevIter::haystack]", "ReturnValue.Field[crate::memmem::FindRevIter::haystack]", "value", "dfc-generated"]
       - ["repo:https://github.com/BurntSushi/memchr:memchr", "<crate::memmem::FindRevIter>::into_owned", "Argument[self].Field[crate::memmem::FindRevIter::pos]", "ReturnValue.Field[crate::memmem::FindRevIter::pos]", "value", "dfc-generated"]
       - ["repo:https://github.com/BurntSushi/memchr:memchr", "<crate::memmem::FindRevIter>::new", "Argument[0]", "ReturnValue.Field[crate::memmem::FindRevIter::haystack]", "value", "dfc-generated"]
       - ["repo:https://github.com/BurntSushi/memchr:memchr", "<crate::memmem::FindRevIter>::new", "Argument[1]", "ReturnValue.Field[crate::memmem::FindRevIter::finder]", "value", "dfc-generated"]
       - ["repo:https://github.com/BurntSushi/memchr:memchr", "<crate::memmem::Finder>::as_ref", "Argument[self].Field[crate::memmem::Finder::searcher].Reference", "ReturnValue.Field[crate::memmem::Finder::searcher]", "value", "dfc-generated"]
-      - ["repo:https://github.com/BurntSushi/memchr:memchr", "<crate::memmem::Finder>::as_ref", "Argument[self].Field[crate::memmem::Finder::searcher]", "ReturnValue.Field[crate::memmem::Finder::searcher]", "value", "dfc-generated"]
       - ["repo:https://github.com/BurntSushi/memchr:memchr", "<crate::memmem::Finder>::find_iter", "Argument[0]", "ReturnValue.Field[crate::memmem::FindIter::haystack]", "value", "dfc-generated"]
       - ["repo:https://github.com/BurntSushi/memchr:memchr", "<crate::memmem::Finder>::find_iter", "Argument[self].Field[crate::memmem::Finder::searcher].Reference", "ReturnValue.Field[crate::memmem::FindIter::finder].Field[crate::memmem::Finder::searcher]", "value", "dfc-generated"]
-      - ["repo:https://github.com/BurntSushi/memchr:memchr", "<crate::memmem::Finder>::find_iter", "Argument[self].Field[crate::memmem::Finder::searcher]", "ReturnValue.Field[crate::memmem::FindIter::finder].Field[crate::memmem::Finder::searcher]", "value", "dfc-generated"]
       - ["repo:https://github.com/BurntSushi/memchr:memchr", "<crate::memmem::Finder>::into_owned", "Argument[self].Field[crate::memmem::Finder::searcher].Reference", "ReturnValue.Field[crate::memmem::Finder::searcher]", "value", "dfc-generated"]
-      - ["repo:https://github.com/BurntSushi/memchr:memchr", "<crate::memmem::Finder>::into_owned", "Argument[self].Field[crate::memmem::Finder::searcher]", "ReturnValue.Field[crate::memmem::Finder::searcher]", "value", "dfc-generated"]
       - ["repo:https://github.com/BurntSushi/memchr:memchr", "<crate::memmem::FinderBuilder>::prefilter", "Argument[0]", "Argument[self].Field[crate::memmem::FinderBuilder::prefilter]", "value", "dfc-generated"]
       - ["repo:https://github.com/BurntSushi/memchr:memchr", "<crate::memmem::FinderBuilder>::prefilter", "Argument[0]", "ReturnValue.Field[crate::memmem::FinderBuilder::prefilter]", "value", "dfc-generated"]
       - ["repo:https://github.com/BurntSushi/memchr:memchr", "<crate::memmem::FinderBuilder>::prefilter", "Argument[self]", "ReturnValue", "value", "dfc-generated"]
       - ["repo:https://github.com/BurntSushi/memchr:memchr", "<crate::memmem::FinderRev>::as_ref", "Argument[self].Field[crate::memmem::FinderRev::searcher].Reference", "ReturnValue.Field[crate::memmem::FinderRev::searcher]", "value", "dfc-generated"]
-      - ["repo:https://github.com/BurntSushi/memchr:memchr", "<crate::memmem::FinderRev>::as_ref", "Argument[self].Field[crate::memmem::FinderRev::searcher]", "ReturnValue.Field[crate::memmem::FinderRev::searcher]", "value", "dfc-generated"]
       - ["repo:https://github.com/BurntSushi/memchr:memchr", "<crate::memmem::FinderRev>::into_owned", "Argument[self].Field[crate::memmem::FinderRev::searcher].Reference", "ReturnValue.Field[crate::memmem::FinderRev::searcher]", "value", "dfc-generated"]
-      - ["repo:https://github.com/BurntSushi/memchr:memchr", "<crate::memmem::FinderRev>::into_owned", "Argument[self].Field[crate::memmem::FinderRev::searcher]", "ReturnValue.Field[crate::memmem::FinderRev::searcher]", "value", "dfc-generated"]
       - ["repo:https://github.com/BurntSushi/memchr:memchr", "<crate::memmem::FinderRev>::rfind_iter", "Argument[0]", "ReturnValue.Field[crate::memmem::FindRevIter::haystack]", "value", "dfc-generated"]
       - ["repo:https://github.com/BurntSushi/memchr:memchr", "<crate::memmem::FinderRev>::rfind_iter", "Argument[self].Field[crate::memmem::FinderRev::searcher].Reference", "ReturnValue.Field[crate::memmem::FindRevIter::finder].Field[crate::memmem::FinderRev::searcher]", "value", "dfc-generated"]
-      - ["repo:https://github.com/BurntSushi/memchr:memchr", "<crate::memmem::FinderRev>::rfind_iter", "Argument[self].Field[crate::memmem::FinderRev::searcher]", "ReturnValue.Field[crate::memmem::FindRevIter::finder].Field[crate::memmem::FinderRev::searcher]", "value", "dfc-generated"]
       - ["repo:https://github.com/BurntSushi/memchr:memchr", "<crate::memmem::searcher::Searcher>::find", "Argument[0]", "Argument[self]", "taint", "df-generated"]
       - ["repo:https://github.com/BurntSushi/memchr:memchr", "<crate::memmem::searcher::Searcher>::find", "Argument[1]", "Argument[self]", "taint", "df-generated"]
       - ["repo:https://github.com/BurntSushi/memchr:memchr", "<crate::memmem::searcher::Searcher>::find", "Argument[2]", "Argument[self]", "taint", "df-generated"]
@@ -132,12 +157,6 @@ extensions:
       - ["repo:https://github.com/BurntSushi/memchr:memchr", "<crate::vector::SensibleMoveMask as crate::vector::MoveMask>::clear_least_significant_bit", "Argument[self]", "ReturnValue", "taint", "df-generated"]
       - ["repo:https://github.com/BurntSushi/memchr:memchr", "<crate::vector::SensibleMoveMask as crate::vector::MoveMask>::or", "Argument[0]", "ReturnValue", "taint", "df-generated"]
       - ["repo:https://github.com/BurntSushi/memchr:memchr", "<crate::vector::SensibleMoveMask as crate::vector::MoveMask>::or", "Argument[self]", "ReturnValue", "taint", "df-generated"]
-      - ["repo:https://github.com/BurntSushi/memchr:memchr", "<crate::vector::aarch64neon::NeonMoveMask as crate::vector::MoveMask>::all_zeros_except_least_significant", "Argument[0]", "ReturnValue", "taint", "df-generated"]
-      - ["repo:https://github.com/BurntSushi/memchr:memchr", "<crate::vector::aarch64neon::NeonMoveMask as crate::vector::MoveMask>::and", "Argument[0]", "ReturnValue", "taint", "df-generated"]
-      - ["repo:https://github.com/BurntSushi/memchr:memchr", "<crate::vector::aarch64neon::NeonMoveMask as crate::vector::MoveMask>::and", "Argument[self]", "ReturnValue", "taint", "df-generated"]
-      - ["repo:https://github.com/BurntSushi/memchr:memchr", "<crate::vector::aarch64neon::NeonMoveMask as crate::vector::MoveMask>::clear_least_significant_bit", "Argument[self]", "ReturnValue", "taint", "df-generated"]
-      - ["repo:https://github.com/BurntSushi/memchr:memchr", "<crate::vector::aarch64neon::NeonMoveMask as crate::vector::MoveMask>::or", "Argument[0]", "ReturnValue", "taint", "df-generated"]
-      - ["repo:https://github.com/BurntSushi/memchr:memchr", "<crate::vector::aarch64neon::NeonMoveMask as crate::vector::MoveMask>::or", "Argument[self]", "ReturnValue", "taint", "df-generated"]
       - ["repo:https://github.com/BurntSushi/memchr:memchr", "<u8 as crate::ext::Byte>::to_char", "Argument[self]", "ReturnValue", "taint", "df-generated"]
       - ["repo:https://github.com/BurntSushi/memchr:memchr", "crate::arch::generic::memchr::count_byte_by_byte", "Argument[0].Reference", "Argument[2].Parameter[0]", "value", "dfc-generated"]
       - ["repo:https://github.com/BurntSushi/memchr:memchr", "crate::arch::generic::memchr::fwd_byte_by_byte", "Argument[0].Reference", "Argument[2].Parameter[0]", "value", "dfc-generated"]
@@ -166,3 +185,7 @@ extensions:
     data:
       - ["repo:https://github.com/BurntSushi/memchr:memchr", "<crate::arch::generic::packedpair::Finder>::find", "Argument[self]", "log-injection", "df-generated"]
       - ["repo:https://github.com/BurntSushi/memchr:memchr", "<crate::arch::generic::packedpair::Finder>::find_prefilter", "Argument[self]", "log-injection", "df-generated"]
+      - ["repo:https://github.com/BurntSushi/memchr:memchr", "<crate::arch::x86_64::avx2::packedpair::Finder>::find", "Argument[self]", "log-injection", "df-generated"]
+      - ["repo:https://github.com/BurntSushi/memchr:memchr", "<crate::arch::x86_64::avx2::packedpair::Finder>::find_prefilter", "Argument[self]", "log-injection", "df-generated"]
+      - ["repo:https://github.com/BurntSushi/memchr:memchr", "<crate::arch::x86_64::sse2::packedpair::Finder>::find", "Argument[self]", "log-injection", "df-generated"]
+      - ["repo:https://github.com/BurntSushi/memchr:memchr", "<crate::arch::x86_64::sse2::packedpair::Finder>::find_prefilter", "Argument[self]", "log-injection", "df-generated"]
diff --git a/rust/ql/lib/ext/generated/once_cell/repo-https-github.com-matklad-once_cell-once_cell.model.yml b/rust/ql/lib/ext/generated/once_cell/repo-https-github.com-matklad-once_cell-once_cell.model.yml
index deaaf890d15..e25f5920a01 100644
--- a/rust/ql/lib/ext/generated/once_cell/repo-https-github.com-matklad-once_cell-once_cell.model.yml
+++ b/rust/ql/lib/ext/generated/once_cell/repo-https-github.com-matklad-once_cell-once_cell.model.yml
@@ -18,4 +18,3 @@ extensions:
       - ["repo:https://github.com/matklad/once_cell:once_cell", "<crate::unsync::OnceCell>::get_or_try_init", "Argument[0].ReturnValue", "ReturnValue", "value", "dfc-generated"]
       - ["repo:https://github.com/matklad/once_cell:once_cell", "<crate::unsync::OnceCell>::set", "Argument[0]", "ReturnValue.Field[crate::result::Result::Err(0)]", "value", "dfc-generated"]
       - ["repo:https://github.com/matklad/once_cell:once_cell", "<crate::unsync::OnceCell>::try_insert", "Argument[0]", "ReturnValue.Field[crate::result::Result::Err(0)].Field[1]", "value", "dfc-generated"]
-      - ["repo:https://github.com/matklad/once_cell:once_cell", "<crate::unsync::OnceCell>::try_insert", "Argument[0]", "ReturnValue.Field[crate::result::Result::Ok(0)].Reference", "value", "dfc-generated"]
diff --git a/rust/ql/lib/ext/generated/rand/repo-https-github.com-rust-random-rand-rand.model.yml b/rust/ql/lib/ext/generated/rand/repo-https-github.com-rust-random-rand-rand.model.yml
index 682e2545713..c55a8de83f5 100644
--- a/rust/ql/lib/ext/generated/rand/repo-https-github.com-rust-random-rand-rand.model.yml
+++ b/rust/ql/lib/ext/generated/rand/repo-https-github.com-rust-random-rand-rand.model.yml
@@ -24,11 +24,14 @@ extensions:
       - ["repo:https://github.com/rust-random/rand:rand", "<crate::distr::weighted::weighted_index::WeightedIndex>::weights", "Argument[self]", "ReturnValue.Field[crate::distr::weighted::weighted_index::WeightedIndexIter::weighted_index]", "value", "dfc-generated"]
       - ["repo:https://github.com/rust-random/rand:rand", "<crate::distr::weighted::weighted_index::WeightedIndexIter as crate::clone::Clone>::clone", "Argument[self].Field[crate::distr::weighted::weighted_index::WeightedIndexIter::index]", "ReturnValue.Field[crate::distr::weighted::weighted_index::WeightedIndexIter::index]", "value", "dfc-generated"]
       - ["repo:https://github.com/rust-random/rand:rand", "<crate::distr::weighted::weighted_index::WeightedIndexIter as crate::clone::Clone>::clone", "Argument[self].Field[crate::distr::weighted::weighted_index::WeightedIndexIter::weighted_index]", "ReturnValue.Field[crate::distr::weighted::weighted_index::WeightedIndexIter::weighted_index]", "value", "dfc-generated"]
+      - ["repo:https://github.com/rust-random/rand:rand", "<crate::distr::weighted::weighted_index::WeightedIndexIter as crate::iter::traits::iterator::Iterator>::next", "Argument[self].Field[crate::distr::weighted::weighted_index::WeightedIndexIter::weighted_index].Field[crate::distr::weighted::weighted_index::WeightedIndex::total_weight]", "ReturnValue.Field[crate::option::Option::Some(0)]", "value", "dfc-generated"]
       - ["repo:https://github.com/rust-random/rand:rand", "<crate::rngs::mock::StepRng as crate::RngCore>::next_u32", "Argument[self]", "ReturnValue", "taint", "df-generated"]
       - ["repo:https://github.com/rust-random/rand:rand", "<crate::rngs::mock::StepRng as crate::RngCore>::next_u64", "Argument[self].Field[crate::rngs::mock::StepRng::v]", "ReturnValue", "value", "dfc-generated"]
       - ["repo:https://github.com/rust-random/rand:rand", "<crate::rngs::mock::StepRng>::new", "Argument[0]", "ReturnValue.Field[crate::rngs::mock::StepRng::v]", "value", "dfc-generated"]
       - ["repo:https://github.com/rust-random/rand:rand", "<crate::rngs::mock::StepRng>::new", "Argument[1]", "ReturnValue.Field[crate::rngs::mock::StepRng::a]", "value", "dfc-generated"]
       - ["repo:https://github.com/rust-random/rand:rand", "<crate::rngs::reseeding::ReseedingCore as crate::clone::Clone>::clone", "Argument[self]", "ReturnValue", "taint", "df-generated"]
+      - ["repo:https://github.com/rust-random/rand:rand", "<crate::rngs::reseeding::ReseedingRng as crate::clone::Clone>::clone", "Argument[self].Field[0].Field[crate::block::BlockRng::core]", "ReturnValue.Field[crate::rngs::reseeding::ReseedingRng(0)].Field[crate::block::BlockRng::core]", "value", "dfc-generated"]
+      - ["repo:https://github.com/rust-random/rand:rand", "<crate::rngs::reseeding::ReseedingRng as crate::clone::Clone>::clone", "Argument[self].Field[crate::rngs::reseeding::ReseedingRng(0)].Field[crate::block::BlockRng::core]", "ReturnValue.Field[crate::rngs::reseeding::ReseedingRng(0)].Field[crate::block::BlockRng::core]", "value", "dfc-generated"]
       - ["repo:https://github.com/rust-random/rand:rand", "<crate::rngs::reseeding::ReseedingRng>::new", "Argument[1]", "ReturnValue.Field[crate::rngs::reseeding::ReseedingCore::reseeder]", "value", "dfc-generated"]
       - ["repo:https://github.com/rust-random/rand:rand", "<crate::seq::coin_flipper::CoinFlipper>::new", "Argument[0]", "ReturnValue.Field[crate::seq::coin_flipper::CoinFlipper::rng]", "value", "dfc-generated"]
       - ["repo:https://github.com/rust-random/rand:rand", "<crate::seq::increasing_uniform::IncreasingUniform>::new", "Argument[0]", "ReturnValue.Field[crate::seq::increasing_uniform::IncreasingUniform::rng]", "value", "dfc-generated"]
diff --git a/rust/ql/lib/ext/generated/rand/repo-https-github.com-rust-random-rand-rand_chacha.model.yml b/rust/ql/lib/ext/generated/rand/repo-https-github.com-rust-random-rand-rand_chacha.model.yml
index 456b8c7e3e7..f06b9cd4c78 100644
--- a/rust/ql/lib/ext/generated/rand/repo-https-github.com-rust-random-rand-rand_chacha.model.yml
+++ b/rust/ql/lib/ext/generated/rand/repo-https-github.com-rust-random-rand-rand_chacha.model.yml
@@ -9,8 +9,20 @@ extensions:
       - ["repo:https://github.com/rust-random/rand:rand_chacha", "<crate::chacha::Array64 as crate::convert::AsRef>::as_ref", "Argument[self].Field[0]", "ReturnValue.Reference", "value", "dfc-generated"]
       - ["repo:https://github.com/rust-random/rand:rand_chacha", "<crate::chacha::Array64 as crate::convert::AsRef>::as_ref", "Argument[self].Field[crate::chacha::Array64(0)]", "ReturnValue.Reference", "value", "dfc-generated"]
       - ["repo:https://github.com/rust-random/rand:rand_chacha", "<crate::chacha::ChaCha12Rng as crate::convert::From>::from", "Argument[0]", "ReturnValue.Field[crate::chacha::ChaCha12Rng::rng].Field[crate::block::BlockRng::core]", "value", "dfc-generated"]
+      - ["repo:https://github.com/rust-random/rand:rand_chacha", "<crate::chacha::ChaCha12Rng as crate::convert::From>::from", "Argument[0]", "ReturnValue", "taint", "df-generated"]
+      - ["repo:https://github.com/rust-random/rand:rand_chacha", "<crate::chacha::ChaCha12Rng>::get_word_pos", "Argument[self]", "ReturnValue", "taint", "df-generated"]
+      - ["repo:https://github.com/rust-random/rand:rand_chacha", "<crate::chacha::ChaCha12Rng>::set_word_pos", "Argument[0]", "Argument[self]", "taint", "df-generated"]
       - ["repo:https://github.com/rust-random/rand:rand_chacha", "<crate::chacha::ChaCha20Rng as crate::convert::From>::from", "Argument[0]", "ReturnValue.Field[crate::chacha::ChaCha20Rng::rng].Field[crate::block::BlockRng::core]", "value", "dfc-generated"]
+      - ["repo:https://github.com/rust-random/rand:rand_chacha", "<crate::chacha::ChaCha20Rng as crate::convert::From>::from", "Argument[0]", "ReturnValue", "taint", "df-generated"]
+      - ["repo:https://github.com/rust-random/rand:rand_chacha", "<crate::chacha::ChaCha20Rng>::get_word_pos", "Argument[self]", "ReturnValue", "taint", "df-generated"]
+      - ["repo:https://github.com/rust-random/rand:rand_chacha", "<crate::chacha::ChaCha20Rng>::set_word_pos", "Argument[0]", "Argument[self]", "taint", "df-generated"]
       - ["repo:https://github.com/rust-random/rand:rand_chacha", "<crate::chacha::ChaCha8Rng as crate::convert::From>::from", "Argument[0]", "ReturnValue.Field[crate::chacha::ChaCha8Rng::rng].Field[crate::block::BlockRng::core]", "value", "dfc-generated"]
+      - ["repo:https://github.com/rust-random/rand:rand_chacha", "<crate::chacha::ChaCha8Rng as crate::convert::From>::from", "Argument[0]", "ReturnValue", "taint", "df-generated"]
+      - ["repo:https://github.com/rust-random/rand:rand_chacha", "<crate::chacha::ChaCha8Rng>::get_word_pos", "Argument[self]", "ReturnValue", "taint", "df-generated"]
+      - ["repo:https://github.com/rust-random/rand:rand_chacha", "<crate::chacha::ChaCha8Rng>::set_word_pos", "Argument[0]", "Argument[self]", "taint", "df-generated"]
+      - ["repo:https://github.com/rust-random/rand:rand_chacha", "<crate::chacha::abstract12::ChaCha12Rng as crate::convert::From>::from", "Argument[0]", "ReturnValue", "taint", "df-generated"]
+      - ["repo:https://github.com/rust-random/rand:rand_chacha", "<crate::chacha::abstract20::ChaCha20Rng as crate::convert::From>::from", "Argument[0]", "ReturnValue", "taint", "df-generated"]
+      - ["repo:https://github.com/rust-random/rand:rand_chacha", "<crate::chacha::abstract8::ChaCha8Rng as crate::convert::From>::from", "Argument[0]", "ReturnValue", "taint", "df-generated"]
       - ["repo:https://github.com/rust-random/rand:rand_chacha", "crate::guts::diagonalize", "Argument[0]", "ReturnValue", "value", "dfc-generated"]
       - ["repo:https://github.com/rust-random/rand:rand_chacha", "crate::guts::round", "Argument[0]", "ReturnValue", "value", "dfc-generated"]
       - ["repo:https://github.com/rust-random/rand:rand_chacha", "crate::guts::undiagonalize", "Argument[0]", "ReturnValue", "value", "dfc-generated"]
diff --git a/rust/ql/lib/ext/generated/reqwest/repo-https-github.com-seanmonstar-reqwest-reqwest.model.yml b/rust/ql/lib/ext/generated/reqwest/repo-https-github.com-seanmonstar-reqwest-reqwest.model.yml
index 7355d362c71..274a3fbb189 100644
--- a/rust/ql/lib/ext/generated/reqwest/repo-https-github.com-seanmonstar-reqwest-reqwest.model.yml
+++ b/rust/ql/lib/ext/generated/reqwest/repo-https-github.com-seanmonstar-reqwest-reqwest.model.yml
@@ -66,15 +66,19 @@ extensions:
       - ["repo:https://github.com/seanmonstar/reqwest:reqwest", "<crate::async_impl::client::ClientBuilder>::http2_max_frame_size", "Argument[self]", "ReturnValue", "value", "dfc-generated"]
       - ["repo:https://github.com/seanmonstar/reqwest:reqwest", "<crate::async_impl::client::ClientBuilder>::http2_max_header_list_size", "Argument[self]", "ReturnValue", "value", "dfc-generated"]
       - ["repo:https://github.com/seanmonstar/reqwest:reqwest", "<crate::async_impl::client::ClientBuilder>::http2_prior_knowledge", "Argument[self]", "ReturnValue", "value", "dfc-generated"]
+      - ["repo:https://github.com/seanmonstar/reqwest:reqwest", "<crate::async_impl::client::ClientBuilder>::http3_congestion_bbr", "Argument[self]", "ReturnValue", "value", "dfc-generated"]
       - ["repo:https://github.com/seanmonstar/reqwest:reqwest", "<crate::async_impl::client::ClientBuilder>::http3_conn_receive_window", "Argument[self]", "ReturnValue", "value", "dfc-generated"]
+      - ["repo:https://github.com/seanmonstar/reqwest:reqwest", "<crate::async_impl::client::ClientBuilder>::http3_max_field_section_size", "Argument[self]", "ReturnValue", "value", "dfc-generated"]
       - ["repo:https://github.com/seanmonstar/reqwest:reqwest", "<crate::async_impl::client::ClientBuilder>::http3_max_idle_timeout", "Argument[self]", "ReturnValue", "value", "dfc-generated"]
       - ["repo:https://github.com/seanmonstar/reqwest:reqwest", "<crate::async_impl::client::ClientBuilder>::http3_prior_knowledge", "Argument[self]", "ReturnValue", "value", "dfc-generated"]
+      - ["repo:https://github.com/seanmonstar/reqwest:reqwest", "<crate::async_impl::client::ClientBuilder>::http3_send_grease", "Argument[self]", "ReturnValue", "value", "dfc-generated"]
       - ["repo:https://github.com/seanmonstar/reqwest:reqwest", "<crate::async_impl::client::ClientBuilder>::http3_send_window", "Argument[self]", "ReturnValue", "value", "dfc-generated"]
       - ["repo:https://github.com/seanmonstar/reqwest:reqwest", "<crate::async_impl::client::ClientBuilder>::http3_stream_receive_window", "Argument[self]", "ReturnValue", "value", "dfc-generated"]
       - ["repo:https://github.com/seanmonstar/reqwest:reqwest", "<crate::async_impl::client::ClientBuilder>::https_only", "Argument[0]", "Argument[self].Field[crate::async_impl::client::ClientBuilder::config].Field[crate::async_impl::client::Config::https_only]", "value", "dfc-generated"]
       - ["repo:https://github.com/seanmonstar/reqwest:reqwest", "<crate::async_impl::client::ClientBuilder>::https_only", "Argument[0]", "ReturnValue.Field[crate::async_impl::client::ClientBuilder::config].Field[crate::async_impl::client::Config::https_only]", "value", "dfc-generated"]
       - ["repo:https://github.com/seanmonstar/reqwest:reqwest", "<crate::async_impl::client::ClientBuilder>::https_only", "Argument[self]", "ReturnValue", "value", "dfc-generated"]
       - ["repo:https://github.com/seanmonstar/reqwest:reqwest", "<crate::async_impl::client::ClientBuilder>::identity", "Argument[self]", "ReturnValue", "value", "dfc-generated"]
+      - ["repo:https://github.com/seanmonstar/reqwest:reqwest", "<crate::async_impl::client::ClientBuilder>::interface", "Argument[self]", "ReturnValue", "value", "dfc-generated"]
       - ["repo:https://github.com/seanmonstar/reqwest:reqwest", "<crate::async_impl::client::ClientBuilder>::local_address", "Argument[self]", "ReturnValue", "value", "dfc-generated"]
       - ["repo:https://github.com/seanmonstar/reqwest:reqwest", "<crate::async_impl::client::ClientBuilder>::max_tls_version", "Argument[self]", "ReturnValue", "value", "dfc-generated"]
       - ["repo:https://github.com/seanmonstar/reqwest:reqwest", "<crate::async_impl::client::ClientBuilder>::min_tls_version", "Argument[self]", "ReturnValue", "value", "dfc-generated"]
@@ -94,6 +98,8 @@ extensions:
       - ["repo:https://github.com/seanmonstar/reqwest:reqwest", "<crate::async_impl::client::ClientBuilder>::resolve", "Argument[self]", "ReturnValue", "value", "dfc-generated"]
       - ["repo:https://github.com/seanmonstar/reqwest:reqwest", "<crate::async_impl::client::ClientBuilder>::resolve_to_addrs", "Argument[self]", "ReturnValue", "value", "dfc-generated"]
       - ["repo:https://github.com/seanmonstar/reqwest:reqwest", "<crate::async_impl::client::ClientBuilder>::tcp_keepalive", "Argument[self]", "ReturnValue", "value", "dfc-generated"]
+      - ["repo:https://github.com/seanmonstar/reqwest:reqwest", "<crate::async_impl::client::ClientBuilder>::tcp_keepalive_interval", "Argument[self]", "ReturnValue", "value", "dfc-generated"]
+      - ["repo:https://github.com/seanmonstar/reqwest:reqwest", "<crate::async_impl::client::ClientBuilder>::tcp_keepalive_retries", "Argument[self]", "ReturnValue", "value", "dfc-generated"]
       - ["repo:https://github.com/seanmonstar/reqwest:reqwest", "<crate::async_impl::client::ClientBuilder>::tcp_nodelay", "Argument[0]", "Argument[self].Field[crate::async_impl::client::ClientBuilder::config].Field[crate::async_impl::client::Config::nodelay]", "value", "dfc-generated"]
       - ["repo:https://github.com/seanmonstar/reqwest:reqwest", "<crate::async_impl::client::ClientBuilder>::tcp_nodelay", "Argument[0]", "ReturnValue.Field[crate::async_impl::client::ClientBuilder::config].Field[crate::async_impl::client::Config::nodelay]", "value", "dfc-generated"]
       - ["repo:https://github.com/seanmonstar/reqwest:reqwest", "<crate::async_impl::client::ClientBuilder>::tcp_nodelay", "Argument[self]", "ReturnValue", "value", "dfc-generated"]
@@ -122,16 +128,21 @@ extensions:
       - ["repo:https://github.com/seanmonstar/reqwest:reqwest", "<crate::async_impl::client::ClientBuilder>::use_rustls_tls", "Argument[self]", "ReturnValue", "value", "dfc-generated"]
       - ["repo:https://github.com/seanmonstar/reqwest:reqwest", "<crate::async_impl::client::ClientBuilder>::user_agent", "Argument[self]", "ReturnValue", "value", "dfc-generated"]
       - ["repo:https://github.com/seanmonstar/reqwest:reqwest", "<crate::async_impl::client::ClientBuilder>::zstd", "Argument[self]", "ReturnValue", "value", "dfc-generated"]
+      - ["repo:https://github.com/seanmonstar/reqwest:reqwest", "<crate::async_impl::client::HyperService as crate::Service>::call", "Argument[0]", "ReturnValue.Reference", "value", "dfc-generated"]
+      - ["repo:https://github.com/seanmonstar/reqwest:reqwest", "<crate::async_impl::client::HyperService as crate::Service>::call", "Argument[self].Field[crate::async_impl::client::HyperService::cookie_store].Reference", "ReturnValue.Reference", "value", "dfc-generated"]
+      - ["repo:https://github.com/seanmonstar/reqwest:reqwest", "<crate::async_impl::client::HyperService as crate::Service>::call", "Argument[self].Field[crate::async_impl::client::HyperService::cookie_store]", "ReturnValue.Reference", "value", "dfc-generated"]
       - ["repo:https://github.com/seanmonstar/reqwest:reqwest", "<crate::async_impl::decoder::Decoder>::detect", "Argument[1]", "ReturnValue.Field[crate::async_impl::decoder::Decoder::inner].Field[crate::async_impl::decoder::Inner::PlainText(0)]", "value", "dfc-generated"]
       - ["repo:https://github.com/seanmonstar/reqwest:reqwest", "<crate::async_impl::decoder::Decoder>::into_stream", "Argument[self]", "ReturnValue.Field[crate::async_impl::decoder::IoStream(0)]", "value", "dfc-generated"]
       - ["repo:https://github.com/seanmonstar/reqwest:reqwest", "<crate::async_impl::h3_client::H3Client>::new", "Argument[0]", "ReturnValue.Field[crate::async_impl::h3_client::H3Client::connector]", "value", "dfc-generated"]
+      - ["repo:https://github.com/seanmonstar/reqwest:reqwest", "<crate::async_impl::h3_client::H3Client>::new", "Argument[2]", "ReturnValue.Field[crate::async_impl::h3_client::H3Client::cookie_store]", "value", "dfc-generated"]
       - ["repo:https://github.com/seanmonstar/reqwest:reqwest", "<crate::async_impl::h3_client::connect::H3Connector>::new", "Argument[0]", "ReturnValue.Field[crate::result::Result::Ok(0)].Field[crate::async_impl::h3_client::connect::H3Connector::resolver]", "value", "dfc-generated"]
+      - ["repo:https://github.com/seanmonstar/reqwest:reqwest", "<crate::async_impl::h3_client::connect::H3Connector>::new", "Argument[4]", "ReturnValue.Field[crate::result::Result::Ok(0)].Field[crate::async_impl::h3_client::connect::H3Connector::client_config]", "value", "dfc-generated"]
       - ["repo:https://github.com/seanmonstar/reqwest:reqwest", "<crate::async_impl::h3_client::pool::Pool>::new_connection", "Argument[2]", "ReturnValue.Field[crate::async_impl::h3_client::pool::PoolClient::inner]", "value", "dfc-generated"]
       - ["repo:https://github.com/seanmonstar/reqwest:reqwest", "<crate::async_impl::h3_client::pool::PoolClient>::new", "Argument[0]", "ReturnValue.Field[crate::async_impl::h3_client::pool::PoolClient::inner]", "value", "dfc-generated"]
       - ["repo:https://github.com/seanmonstar/reqwest:reqwest", "<crate::async_impl::h3_client::pool::PoolConnection>::new", "Argument[0]", "ReturnValue.Field[crate::async_impl::h3_client::pool::PoolConnection::client]", "value", "dfc-generated"]
       - ["repo:https://github.com/seanmonstar/reqwest:reqwest", "<crate::async_impl::h3_client::pool::PoolConnection>::new", "Argument[1]", "ReturnValue.Field[crate::async_impl::h3_client::pool::PoolConnection::close_rx]", "value", "dfc-generated"]
       - ["repo:https://github.com/seanmonstar/reqwest:reqwest", "<crate::async_impl::h3_client::pool::PoolConnection>::pool", "Argument[self].Field[crate::async_impl::h3_client::pool::PoolConnection::client].Reference", "ReturnValue", "value", "dfc-generated"]
-      - ["repo:https://github.com/seanmonstar/reqwest:reqwest", "<crate::async_impl::h3_client::pool::PoolConnection>::pool", "Argument[self].Field[crate::async_impl::h3_client::pool::PoolConnection::client]", "ReturnValue", "value", "dfc-generated"]
+      - ["repo:https://github.com/seanmonstar/reqwest:reqwest", "<crate::async_impl::multipart::Form>::boundary", "Argument[self].Field[crate::async_impl::multipart::Form::inner].Field[crate::async_impl::multipart::FormParts::boundary]", "ReturnValue.Reference", "value", "dfc-generated"]
       - ["repo:https://github.com/seanmonstar/reqwest:reqwest", "<crate::async_impl::multipart::FormParts>::boundary", "Argument[self].Field[crate::async_impl::multipart::FormParts::boundary]", "ReturnValue.Reference", "value", "dfc-generated"]
       - ["repo:https://github.com/seanmonstar/reqwest:reqwest", "<crate::async_impl::multipart::FormParts>::part", "Argument[self]", "ReturnValue", "value", "dfc-generated"]
       - ["repo:https://github.com/seanmonstar/reqwest:reqwest", "<crate::async_impl::multipart::FormParts>::percent_encode_attr_chars", "Argument[self]", "ReturnValue", "value", "dfc-generated"]
@@ -149,6 +160,8 @@ extensions:
       - ["repo:https://github.com/seanmonstar/reqwest:reqwest", "<crate::async_impl::multipart::PartMetadata>::mime", "Argument[self]", "ReturnValue", "value", "dfc-generated"]
       - ["repo:https://github.com/seanmonstar/reqwest:reqwest", "<crate::async_impl::request::Request>::body", "Argument[self].Field[crate::async_impl::request::Request::body].Field[crate::option::Option::Some(0)]", "ReturnValue.Field[crate::option::Option::Some(0)].Reference", "value", "dfc-generated"]
       - ["repo:https://github.com/seanmonstar/reqwest:reqwest", "<crate::async_impl::request::Request>::body_mut", "Argument[self].Field[crate::async_impl::request::Request::body]", "ReturnValue.Reference", "value", "dfc-generated"]
+      - ["repo:https://github.com/seanmonstar/reqwest:reqwest", "<crate::async_impl::request::Request>::extensions", "Argument[self].Field[crate::async_impl::request::Request::extensions]", "ReturnValue.Reference", "value", "dfc-generated"]
+      - ["repo:https://github.com/seanmonstar/reqwest:reqwest", "<crate::async_impl::request::Request>::extensions_mut", "Argument[self].Field[crate::async_impl::request::Request::extensions]", "ReturnValue.Reference", "value", "dfc-generated"]
       - ["repo:https://github.com/seanmonstar/reqwest:reqwest", "<crate::async_impl::request::Request>::headers", "Argument[self].Field[crate::async_impl::request::Request::headers]", "ReturnValue.Reference", "value", "dfc-generated"]
       - ["repo:https://github.com/seanmonstar/reqwest:reqwest", "<crate::async_impl::request::Request>::headers_mut", "Argument[self].Field[crate::async_impl::request::Request::headers]", "ReturnValue.Reference", "value", "dfc-generated"]
       - ["repo:https://github.com/seanmonstar/reqwest:reqwest", "<crate::async_impl::request::Request>::method", "Argument[self].Field[crate::async_impl::request::Request::method]", "ReturnValue.Reference", "value", "dfc-generated"]
@@ -156,8 +169,6 @@ extensions:
       - ["repo:https://github.com/seanmonstar/reqwest:reqwest", "<crate::async_impl::request::Request>::new", "Argument[0]", "ReturnValue.Field[crate::async_impl::request::Request::method]", "value", "dfc-generated"]
       - ["repo:https://github.com/seanmonstar/reqwest:reqwest", "<crate::async_impl::request::Request>::new", "Argument[1]", "ReturnValue.Field[crate::async_impl::request::Request::url]", "value", "dfc-generated"]
       - ["repo:https://github.com/seanmonstar/reqwest:reqwest", "<crate::async_impl::request::Request>::pieces", "Argument[self]", "ReturnValue", "taint", "df-generated"]
-      - ["repo:https://github.com/seanmonstar/reqwest:reqwest", "<crate::async_impl::request::Request>::timeout", "Argument[self].Field[crate::async_impl::request::Request::timeout].Field[crate::option::Option::Some(0)]", "ReturnValue.Field[crate::option::Option::Some(0)].Reference", "value", "dfc-generated"]
-      - ["repo:https://github.com/seanmonstar/reqwest:reqwest", "<crate::async_impl::request::Request>::timeout_mut", "Argument[self].Field[crate::async_impl::request::Request::timeout]", "ReturnValue.Reference", "value", "dfc-generated"]
       - ["repo:https://github.com/seanmonstar/reqwest:reqwest", "<crate::async_impl::request::Request>::try_clone", "Argument[self].Field[crate::async_impl::request::Request::method]", "ReturnValue.Field[crate::option::Option::Some(0)].Field[crate::async_impl::request::Request::method]", "value", "dfc-generated"]
       - ["repo:https://github.com/seanmonstar/reqwest:reqwest", "<crate::async_impl::request::Request>::try_clone", "Argument[self].Field[crate::async_impl::request::Request::url]", "ReturnValue.Field[crate::option::Option::Some(0)].Field[crate::async_impl::request::Request::url]", "value", "dfc-generated"]
       - ["repo:https://github.com/seanmonstar/reqwest:reqwest", "<crate::async_impl::request::Request>::url", "Argument[self].Field[crate::async_impl::request::Request::url]", "ReturnValue.Reference", "value", "dfc-generated"]
@@ -184,14 +195,20 @@ extensions:
       - ["repo:https://github.com/seanmonstar/reqwest:reqwest", "<crate::async_impl::request::RequestBuilder>::version", "Argument[self]", "ReturnValue", "value", "dfc-generated"]
       - ["repo:https://github.com/seanmonstar/reqwest:reqwest", "<crate::async_impl::response::Response>::error_for_status", "Argument[self]", "ReturnValue.Field[crate::result::Result::Ok(0)]", "value", "dfc-generated"]
       - ["repo:https://github.com/seanmonstar/reqwest:reqwest", "<crate::async_impl::response::Response>::error_for_status_ref", "Argument[self]", "ReturnValue.Field[crate::result::Result::Ok(0)]", "value", "dfc-generated"]
+      - ["repo:https://github.com/seanmonstar/reqwest:reqwest", "<crate::async_impl::response::Response>::json", "Argument[self]", "ReturnValue", "taint", "df-generated"]
+      - ["repo:https://github.com/seanmonstar/reqwest:reqwest", "<crate::async_impl::response::Response>::new", "Argument[1]", "ReturnValue.Field[crate::async_impl::response::Response::url].Reference", "value", "dfc-generated"]
+      - ["repo:https://github.com/seanmonstar/reqwest:reqwest", "<crate::async_impl::response::Response>::text_with_charset", "Argument[self]", "ReturnValue", "taint", "df-generated"]
       - ["repo:https://github.com/seanmonstar/reqwest:reqwest", "<crate::async_impl::response::Response>::url", "Argument[self].Field[crate::async_impl::response::Response::url]", "ReturnValue.Reference", "value", "dfc-generated"]
       - ["repo:https://github.com/seanmonstar/reqwest:reqwest", "<crate::background_threadpool::BackgroundProcessor>::new", "Argument[0]", "ReturnValue.Field[crate::background_threadpool::BackgroundProcessor::inner]", "value", "dfc-generated"]
       - ["repo:https://github.com/seanmonstar/reqwest:reqwest", "<crate::background_threadpool::BackgroundProcessorLayer as crate::Layer>::layer", "Argument[0]", "ReturnValue.Field[crate::background_threadpool::BackgroundProcessor::inner]", "value", "dfc-generated"]
       - ["repo:https://github.com/seanmonstar/reqwest:reqwest", "<crate::background_threadpool::BackgroundResponseFuture>::new", "Argument[0]", "ReturnValue.Field[crate::background_threadpool::BackgroundResponseFuture::rx]", "value", "dfc-generated"]
       - ["repo:https://github.com/seanmonstar/reqwest:reqwest", "<crate::blocking::body::Body as crate::convert::From>::from", "Argument[0]", "ReturnValue.Field[crate::blocking::body::Body::kind].Field[crate::blocking::body::Kind::Bytes(0)]", "value", "dfc-generated"]
+      - ["repo:https://github.com/seanmonstar/reqwest:reqwest", "<crate::blocking::body::Body as crate::convert::From>::from", "Argument[0]", "ReturnValue", "taint", "df-generated"]
       - ["repo:https://github.com/seanmonstar/reqwest:reqwest", "<crate::blocking::body::Body>::into_async", "Argument[self].Field[crate::blocking::body::Body::kind].Field[crate::blocking::body::Kind::Reader(1)]", "ReturnValue.Field[2]", "value", "dfc-generated"]
       - ["repo:https://github.com/seanmonstar/reqwest:reqwest", "<crate::blocking::body::Body>::into_reader", "Argument[self].Field[crate::blocking::body::Body::kind].Field[crate::blocking::body::Kind::Reader(0)]", "ReturnValue.Field[crate::blocking::body::Reader::Reader(0)]", "value", "dfc-generated"]
       - ["repo:https://github.com/seanmonstar/reqwest:reqwest", "<crate::blocking::body::Body>::len", "Argument[self].Field[crate::blocking::body::Body::kind].Field[crate::blocking::body::Kind::Reader(1)]", "ReturnValue", "value", "dfc-generated"]
+      - ["repo:https://github.com/seanmonstar/reqwest:reqwest", "<crate::blocking::body::Body>::new", "Argument[0]", "ReturnValue", "taint", "df-generated"]
+      - ["repo:https://github.com/seanmonstar/reqwest:reqwest", "<crate::blocking::body::Body>::sized", "Argument[0]", "ReturnValue", "taint", "df-generated"]
       - ["repo:https://github.com/seanmonstar/reqwest:reqwest", "<crate::blocking::body::Reader as crate::io::Read>::read", "Argument[self]", "Argument[0]", "taint", "df-generated"]
       - ["repo:https://github.com/seanmonstar/reqwest:reqwest", "<crate::blocking::client::Client>::delete", "Argument[self].Reference", "ReturnValue.Field[crate::blocking::request::RequestBuilder::client]", "value", "dfc-generated"]
       - ["repo:https://github.com/seanmonstar/reqwest:reqwest", "<crate::blocking::client::Client>::get", "Argument[self].Reference", "ReturnValue.Field[crate::blocking::request::RequestBuilder::client]", "value", "dfc-generated"]
@@ -232,6 +249,7 @@ extensions:
       - ["repo:https://github.com/seanmonstar/reqwest:reqwest", "<crate::blocking::client::ClientBuilder>::http3_prior_knowledge", "Argument[self]", "ReturnValue", "value", "dfc-generated"]
       - ["repo:https://github.com/seanmonstar/reqwest:reqwest", "<crate::blocking::client::ClientBuilder>::https_only", "Argument[self]", "ReturnValue", "value", "dfc-generated"]
       - ["repo:https://github.com/seanmonstar/reqwest:reqwest", "<crate::blocking::client::ClientBuilder>::identity", "Argument[self]", "ReturnValue", "value", "dfc-generated"]
+      - ["repo:https://github.com/seanmonstar/reqwest:reqwest", "<crate::blocking::client::ClientBuilder>::interface", "Argument[self]", "ReturnValue", "value", "dfc-generated"]
       - ["repo:https://github.com/seanmonstar/reqwest:reqwest", "<crate::blocking::client::ClientBuilder>::local_address", "Argument[self]", "ReturnValue", "value", "dfc-generated"]
       - ["repo:https://github.com/seanmonstar/reqwest:reqwest", "<crate::blocking::client::ClientBuilder>::max_tls_version", "Argument[self]", "ReturnValue", "value", "dfc-generated"]
       - ["repo:https://github.com/seanmonstar/reqwest:reqwest", "<crate::blocking::client::ClientBuilder>::min_tls_version", "Argument[self]", "ReturnValue", "value", "dfc-generated"]
@@ -250,6 +268,8 @@ extensions:
       - ["repo:https://github.com/seanmonstar/reqwest:reqwest", "<crate::blocking::client::ClientBuilder>::resolve", "Argument[self]", "ReturnValue", "value", "dfc-generated"]
       - ["repo:https://github.com/seanmonstar/reqwest:reqwest", "<crate::blocking::client::ClientBuilder>::resolve_to_addrs", "Argument[self]", "ReturnValue", "value", "dfc-generated"]
       - ["repo:https://github.com/seanmonstar/reqwest:reqwest", "<crate::blocking::client::ClientBuilder>::tcp_keepalive", "Argument[self]", "ReturnValue", "value", "dfc-generated"]
+      - ["repo:https://github.com/seanmonstar/reqwest:reqwest", "<crate::blocking::client::ClientBuilder>::tcp_keepalive_interval", "Argument[self]", "ReturnValue", "value", "dfc-generated"]
+      - ["repo:https://github.com/seanmonstar/reqwest:reqwest", "<crate::blocking::client::ClientBuilder>::tcp_keepalive_retries", "Argument[self]", "ReturnValue", "value", "dfc-generated"]
       - ["repo:https://github.com/seanmonstar/reqwest:reqwest", "<crate::blocking::client::ClientBuilder>::tcp_nodelay", "Argument[self]", "ReturnValue", "value", "dfc-generated"]
       - ["repo:https://github.com/seanmonstar/reqwest:reqwest", "<crate::blocking::client::ClientBuilder>::timeout", "Argument[self]", "ReturnValue", "value", "dfc-generated"]
       - ["repo:https://github.com/seanmonstar/reqwest:reqwest", "<crate::blocking::client::ClientBuilder>::tls_built_in_native_certs", "Argument[self]", "ReturnValue", "value", "dfc-generated"]
@@ -263,6 +283,7 @@ extensions:
       - ["repo:https://github.com/seanmonstar/reqwest:reqwest", "<crate::blocking::client::ClientBuilder>::use_rustls_tls", "Argument[self]", "ReturnValue", "value", "dfc-generated"]
       - ["repo:https://github.com/seanmonstar/reqwest:reqwest", "<crate::blocking::client::ClientBuilder>::user_agent", "Argument[self]", "ReturnValue", "value", "dfc-generated"]
       - ["repo:https://github.com/seanmonstar/reqwest:reqwest", "<crate::blocking::client::ClientBuilder>::zstd", "Argument[self]", "ReturnValue", "value", "dfc-generated"]
+      - ["repo:https://github.com/seanmonstar/reqwest:reqwest", "<crate::blocking::multipart::Form>::boundary", "Argument[self].Field[crate::blocking::multipart::Form::inner].Field[crate::async_impl::multipart::FormParts::boundary]", "ReturnValue.Reference", "value", "dfc-generated"]
       - ["repo:https://github.com/seanmonstar/reqwest:reqwest", "<crate::blocking::multipart::Form>::into_reader", "Argument[self]", "ReturnValue.Field[crate::blocking::multipart::Reader::form]", "value", "dfc-generated"]
       - ["repo:https://github.com/seanmonstar/reqwest:reqwest", "<crate::blocking::multipart::Form>::reader", "Argument[self]", "ReturnValue.Field[crate::blocking::multipart::Reader::form]", "value", "dfc-generated"]
       - ["repo:https://github.com/seanmonstar/reqwest:reqwest", "<crate::blocking::multipart::Part as crate::async_impl::multipart::PartProps>::metadata", "Argument[self].Field[crate::blocking::multipart::Part::meta]", "ReturnValue.Reference", "value", "dfc-generated"]
@@ -278,7 +299,6 @@ extensions:
       - ["repo:https://github.com/seanmonstar/reqwest:reqwest", "<crate::blocking::request::Request>::method_mut", "Argument[self].Field[crate::blocking::request::Request::inner].Field[crate::async_impl::request::Request::method]", "ReturnValue.Reference", "value", "dfc-generated"]
       - ["repo:https://github.com/seanmonstar/reqwest:reqwest", "<crate::blocking::request::Request>::new", "Argument[0]", "ReturnValue.Field[crate::blocking::request::Request::inner].Field[crate::async_impl::request::Request::method]", "value", "dfc-generated"]
       - ["repo:https://github.com/seanmonstar/reqwest:reqwest", "<crate::blocking::request::Request>::new", "Argument[1]", "ReturnValue.Field[crate::blocking::request::Request::inner].Field[crate::async_impl::request::Request::url]", "value", "dfc-generated"]
-      - ["repo:https://github.com/seanmonstar/reqwest:reqwest", "<crate::blocking::request::Request>::timeout_mut", "Argument[self].Field[crate::blocking::request::Request::inner].Field[crate::async_impl::request::Request::timeout]", "ReturnValue.Reference", "value", "dfc-generated"]
       - ["repo:https://github.com/seanmonstar/reqwest:reqwest", "<crate::blocking::request::Request>::url", "Argument[self].Field[crate::blocking::request::Request::inner].Field[crate::async_impl::request::Request::url]", "ReturnValue.Reference", "value", "dfc-generated"]
       - ["repo:https://github.com/seanmonstar/reqwest:reqwest", "<crate::blocking::request::Request>::url_mut", "Argument[self].Field[crate::blocking::request::Request::inner].Field[crate::async_impl::request::Request::url]", "ReturnValue.Reference", "value", "dfc-generated"]
       - ["repo:https://github.com/seanmonstar/reqwest:reqwest", "<crate::blocking::request::Request>::version", "Argument[self].Field[crate::blocking::request::Request::inner].Field[crate::async_impl::request::Request::version]", "ReturnValue", "value", "dfc-generated"]
@@ -303,48 +323,73 @@ extensions:
       - ["repo:https://github.com/seanmonstar/reqwest:reqwest", "<crate::blocking::request::RequestBuilder>::timeout", "Argument[self]", "ReturnValue", "value", "dfc-generated"]
       - ["repo:https://github.com/seanmonstar/reqwest:reqwest", "<crate::blocking::request::RequestBuilder>::try_clone", "Argument[self]", "ReturnValue", "taint", "df-generated"]
       - ["repo:https://github.com/seanmonstar/reqwest:reqwest", "<crate::blocking::request::RequestBuilder>::version", "Argument[self]", "ReturnValue", "value", "dfc-generated"]
+      - ["repo:https://github.com/seanmonstar/reqwest:reqwest", "<crate::blocking::response::Response>::error_for_status_ref", "Argument[self].Field[crate::blocking::response::Response::inner]", "ReturnValue.Field[crate::result::Result::Ok(0)].Reference", "value", "dfc-generated"]
+      - ["repo:https://github.com/seanmonstar/reqwest:reqwest", "<crate::blocking::response::Response>::error_for_status_ref", "Argument[self].Field[crate::blocking::response::Response::inner]", "ReturnValue.Field[crate::result::Result::Ok(0)]", "value", "dfc-generated"]
       - ["repo:https://github.com/seanmonstar/reqwest:reqwest", "<crate::blocking::response::Response>::new", "Argument[0]", "ReturnValue.Field[crate::blocking::response::Response::inner]", "value", "dfc-generated"]
       - ["repo:https://github.com/seanmonstar/reqwest:reqwest", "<crate::blocking::response::Response>::new", "Argument[1]", "ReturnValue.Field[crate::blocking::response::Response::timeout]", "value", "dfc-generated"]
       - ["repo:https://github.com/seanmonstar/reqwest:reqwest", "<crate::blocking::response::Response>::new", "Argument[2]", "ReturnValue.Field[crate::blocking::response::Response::_thread_handle]", "value", "dfc-generated"]
       - ["repo:https://github.com/seanmonstar/reqwest:reqwest", "<crate::blocking::response::Response>::url", "Argument[self].Field[crate::blocking::response::Response::inner].Field[crate::async_impl::response::Response::url]", "ReturnValue.Reference", "value", "dfc-generated"]
+      - ["repo:https://github.com/seanmonstar/reqwest:reqwest", "<crate::config::RequestConfig>::fetch", "Argument[self].Field[0].Field[crate::option::Option::Some(0)]", "ReturnValue.Field[crate::option::Option::Some(0)].Reference", "value", "dfc-generated"]
+      - ["repo:https://github.com/seanmonstar/reqwest:reqwest", "<crate::config::RequestConfig>::fetch", "Argument[self].Field[crate::config::RequestConfig(0)].Field[crate::option::Option::Some(0)]", "ReturnValue.Field[crate::option::Option::Some(0)].Reference", "value", "dfc-generated"]
+      - ["repo:https://github.com/seanmonstar/reqwest:reqwest", "<crate::config::RequestConfig>::new", "Argument[0]", "ReturnValue.Field[crate::config::RequestConfig(0)]", "value", "dfc-generated"]
       - ["repo:https://github.com/seanmonstar/reqwest:reqwest", "<crate::connect::ConnectorBuilder>::build", "Argument[self]", "ReturnValue", "taint", "df-generated"]
       - ["repo:https://github.com/seanmonstar/reqwest:reqwest", "<crate::connect::ConnectorBuilder>::from_built_default_tls", "Argument[0]", "ReturnValue.Field[crate::connect::ConnectorBuilder::inner].Field[crate::connect::Inner::DefaultTls(0)]", "value", "dfc-generated"]
       - ["repo:https://github.com/seanmonstar/reqwest:reqwest", "<crate::connect::ConnectorBuilder>::from_built_default_tls", "Argument[1]", "ReturnValue.Field[crate::connect::ConnectorBuilder::inner].Field[crate::connect::Inner::DefaultTls(1)]", "value", "dfc-generated"]
       - ["repo:https://github.com/seanmonstar/reqwest:reqwest", "<crate::connect::ConnectorBuilder>::from_built_default_tls", "Argument[2]", "ReturnValue.Field[crate::connect::ConnectorBuilder::proxies]", "value", "dfc-generated"]
       - ["repo:https://github.com/seanmonstar/reqwest:reqwest", "<crate::connect::ConnectorBuilder>::from_built_default_tls", "Argument[3]", "ReturnValue.Field[crate::connect::ConnectorBuilder::user_agent]", "value", "dfc-generated"]
-      - ["repo:https://github.com/seanmonstar/reqwest:reqwest", "<crate::connect::ConnectorBuilder>::from_built_default_tls", "Argument[5]", "ReturnValue.Field[crate::connect::ConnectorBuilder::nodelay]", "value", "dfc-generated"]
-      - ["repo:https://github.com/seanmonstar/reqwest:reqwest", "<crate::connect::ConnectorBuilder>::from_built_default_tls", "Argument[6]", "ReturnValue.Field[crate::connect::ConnectorBuilder::tls_info]", "value", "dfc-generated"]
+      - ["repo:https://github.com/seanmonstar/reqwest:reqwest", "<crate::connect::ConnectorBuilder>::from_built_default_tls", "Argument[6]", "ReturnValue.Field[crate::connect::ConnectorBuilder::nodelay]", "value", "dfc-generated"]
+      - ["repo:https://github.com/seanmonstar/reqwest:reqwest", "<crate::connect::ConnectorBuilder>::from_built_default_tls", "Argument[7]", "ReturnValue.Field[crate::connect::ConnectorBuilder::tls_info]", "value", "dfc-generated"]
       - ["repo:https://github.com/seanmonstar/reqwest:reqwest", "<crate::connect::ConnectorBuilder>::new_default_tls", "Argument[2]", "ReturnValue.Field[crate::result::Result::Ok(0)].Field[crate::connect::ConnectorBuilder::proxies]", "value", "dfc-generated"]
       - ["repo:https://github.com/seanmonstar/reqwest:reqwest", "<crate::connect::ConnectorBuilder>::new_default_tls", "Argument[3]", "ReturnValue.Field[crate::result::Result::Ok(0)].Field[crate::connect::ConnectorBuilder::user_agent]", "value", "dfc-generated"]
-      - ["repo:https://github.com/seanmonstar/reqwest:reqwest", "<crate::connect::ConnectorBuilder>::new_default_tls", "Argument[5]", "ReturnValue.Field[crate::result::Result::Ok(0)].Field[crate::connect::ConnectorBuilder::nodelay]", "value", "dfc-generated"]
-      - ["repo:https://github.com/seanmonstar/reqwest:reqwest", "<crate::connect::ConnectorBuilder>::new_default_tls", "Argument[6]", "ReturnValue.Field[crate::result::Result::Ok(0)].Field[crate::connect::ConnectorBuilder::tls_info]", "value", "dfc-generated"]
+      - ["repo:https://github.com/seanmonstar/reqwest:reqwest", "<crate::connect::ConnectorBuilder>::new_default_tls", "Argument[6]", "ReturnValue.Field[crate::result::Result::Ok(0)].Field[crate::connect::ConnectorBuilder::nodelay]", "value", "dfc-generated"]
+      - ["repo:https://github.com/seanmonstar/reqwest:reqwest", "<crate::connect::ConnectorBuilder>::new_default_tls", "Argument[7]", "ReturnValue.Field[crate::result::Result::Ok(0)].Field[crate::connect::ConnectorBuilder::tls_info]", "value", "dfc-generated"]
       - ["repo:https://github.com/seanmonstar/reqwest:reqwest", "<crate::connect::ConnectorBuilder>::new_rustls_tls", "Argument[0]", "ReturnValue.Field[crate::connect::ConnectorBuilder::inner].Field[crate::connect::Inner::RustlsTls::http]", "value", "dfc-generated"]
       - ["repo:https://github.com/seanmonstar/reqwest:reqwest", "<crate::connect::ConnectorBuilder>::new_rustls_tls", "Argument[2]", "ReturnValue.Field[crate::connect::ConnectorBuilder::proxies]", "value", "dfc-generated"]
       - ["repo:https://github.com/seanmonstar/reqwest:reqwest", "<crate::connect::ConnectorBuilder>::new_rustls_tls", "Argument[3]", "ReturnValue.Field[crate::connect::ConnectorBuilder::user_agent]", "value", "dfc-generated"]
-      - ["repo:https://github.com/seanmonstar/reqwest:reqwest", "<crate::connect::ConnectorBuilder>::new_rustls_tls", "Argument[5]", "ReturnValue.Field[crate::connect::ConnectorBuilder::nodelay]", "value", "dfc-generated"]
-      - ["repo:https://github.com/seanmonstar/reqwest:reqwest", "<crate::connect::ConnectorBuilder>::new_rustls_tls", "Argument[6]", "ReturnValue.Field[crate::connect::ConnectorBuilder::tls_info]", "value", "dfc-generated"]
+      - ["repo:https://github.com/seanmonstar/reqwest:reqwest", "<crate::connect::ConnectorBuilder>::new_rustls_tls", "Argument[6]", "ReturnValue.Field[crate::connect::ConnectorBuilder::nodelay]", "value", "dfc-generated"]
+      - ["repo:https://github.com/seanmonstar/reqwest:reqwest", "<crate::connect::ConnectorBuilder>::new_rustls_tls", "Argument[7]", "ReturnValue.Field[crate::connect::ConnectorBuilder::tls_info]", "value", "dfc-generated"]
+      - ["repo:https://github.com/seanmonstar/reqwest:reqwest", "<crate::connect::ConnectorBuilder>::set_socks_resolver", "Argument[0]", "Argument[self].Field[crate::connect::ConnectorBuilder::resolver].Field[crate::option::Option::Some(0)]", "value", "dfc-generated"]
       - ["repo:https://github.com/seanmonstar/reqwest:reqwest", "<crate::connect::ConnectorBuilder>::set_timeout", "Argument[0]", "Argument[self].Field[crate::connect::ConnectorBuilder::timeout]", "value", "dfc-generated"]
       - ["repo:https://github.com/seanmonstar/reqwest:reqwest", "<crate::connect::ConnectorBuilder>::set_verbose", "Argument[0]", "Argument[self].Field[crate::connect::ConnectorBuilder::verbose].Field[0]", "value", "dfc-generated"]
       - ["repo:https://github.com/seanmonstar/reqwest:reqwest", "<crate::connect::ConnectorBuilder>::set_verbose", "Argument[0]", "Argument[self].Field[crate::connect::ConnectorBuilder::verbose].Field[crate::connect::verbose::Wrapper(0)]", "value", "dfc-generated"]
+      - ["repo:https://github.com/seanmonstar/reqwest:reqwest", "<crate::connect::verbose::Wrapper>::wrap", "Argument[0]", "ReturnValue.Reference.Field[crate::connect::verbose::Verbose::inner]", "value", "dfc-generated"]
+      - ["repo:https://github.com/seanmonstar/reqwest:reqwest", "<crate::connect::verbose::Wrapper>::wrap", "Argument[0]", "ReturnValue.Reference", "value", "dfc-generated"]
+      - ["repo:https://github.com/seanmonstar/reqwest:reqwest", "<crate::dns::gai::GaiResolver as crate::dns::resolve::Resolve>::resolve", "Argument[0]", "ReturnValue.Reference", "value", "dfc-generated"]
+      - ["repo:https://github.com/seanmonstar/reqwest:reqwest", "<crate::dns::gai::GaiResolver as crate::dns::resolve::Resolve>::resolve", "Argument[self].Field[0].Reference", "ReturnValue.Reference", "value", "dfc-generated"]
+      - ["repo:https://github.com/seanmonstar/reqwest:reqwest", "<crate::dns::gai::GaiResolver as crate::dns::resolve::Resolve>::resolve", "Argument[self].Field[crate::dns::gai::GaiResolver(0)].Reference", "ReturnValue.Reference", "value", "dfc-generated"]
+      - ["repo:https://github.com/seanmonstar/reqwest:reqwest", "<crate::dns::hickory::HickoryDnsResolver as crate::dns::resolve::Resolve>::resolve", "Argument[0]", "ReturnValue.Reference", "value", "dfc-generated"]
+      - ["repo:https://github.com/seanmonstar/reqwest:reqwest", "<crate::dns::hickory::HickoryDnsResolver as crate::dns::resolve::Resolve>::resolve", "Argument[self].Reference", "ReturnValue.Reference", "value", "dfc-generated"]
       - ["repo:https://github.com/seanmonstar/reqwest:reqwest", "<crate::dns::hickory::HickoryDnsSystemConfError as crate::error::Error>::source", "Argument[self].Field[0]", "ReturnValue.Field[crate::option::Option::Some(0)].Reference", "value", "dfc-generated"]
       - ["repo:https://github.com/seanmonstar/reqwest:reqwest", "<crate::dns::hickory::HickoryDnsSystemConfError as crate::error::Error>::source", "Argument[self].Field[crate::dns::hickory::HickoryDnsSystemConfError(0)]", "ReturnValue.Field[crate::option::Option::Some(0)].Reference", "value", "dfc-generated"]
       - ["repo:https://github.com/seanmonstar/reqwest:reqwest", "<crate::dns::resolve::DnsResolverWithOverrides>::new", "Argument[0]", "ReturnValue.Field[crate::dns::resolve::DnsResolverWithOverrides::dns_resolver]", "value", "dfc-generated"]
       - ["repo:https://github.com/seanmonstar/reqwest:reqwest", "<crate::dns::resolve::DynResolver>::new", "Argument[0]", "ReturnValue.Field[crate::dns::resolve::DynResolver::resolver]", "value", "dfc-generated"]
+      - ["repo:https://github.com/seanmonstar/reqwest:reqwest", "<crate::error::Error>::new", "Argument[0]", "ReturnValue", "taint", "df-generated"]
+      - ["repo:https://github.com/seanmonstar/reqwest:reqwest", "<crate::error::Error>::new", "Argument[1]", "ReturnValue", "taint", "df-generated"]
       - ["repo:https://github.com/seanmonstar/reqwest:reqwest", "<crate::error::Error>::with_url", "Argument[self]", "ReturnValue", "value", "dfc-generated"]
       - ["repo:https://github.com/seanmonstar/reqwest:reqwest", "<crate::error::Error>::without_url", "Argument[self]", "ReturnValue", "value", "dfc-generated"]
+      - ["repo:https://github.com/seanmonstar/reqwest:reqwest", "<crate::proxy::Matcher>::intercept", "Argument[self]", "ReturnValue", "taint", "df-generated"]
+      - ["repo:https://github.com/seanmonstar/reqwest:reqwest", "<crate::proxy::Matcher>::maybe_has_http_auth", "Argument[self].Field[crate::proxy::Matcher::maybe_has_http_auth]", "ReturnValue", "value", "dfc-generated"]
+      - ["repo:https://github.com/seanmonstar/reqwest:reqwest", "<crate::proxy::Matcher>::maybe_has_http_custom_headers", "Argument[self].Field[crate::proxy::Matcher::maybe_has_http_custom_headers]", "ReturnValue", "value", "dfc-generated"]
       - ["repo:https://github.com/seanmonstar/reqwest:reqwest", "<crate::proxy::Proxy>::basic_auth", "Argument[self]", "ReturnValue", "value", "dfc-generated"]
       - ["repo:https://github.com/seanmonstar/reqwest:reqwest", "<crate::proxy::Proxy>::custom_http_auth", "Argument[self]", "ReturnValue", "value", "dfc-generated"]
-      - ["repo:https://github.com/seanmonstar/reqwest:reqwest", "<crate::proxy::Proxy>::intercept", "Argument[self].Field[crate::proxy::Proxy::intercept].Field[crate::proxy::Intercept::All(0)]", "ReturnValue.Field[crate::option::Option::Some(0)]", "value", "dfc-generated"]
-      - ["repo:https://github.com/seanmonstar/reqwest:reqwest", "<crate::proxy::Proxy>::intercept", "Argument[self].Field[crate::proxy::Proxy::intercept].Field[crate::proxy::Intercept::Http(0)]", "ReturnValue.Field[crate::option::Option::Some(0)]", "value", "dfc-generated"]
-      - ["repo:https://github.com/seanmonstar/reqwest:reqwest", "<crate::proxy::Proxy>::intercept", "Argument[self].Field[crate::proxy::Proxy::intercept].Field[crate::proxy::Intercept::Https(0)]", "ReturnValue.Field[crate::option::Option::Some(0)]", "value", "dfc-generated"]
+      - ["repo:https://github.com/seanmonstar/reqwest:reqwest", "<crate::proxy::Proxy>::headers", "Argument[self]", "ReturnValue", "value", "dfc-generated"]
+      - ["repo:https://github.com/seanmonstar/reqwest:reqwest", "<crate::proxy::Proxy>::into_matcher", "Argument[self].Field[crate::proxy::Proxy::extra]", "ReturnValue.Field[crate::proxy::Matcher::extra]", "value", "dfc-generated"]
+      - ["repo:https://github.com/seanmonstar/reqwest:reqwest", "<crate::proxy::Proxy>::into_matcher", "Argument[self].Field[crate::proxy::Proxy::intercept].Field[crate::proxy::Intercept::Custom(0)]", "ReturnValue.Field[crate::proxy::Matcher::inner].Field[crate::proxy::Matcher_::Custom(0)]", "value", "dfc-generated"]
       - ["repo:https://github.com/seanmonstar/reqwest:reqwest", "<crate::proxy::Proxy>::no_proxy", "Argument[0]", "Argument[self].Field[crate::proxy::Proxy::no_proxy]", "value", "dfc-generated"]
       - ["repo:https://github.com/seanmonstar/reqwest:reqwest", "<crate::proxy::Proxy>::no_proxy", "Argument[0]", "ReturnValue.Field[crate::proxy::Proxy::no_proxy]", "value", "dfc-generated"]
       - ["repo:https://github.com/seanmonstar/reqwest:reqwest", "<crate::proxy::Proxy>::no_proxy", "Argument[self]", "ReturnValue", "value", "dfc-generated"]
-      - ["repo:https://github.com/seanmonstar/reqwest:reqwest", "<crate::proxy::ProxyScheme as crate::proxy::IntoProxyScheme>::into_proxy_scheme", "Argument[self]", "ReturnValue.Field[crate::result::Result::Ok(0)]", "value", "dfc-generated"]
       - ["repo:https://github.com/seanmonstar/reqwest:reqwest", "<crate::redirect::Attempt>::previous", "Argument[self].Field[crate::redirect::Attempt::previous]", "ReturnValue", "value", "dfc-generated"]
       - ["repo:https://github.com/seanmonstar/reqwest:reqwest", "<crate::redirect::Attempt>::status", "Argument[self].Field[crate::redirect::Attempt::status]", "ReturnValue", "value", "dfc-generated"]
       - ["repo:https://github.com/seanmonstar/reqwest:reqwest", "<crate::redirect::Attempt>::url", "Argument[self].Field[crate::redirect::Attempt::next]", "ReturnValue", "value", "dfc-generated"]
+      - ["repo:https://github.com/seanmonstar/reqwest:reqwest", "<crate::redirect::Policy>::custom", "Argument[0]", "ReturnValue", "taint", "df-generated"]
       - ["repo:https://github.com/seanmonstar/reqwest:reqwest", "<crate::redirect::Policy>::limited", "Argument[0]", "ReturnValue.Field[crate::redirect::Policy::inner].Field[crate::redirect::PolicyKind::Limit(0)]", "value", "dfc-generated"]
+      - ["repo:https://github.com/seanmonstar/reqwest:reqwest", "<crate::redirect::PolicyKind as crate::fmt::Debug>::fmt", "Argument[0]", "ReturnValue", "taint", "df-generated"]
+      - ["repo:https://github.com/seanmonstar/reqwest:reqwest", "<crate::redirect::TowerRedirectPolicy>::with_https_only", "Argument[0]", "Argument[self].Field[crate::redirect::TowerRedirectPolicy::https_only]", "value", "dfc-generated"]
+      - ["repo:https://github.com/seanmonstar/reqwest:reqwest", "<crate::redirect::TowerRedirectPolicy>::with_https_only", "Argument[0]", "ReturnValue.Field[crate::redirect::TowerRedirectPolicy::https_only]", "value", "dfc-generated"]
+      - ["repo:https://github.com/seanmonstar/reqwest:reqwest", "<crate::redirect::TowerRedirectPolicy>::with_https_only", "Argument[self]", "ReturnValue", "value", "dfc-generated"]
+      - ["repo:https://github.com/seanmonstar/reqwest:reqwest", "<crate::redirect::TowerRedirectPolicy>::with_referer", "Argument[0]", "Argument[self].Field[crate::redirect::TowerRedirectPolicy::referer]", "value", "dfc-generated"]
+      - ["repo:https://github.com/seanmonstar/reqwest:reqwest", "<crate::redirect::TowerRedirectPolicy>::with_referer", "Argument[0]", "ReturnValue.Field[crate::redirect::TowerRedirectPolicy::referer]", "value", "dfc-generated"]
+      - ["repo:https://github.com/seanmonstar/reqwest:reqwest", "<crate::redirect::TowerRedirectPolicy>::with_referer", "Argument[self]", "ReturnValue", "value", "dfc-generated"]
       - ["repo:https://github.com/seanmonstar/reqwest:reqwest", "<crate::string::String as crate::into_url::IntoUrlSealed>::as_str", "Argument[self]", "ReturnValue", "value", "dfc-generated"]
       - ["repo:https://github.com/seanmonstar/reqwest:reqwest", "<crate::support::delay_layer::Delay>::new", "Argument[0]", "ReturnValue.Field[crate::support::delay_layer::Delay::inner]", "value", "dfc-generated"]
       - ["repo:https://github.com/seanmonstar/reqwest:reqwest", "<crate::support::delay_layer::Delay>::new", "Argument[1]", "ReturnValue.Field[crate::support::delay_layer::Delay::delay]", "value", "dfc-generated"]
@@ -359,11 +404,11 @@ extensions:
       - ["repo:https://github.com/seanmonstar/reqwest:reqwest", "<crate::support::server::Http3>::with_addr", "Argument[self]", "ReturnValue", "value", "dfc-generated"]
       - ["repo:https://github.com/seanmonstar/reqwest:reqwest", "<crate::support::server::Server>::addr", "Argument[self].Field[crate::support::server::Server::addr]", "ReturnValue", "value", "dfc-generated"]
       - ["repo:https://github.com/seanmonstar/reqwest:reqwest", "<crate::tls::CertificateRevocationList>::as_rustls_crl", "Argument[self].Field[crate::tls::CertificateRevocationList::inner].Reference", "ReturnValue", "value", "dfc-generated"]
-      - ["repo:https://github.com/seanmonstar/reqwest:reqwest", "<crate::tls::CertificateRevocationList>::as_rustls_crl", "Argument[self].Field[crate::tls::CertificateRevocationList::inner]", "ReturnValue", "value", "dfc-generated"]
       - ["repo:https://github.com/seanmonstar/reqwest:reqwest", "<crate::tls::ClientCert as crate::clone::Clone>::clone", "Argument[self].Field[crate::tls::ClientCert::Pem::certs].Reference", "ReturnValue.Field[crate::tls::ClientCert::Pem::certs]", "value", "dfc-generated"]
       - ["repo:https://github.com/seanmonstar/reqwest:reqwest", "<crate::tls::IgnoreHostname>::new", "Argument[0]", "ReturnValue.Field[crate::tls::IgnoreHostname::roots]", "value", "dfc-generated"]
       - ["repo:https://github.com/seanmonstar/reqwest:reqwest", "<crate::tls::IgnoreHostname>::new", "Argument[1]", "ReturnValue.Field[crate::tls::IgnoreHostname::signature_algorithms]", "value", "dfc-generated"]
       - ["repo:https://github.com/seanmonstar/reqwest:reqwest", "<crate::tls::TlsInfo>::peer_certificate", "Argument[self]", "ReturnValue", "taint", "df-generated"]
+      - ["repo:https://github.com/seanmonstar/reqwest:reqwest", "<crate::util::Escape>::new", "Argument[0]", "ReturnValue.Field[crate::util::Escape(0)]", "value", "dfc-generated"]
       - ["repo:https://github.com/seanmonstar/reqwest:reqwest", "crate::async_impl::body::total_timeout", "Argument[0]", "ReturnValue.Field[crate::async_impl::body::TotalTimeoutBody::inner]", "value", "dfc-generated"]
       - ["repo:https://github.com/seanmonstar/reqwest:reqwest", "crate::async_impl::body::total_timeout", "Argument[1]", "ReturnValue.Field[crate::async_impl::body::TotalTimeoutBody::timeout]", "value", "dfc-generated"]
       - ["repo:https://github.com/seanmonstar/reqwest:reqwest", "crate::async_impl::body::with_read_timeout", "Argument[0]", "ReturnValue.Field[crate::async_impl::body::ReadTimeoutBody::inner]", "value", "dfc-generated"]
@@ -379,19 +424,37 @@ extensions:
       - ["repo:https://github.com/seanmonstar/reqwest:reqwest", "<crate::async_impl::client::Client>::patch", "Argument[0]", "transmission", "df-generated"]
       - ["repo:https://github.com/seanmonstar/reqwest:reqwest", "<crate::async_impl::client::Client>::post", "Argument[0]", "transmission", "df-generated"]
       - ["repo:https://github.com/seanmonstar/reqwest:reqwest", "<crate::async_impl::client::Client>::put", "Argument[0]", "transmission", "df-generated"]
+      - ["repo:https://github.com/seanmonstar/reqwest:reqwest", "<crate::async_impl::multipart::Form>::into_stream", "Argument[self]", "log-injection", "df-generated"]
+      - ["repo:https://github.com/seanmonstar/reqwest:reqwest", "<crate::async_impl::multipart::Form>::stream", "Argument[self]", "log-injection", "df-generated"]
+      - ["repo:https://github.com/seanmonstar/reqwest:reqwest", "<crate::async_impl::request::RequestBuilder>::multipart", "Argument[0]", "log-injection", "df-generated"]
       - ["repo:https://github.com/seanmonstar/reqwest:reqwest", "<crate::blocking::client::Client>::delete", "Argument[0]", "transmission", "df-generated"]
+      - ["repo:https://github.com/seanmonstar/reqwest:reqwest", "<crate::blocking::client::Client>::execute", "Argument[self]", "pointer-access", "df-generated"]
       - ["repo:https://github.com/seanmonstar/reqwest:reqwest", "<crate::blocking::client::Client>::get", "Argument[0]", "transmission", "df-generated"]
       - ["repo:https://github.com/seanmonstar/reqwest:reqwest", "<crate::blocking::client::Client>::head", "Argument[0]", "transmission", "df-generated"]
       - ["repo:https://github.com/seanmonstar/reqwest:reqwest", "<crate::blocking::client::Client>::patch", "Argument[0]", "transmission", "df-generated"]
       - ["repo:https://github.com/seanmonstar/reqwest:reqwest", "<crate::blocking::client::Client>::post", "Argument[0]", "transmission", "df-generated"]
       - ["repo:https://github.com/seanmonstar/reqwest:reqwest", "<crate::blocking::client::Client>::put", "Argument[0]", "transmission", "df-generated"]
+      - ["repo:https://github.com/seanmonstar/reqwest:reqwest", "<crate::blocking::multipart::Form>::into_reader", "Argument[self]", "log-injection", "df-generated"]
+      - ["repo:https://github.com/seanmonstar/reqwest:reqwest", "<crate::blocking::multipart::Form>::reader", "Argument[self]", "log-injection", "df-generated"]
+      - ["repo:https://github.com/seanmonstar/reqwest:reqwest", "<crate::blocking::multipart::Reader as crate::io::Read>::read", "Argument[self]", "log-injection", "df-generated"]
+      - ["repo:https://github.com/seanmonstar/reqwest:reqwest", "<crate::blocking::request::RequestBuilder>::multipart", "Argument[0]", "log-injection", "df-generated"]
+      - ["repo:https://github.com/seanmonstar/reqwest:reqwest", "<crate::blocking::request::RequestBuilder>::send", "Argument[self]", "pointer-access", "df-generated"]
+      - ["repo:https://github.com/seanmonstar/reqwest:reqwest", "<crate::blocking::response::Response as crate::io::Read>::read", "Argument[self]", "pointer-access", "df-generated"]
+      - ["repo:https://github.com/seanmonstar/reqwest:reqwest", "<crate::blocking::response::Response>::bytes", "Argument[self]", "pointer-access", "df-generated"]
+      - ["repo:https://github.com/seanmonstar/reqwest:reqwest", "<crate::blocking::response::Response>::json", "Argument[self]", "pointer-access", "df-generated"]
+      - ["repo:https://github.com/seanmonstar/reqwest:reqwest", "<crate::blocking::response::Response>::text", "Argument[self]", "pointer-access", "df-generated"]
+      - ["repo:https://github.com/seanmonstar/reqwest:reqwest", "<crate::blocking::response::Response>::text_with_charset", "Argument[self]", "pointer-access", "df-generated"]
       - ["repo:https://github.com/seanmonstar/reqwest:reqwest", "<crate::connect::ConnectorService as crate::Service>::call", "Argument[0]", "log-injection", "df-generated"]
+      - ["repo:https://github.com/seanmonstar/reqwest:reqwest", "<crate::error::Error>::new", "Argument[1]", "pointer-access", "df-generated"]
       - ["repo:https://github.com/seanmonstar/reqwest:reqwest", "crate::blocking::get", "Argument[0]", "transmission", "df-generated"]
+      - ["repo:https://github.com/seanmonstar/reqwest:reqwest", "crate::blocking::wait::timeout", "Argument[1]", "pointer-access", "df-generated"]
       - ["repo:https://github.com/seanmonstar/reqwest:reqwest", "crate::get", "Argument[0]", "transmission", "df-generated"]
   - addsTo:
       pack: codeql/rust-all
       extensible: sourceModel
     data:
+      - ["repo:https://github.com/seanmonstar/reqwest:reqwest", "<crate::async_impl::multipart::Form>::file", "ReturnValue", "file", "df-generated"]
+      - ["repo:https://github.com/seanmonstar/reqwest:reqwest", "<crate::async_impl::multipart::Part>::file", "ReturnValue", "file", "df-generated"]
       - ["repo:https://github.com/seanmonstar/reqwest:reqwest", "<crate::blocking::multipart::Form>::file", "ReturnValue", "file", "df-generated"]
       - ["repo:https://github.com/seanmonstar/reqwest:reqwest", "<crate::blocking::multipart::Part>::file", "ReturnValue", "file", "df-generated"]
       - ["repo:https://github.com/seanmonstar/reqwest:reqwest", "<crate::proxy::NoProxy>::from_env", "ReturnValue", "environment", "df-generated"]
diff --git a/rust/ql/lib/ext/generated/rocket/repo-cookies.model.yml b/rust/ql/lib/ext/generated/rocket/repo-cookies.model.yml
new file mode 100644
index 00000000000..f9148a8e630
--- /dev/null
+++ b/rust/ql/lib/ext/generated/rocket/repo-cookies.model.yml
@@ -0,0 +1,7 @@
+# THIS FILE IS AN AUTO-GENERATED MODELS AS DATA FILE. DO NOT EDIT.
+extensions:
+  - addsTo:
+      pack: codeql/rust-all
+      extensible: summaryModel
+    data:
+      - ["repo::cookies", "<crate::session::User as crate::request::from_request::FromRequest>::from_request", "Argument[0]", "ReturnValue.Reference", "value", "dfc-generated"]
diff --git a/rust/ql/lib/ext/generated/rocket/repo-fairings.model.yml b/rust/ql/lib/ext/generated/rocket/repo-fairings.model.yml
new file mode 100644
index 00000000000..b5d6fb686d5
--- /dev/null
+++ b/rust/ql/lib/ext/generated/rocket/repo-fairings.model.yml
@@ -0,0 +1,10 @@
+# THIS FILE IS AN AUTO-GENERATED MODELS AS DATA FILE. DO NOT EDIT.
+extensions:
+  - addsTo:
+      pack: codeql/rust-all
+      extensible: summaryModel
+    data:
+      - ["repo::fairings", "<crate::Counter as crate::fairing::Fairing>::on_ignite", "Argument[0]", "ReturnValue.Reference", "value", "dfc-generated"]
+      - ["repo::fairings", "<crate::Counter as crate::fairing::Fairing>::on_ignite", "Argument[self]", "ReturnValue.Reference", "value", "dfc-generated"]
+      - ["repo::fairings", "<crate::Counter as crate::fairing::Fairing>::on_request", "Argument[0]", "ReturnValue.Reference", "value", "dfc-generated"]
+      - ["repo::fairings", "<crate::Counter as crate::fairing::Fairing>::on_request", "Argument[self]", "ReturnValue.Reference", "value", "dfc-generated"]
diff --git a/rust/ql/lib/ext/generated/rocket/repo-https-github.com-rwf2-Rocket-rocket.model.yml b/rust/ql/lib/ext/generated/rocket/repo-https-github.com-rwf2-Rocket-rocket.model.yml
index 76cd9d7618e..3ffcc568546 100644
--- a/rust/ql/lib/ext/generated/rocket/repo-https-github.com-rwf2-Rocket-rocket.model.yml
+++ b/rust/ql/lib/ext/generated/rocket/repo-https-github.com-rwf2-Rocket-rocket.model.yml
@@ -4,31 +4,72 @@ extensions:
       pack: codeql/rust-all
       extensible: summaryModel
     data:
+      - ["repo:https://github.com/rwf2/Rocket:rocket", "<&[u8] as crate::data::from_data::FromData>::from_data", "Argument[0]", "ReturnValue.Reference", "value", "dfc-generated"]
+      - ["repo:https://github.com/rwf2/Rocket:rocket", "<&[u8] as crate::data::from_data::FromData>::from_data", "Argument[1]", "ReturnValue.Reference", "value", "dfc-generated"]
+      - ["repo:https://github.com/rwf2/Rocket:rocket", "<&[u8] as crate::form::from_form_field::FromFormField>::from_data", "Argument[0]", "ReturnValue.Reference", "value", "dfc-generated"]
+      - ["repo:https://github.com/rwf2/Rocket:rocket", "<&crate::config::config::Config as crate::request::from_request::FromRequest>::from_request", "Argument[0]", "ReturnValue.Reference", "value", "dfc-generated"]
+      - ["repo:https://github.com/rwf2/Rocket:rocket", "<&crate::config::secret_key::SecretKey as crate::request::from_request::FromRequest>::from_request", "Argument[0]", "ReturnValue.Reference", "value", "dfc-generated"]
+      - ["repo:https://github.com/rwf2/Rocket:rocket", "<&crate::cookies::CookieJar as crate::request::from_request::FromRequest>::from_request", "Argument[0]", "ReturnValue.Reference", "value", "dfc-generated"]
+      - ["repo:https://github.com/rwf2/Rocket:rocket", "<&crate::data::limits::Limits as crate::request::from_request::FromRequest>::from_request", "Argument[0]", "ReturnValue.Reference", "value", "dfc-generated"]
+      - ["repo:https://github.com/rwf2/Rocket:rocket", "<&crate::header::accept::Accept as crate::request::from_request::FromRequest>::from_request", "Argument[0]", "ReturnValue.Reference", "value", "dfc-generated"]
+      - ["repo:https://github.com/rwf2/Rocket:rocket", "<&crate::header::content_type::ContentType as crate::request::from_request::FromRequest>::from_request", "Argument[0]", "ReturnValue.Reference", "value", "dfc-generated"]
+      - ["repo:https://github.com/rwf2/Rocket:rocket", "<&crate::raw_str::RawStr as crate::data::from_data::FromData>::from_data", "Argument[0]", "ReturnValue.Reference", "value", "dfc-generated"]
+      - ["repo:https://github.com/rwf2/Rocket:rocket", "<&crate::raw_str::RawStr as crate::data::from_data::FromData>::from_data", "Argument[1]", "ReturnValue.Reference", "value", "dfc-generated"]
+      - ["repo:https://github.com/rwf2/Rocket:rocket", "<&crate::route::route::Route as crate::request::from_request::FromRequest>::from_request", "Argument[0]", "ReturnValue.Reference", "value", "dfc-generated"]
+      - ["repo:https://github.com/rwf2/Rocket:rocket", "<&crate::state::State as crate::request::from_request::FromRequest>::from_request", "Argument[0]", "ReturnValue.Reference", "value", "dfc-generated"]
+      - ["repo:https://github.com/rwf2/Rocket:rocket", "<&crate::uri::host::Host as crate::request::from_request::FromRequest>::from_request", "Argument[0]", "ReturnValue.Reference", "value", "dfc-generated"]
+      - ["repo:https://github.com/rwf2/Rocket:rocket", "<&crate::uri::origin::Origin as crate::request::from_request::FromRequest>::from_request", "Argument[0]", "ReturnValue.Reference", "value", "dfc-generated"]
+      - ["repo:https://github.com/rwf2/Rocket:rocket", "<&str as crate::data::from_data::FromData>::from_data", "Argument[0]", "ReturnValue.Reference", "value", "dfc-generated"]
+      - ["repo:https://github.com/rwf2/Rocket:rocket", "<&str as crate::data::from_data::FromData>::from_data", "Argument[1]", "ReturnValue.Reference", "value", "dfc-generated"]
+      - ["repo:https://github.com/rwf2/Rocket:rocket", "<&str as crate::form::from_form_field::FromFormField>::from_data", "Argument[0]", "ReturnValue.Reference", "value", "dfc-generated"]
       - ["repo:https://github.com/rwf2/Rocket:rocket", "<&str as crate::request::from_param::FromParam>::from_param", "Argument[0]", "ReturnValue.Field[crate::result::Result::Ok(0)]", "value", "dfc-generated"]
+      - ["repo:https://github.com/rwf2/Rocket:rocket", "<_ as crate::catcher::handler::Cloneable>::clone_handler", "Argument[self].Reference", "ReturnValue.Reference", "value", "dfc-generated"]
       - ["repo:https://github.com/rwf2/Rocket:rocket", "<_ as crate::catcher::handler::Handler>::handle", "Argument[0]", "Argument[self].Parameter[0]", "value", "dfc-generated"]
       - ["repo:https://github.com/rwf2/Rocket:rocket", "<_ as crate::catcher::handler::Handler>::handle", "Argument[1]", "Argument[self].Parameter[1]", "value", "dfc-generated"]
       - ["repo:https://github.com/rwf2/Rocket:rocket", "<_ as crate::catcher::handler::Handler>::handle", "Argument[self].ReturnValue", "ReturnValue", "value", "dfc-generated"]
       - ["repo:https://github.com/rwf2/Rocket:rocket", "<_ as crate::ext::StreamExt>::join", "Argument[0]", "ReturnValue.Field[crate::ext::Join::b]", "value", "dfc-generated"]
       - ["repo:https://github.com/rwf2/Rocket:rocket", "<_ as crate::ext::StreamExt>::join", "Argument[self]", "ReturnValue.Field[crate::ext::Join::a]", "value", "dfc-generated"]
       - ["repo:https://github.com/rwf2/Rocket:rocket", "<_ as crate::form::from_form::FromForm>::init", "Argument[0]", "ReturnValue.Field[crate::form::from_form_field::FromFieldContext::opts]", "value", "dfc-generated"]
+      - ["repo:https://github.com/rwf2/Rocket:rocket", "<_ as crate::form::from_form::FromForm>::push_data", "Argument[0]", "ReturnValue.Reference", "value", "dfc-generated"]
+      - ["repo:https://github.com/rwf2/Rocket:rocket", "<_ as crate::form::from_form::FromForm>::push_data", "Argument[1]", "ReturnValue.Reference", "value", "dfc-generated"]
+      - ["repo:https://github.com/rwf2/Rocket:rocket", "<_ as crate::form::from_form::FromForm>::push_value", "Argument[1].Field[crate::form::field::ValueField::name]", "Argument[0].Field[crate::form::from_form_field::FromFieldContext::field_name].Field[crate::option::Option::Some(0)]", "value", "dfc-generated"]
       - ["repo:https://github.com/rwf2/Rocket:rocket", "<_ as crate::form::from_form::FromForm>::push_value", "Argument[1].Field[crate::form::field::ValueField::value]", "Argument[0].Field[crate::form::from_form_field::FromFieldContext::field_value].Field[crate::option::Option::Some(0)]", "value", "dfc-generated"]
+      - ["repo:https://github.com/rwf2/Rocket:rocket", "<_ as crate::route::handler::Cloneable>::clone_handler", "Argument[self].Reference", "ReturnValue.Reference", "value", "dfc-generated"]
       - ["repo:https://github.com/rwf2/Rocket:rocket", "<_ as crate::route::handler::Handler>::handle", "Argument[0]", "Argument[self].Parameter[0]", "value", "dfc-generated"]
       - ["repo:https://github.com/rwf2/Rocket:rocket", "<_ as crate::route::handler::Handler>::handle", "Argument[1]", "Argument[self].Parameter[1]", "value", "dfc-generated"]
       - ["repo:https://github.com/rwf2/Rocket:rocket", "<_ as crate::route::handler::Handler>::handle", "Argument[self].ReturnValue", "ReturnValue", "value", "dfc-generated"]
       - ["repo:https://github.com/rwf2/Rocket:rocket", "<bool as crate::request::from_param::FromParam>::from_param", "Argument[0]", "ReturnValue.Field[crate::result::Result::Err(0)]", "value", "dfc-generated"]
       - ["repo:https://github.com/rwf2/Rocket:rocket", "<char as crate::form::from_form_field::FromFormField>::from_value", "Argument[0]", "ReturnValue", "taint", "df-generated"]
+      - ["repo:https://github.com/rwf2/Rocket:rocket", "<crate::Authenticated as crate::request::from_request::FromRequest>::from_request", "Argument[0]", "ReturnValue.Reference", "value", "dfc-generated"]
+      - ["repo:https://github.com/rwf2/Rocket:rocket", "<crate::HasContentType as crate::data::from_data::FromData>::from_data", "Argument[0]", "ReturnValue.Reference", "value", "dfc-generated"]
+      - ["repo:https://github.com/rwf2/Rocket:rocket", "<crate::HasContentType as crate::data::from_data::FromData>::from_data", "Argument[1]", "ReturnValue.Reference", "value", "dfc-generated"]
+      - ["repo:https://github.com/rwf2/Rocket:rocket", "<crate::HasContentType as crate::request::from_request::FromRequest>::from_request", "Argument[0]", "ReturnValue.Reference", "value", "dfc-generated"]
       - ["repo:https://github.com/rwf2/Rocket:rocket", "<crate::Singleton as crate::fairing::Fairing>::info", "Argument[self].Field[0]", "ReturnValue.Field[crate::fairing::info_kind::Info::kind]", "value", "dfc-generated"]
       - ["repo:https://github.com/rwf2/Rocket:rocket", "<crate::Singleton as crate::fairing::Fairing>::info", "Argument[self].Field[crate::Singleton(0)]", "ReturnValue.Field[crate::fairing::info_kind::Info::kind]", "value", "dfc-generated"]
+      - ["repo:https://github.com/rwf2/Rocket:rocket", "<crate::Singleton as crate::fairing::Fairing>::on_ignite", "Argument[0]", "ReturnValue.Reference", "value", "dfc-generated"]
+      - ["repo:https://github.com/rwf2/Rocket:rocket", "<crate::Singleton as crate::fairing::Fairing>::on_ignite", "Argument[self]", "ReturnValue.Reference", "value", "dfc-generated"]
       - ["repo:https://github.com/rwf2/Rocket:rocket", "<crate::Uuid as crate::form::from_form_field::FromFormField>::from_value", "Argument[0]", "ReturnValue", "taint", "df-generated"]
       - ["repo:https://github.com/rwf2/Rocket:rocket", "<crate::Uuid as crate::request::from_param::FromParam>::from_param", "Argument[0]", "ReturnValue", "taint", "df-generated"]
+      - ["repo:https://github.com/rwf2/Rocket:rocket", "<crate::borrow::Cow as crate::data::from_data::FromData>::from_data", "Argument[0]", "ReturnValue.Reference", "value", "dfc-generated"]
+      - ["repo:https://github.com/rwf2/Rocket:rocket", "<crate::borrow::Cow as crate::data::from_data::FromData>::from_data", "Argument[1]", "ReturnValue.Reference", "value", "dfc-generated"]
+      - ["repo:https://github.com/rwf2/Rocket:rocket", "<crate::borrow::Cow as crate::form::from_form_field::FromFormField>::from_data", "Argument[0]", "ReturnValue.Reference", "value", "dfc-generated"]
+      - ["repo:https://github.com/rwf2/Rocket:rocket", "<crate::catcher::catcher::Catcher as crate::convert::From>::from", "Argument[0].Field[crate::catcher::catcher::StaticInfo::handler]", "ReturnValue.Field[crate::catcher::catcher::Catcher::handler].Reference", "value", "dfc-generated"]
       - ["repo:https://github.com/rwf2/Rocket:rocket", "<crate::catcher::catcher::Catcher>::map_base", "Argument[self].Field[crate::catcher::catcher::Catcher::base]", "Argument[0].Parameter[0]", "value", "dfc-generated"]
       - ["repo:https://github.com/rwf2/Rocket:rocket", "<crate::catcher::catcher::Catcher>::map_base", "Argument[self]", "ReturnValue.Field[crate::result::Result::Ok(0)]", "value", "dfc-generated"]
+      - ["repo:https://github.com/rwf2/Rocket:rocket", "<crate::catcher::catcher::Catcher>::new", "Argument[1]", "ReturnValue.Field[crate::catcher::catcher::Catcher::handler].Reference", "value", "dfc-generated"]
+      - ["repo:https://github.com/rwf2/Rocket:rocket", "<crate::collections::btree::map::BTreeMap as crate::form::from_form::FromForm>::finalize", "Argument[0].Field[crate::form::from_form::MapContext::errors]", "ReturnValue.Field[crate::result::Result::Err(0)]", "value", "dfc-generated"]
       - ["repo:https://github.com/rwf2/Rocket:rocket", "<crate::collections::btree::map::BTreeMap as crate::form::from_form::FromForm>::init", "Argument[0]", "ReturnValue.Field[crate::form::from_form::MapContext::opts]", "value", "dfc-generated"]
+      - ["repo:https://github.com/rwf2/Rocket:rocket", "<crate::collections::btree::map::BTreeMap as crate::form::from_form::FromForm>::push_data", "Argument[0]", "ReturnValue.Reference", "value", "dfc-generated"]
+      - ["repo:https://github.com/rwf2/Rocket:rocket", "<crate::collections::btree::map::BTreeMap as crate::form::from_form::FromForm>::push_data", "Argument[1]", "ReturnValue.Reference", "value", "dfc-generated"]
       - ["repo:https://github.com/rwf2/Rocket:rocket", "<crate::collections::btree::map::BTreeMap as crate::form::validate::Len>::len_into_u64", "Argument[0]", "ReturnValue", "taint", "df-generated"]
+      - ["repo:https://github.com/rwf2/Rocket:rocket", "<crate::collections::hash::map::HashMap as crate::form::from_form::FromForm>::finalize", "Argument[0].Field[crate::form::from_form::MapContext::errors]", "ReturnValue.Field[crate::result::Result::Err(0)]", "value", "dfc-generated"]
       - ["repo:https://github.com/rwf2/Rocket:rocket", "<crate::collections::hash::map::HashMap as crate::form::from_form::FromForm>::init", "Argument[0]", "ReturnValue.Field[crate::form::from_form::MapContext::opts]", "value", "dfc-generated"]
+      - ["repo:https://github.com/rwf2/Rocket:rocket", "<crate::collections::hash::map::HashMap as crate::form::from_form::FromForm>::push_data", "Argument[0]", "ReturnValue.Reference", "value", "dfc-generated"]
+      - ["repo:https://github.com/rwf2/Rocket:rocket", "<crate::collections::hash::map::HashMap as crate::form::from_form::FromForm>::push_data", "Argument[1]", "ReturnValue.Reference", "value", "dfc-generated"]
       - ["repo:https://github.com/rwf2/Rocket:rocket", "<crate::collections::hash::map::HashMap as crate::form::validate::Len>::len_into_u64", "Argument[0]", "ReturnValue", "taint", "df-generated"]
       - ["repo:https://github.com/rwf2/Rocket:rocket", "<crate::config::config::Config as crate::provider::Provider>::profile", "Argument[self].Field[crate::config::config::Config::profile].Reference", "ReturnValue.Field[crate::option::Option::Some(0)]", "value", "dfc-generated"]
-      - ["repo:https://github.com/rwf2/Rocket:rocket", "<crate::config::config::Config as crate::provider::Provider>::profile", "Argument[self].Field[crate::config::config::Config::profile]", "ReturnValue.Field[crate::option::Option::Some(0)]", "value", "dfc-generated"]
+      - ["repo:https://github.com/rwf2/Rocket:rocket", "<crate::config::ident::Ident as crate::fmt::Display>::fmt", "Argument[0]", "ReturnValue", "taint", "df-generated"]
+      - ["repo:https://github.com/rwf2/Rocket:rocket", "<crate::config::shutdown::Sig as crate::fmt::Display>::fmt", "Argument[0]", "ReturnValue", "taint", "df-generated"]
       - ["repo:https://github.com/rwf2/Rocket:rocket", "<crate::config::tls::MutualTls>::ca_certs", "Argument[self]", "ReturnValue", "taint", "df-generated"]
       - ["repo:https://github.com/rwf2/Rocket:rocket", "<crate::config::tls::MutualTls>::mandatory", "Argument[0]", "Argument[self].Field[crate::config::tls::MutualTls::mandatory]", "value", "dfc-generated"]
       - ["repo:https://github.com/rwf2/Rocket:rocket", "<crate::config::tls::MutualTls>::mandatory", "Argument[0]", "ReturnValue.Field[crate::config::tls::MutualTls::mandatory]", "value", "dfc-generated"]
@@ -51,6 +92,9 @@ extensions:
       - ["repo:https://github.com/rwf2/Rocket:rocket", "<crate::cookies::CookieJar>::from", "Argument[1]", "ReturnValue.Field[crate::cookies::CookieJar::config]", "value", "dfc-generated"]
       - ["repo:https://github.com/rwf2/Rocket:rocket", "<crate::cookies::CookieJar>::new", "Argument[0]", "ReturnValue.Field[crate::cookies::CookieJar::config]", "value", "dfc-generated"]
       - ["repo:https://github.com/rwf2/Rocket:rocket", "<crate::data::capped::Capped as crate::convert::From>::from", "Argument[0]", "ReturnValue.Field[crate::data::capped::Capped::value]", "value", "dfc-generated"]
+      - ["repo:https://github.com/rwf2/Rocket:rocket", "<crate::data::capped::Capped as crate::data::from_data::FromData>::from_data", "Argument[0]", "ReturnValue.Reference", "value", "dfc-generated"]
+      - ["repo:https://github.com/rwf2/Rocket:rocket", "<crate::data::capped::Capped as crate::data::from_data::FromData>::from_data", "Argument[1]", "ReturnValue.Reference", "value", "dfc-generated"]
+      - ["repo:https://github.com/rwf2/Rocket:rocket", "<crate::data::capped::Capped as crate::form::from_form_field::FromFormField>::from_data", "Argument[0]", "ReturnValue.Reference", "value", "dfc-generated"]
       - ["repo:https://github.com/rwf2/Rocket:rocket", "<crate::data::capped::Capped as crate::form::from_form_field::FromFormField>::from_value", "Argument[0].Field[crate::form::field::ValueField::value]", "ReturnValue.Field[crate::result::Result::Ok(0)].Field[crate::data::capped::Capped::value]", "value", "dfc-generated"]
       - ["repo:https://github.com/rwf2/Rocket:rocket", "<crate::data::capped::Capped as crate::form::from_form_field::FromFormField>::from_value", "Argument[0]", "ReturnValue", "taint", "df-generated"]
       - ["repo:https://github.com/rwf2/Rocket:rocket", "<crate::data::capped::Capped as crate::ops::deref::Deref>::deref", "Argument[self].Field[crate::data::capped::Capped::value]", "ReturnValue.Reference", "value", "dfc-generated"]
@@ -64,17 +108,21 @@ extensions:
       - ["repo:https://github.com/rwf2/Rocket:rocket", "<crate::data::capped::Capped>::new", "Argument[0]", "ReturnValue.Field[crate::data::capped::Capped::value]", "value", "dfc-generated"]
       - ["repo:https://github.com/rwf2/Rocket:rocket", "<crate::data::capped::Capped>::new", "Argument[1]", "ReturnValue.Field[crate::data::capped::Capped::n]", "value", "dfc-generated"]
       - ["repo:https://github.com/rwf2/Rocket:rocket", "<crate::data::capped::N as crate::ops::deref::Deref>::deref", "Argument[self].Field[crate::data::capped::N::written]", "ReturnValue.Reference", "value", "dfc-generated"]
+      - ["repo:https://github.com/rwf2/Rocket:rocket", "<crate::data::data::Data as crate::data::from_data::FromData>::from_data", "Argument[1]", "ReturnValue.Reference", "value", "dfc-generated"]
       - ["repo:https://github.com/rwf2/Rocket:rocket", "<crate::data::data::Data>::local", "Argument[0]", "ReturnValue.Field[crate::data::data::Data::buffer]", "value", "dfc-generated"]
       - ["repo:https://github.com/rwf2/Rocket:rocket", "<crate::data::data::Data>::peek", "Argument[self].Field[crate::data::data::Data::buffer].Element", "ReturnValue.Reference", "value", "dfc-generated"]
       - ["repo:https://github.com/rwf2/Rocket:rocket", "<crate::data::data::Data>::peek_complete", "Argument[self].Field[crate::data::data::Data::is_complete]", "ReturnValue", "value", "dfc-generated"]
+      - ["repo:https://github.com/rwf2/Rocket:rocket", "<crate::data::data_stream::DataStream>::into_string", "Argument[self]", "ReturnValue", "taint", "df-generated"]
       - ["repo:https://github.com/rwf2/Rocket:rocket", "<crate::data::data_stream::StreamReader as crate::convert::From>::from", "Argument[0]", "ReturnValue.Field[crate::data::data_stream::StreamReader::inner].Field[crate::data::data_stream::StreamKind::Body(0)]", "value", "dfc-generated"]
       - ["repo:https://github.com/rwf2/Rocket:rocket", "<crate::data::data_stream::StreamReader as crate::convert::From>::from", "Argument[0]", "ReturnValue.Field[crate::data::data_stream::StreamReader::inner].Field[crate::data::data_stream::StreamKind::Multipart(0)]", "value", "dfc-generated"]
       - ["repo:https://github.com/rwf2/Rocket:rocket", "<crate::data::io_stream::IoStream as crate::convert::From>::from", "Argument[0]", "ReturnValue.Field[crate::data::io_stream::IoStream::kind].Field[crate::data::io_stream::IoStreamKind::Upgraded(0)]", "value", "dfc-generated"]
       - ["repo:https://github.com/rwf2/Rocket:rocket", "<crate::data::limits::Limits>::limit", "Argument[self]", "ReturnValue", "value", "dfc-generated"]
       - ["repo:https://github.com/rwf2/Rocket:rocket", "<crate::error::Error as crate::convert::From>::from", "Argument[0]", "ReturnValue.Field[crate::error::Error::kind]", "value", "dfc-generated"]
+      - ["repo:https://github.com/rwf2/Rocket:rocket", "<crate::error::Error as crate::fmt::Debug>::fmt", "Argument[0]", "ReturnValue", "taint", "df-generated"]
       - ["repo:https://github.com/rwf2/Rocket:rocket", "<crate::error::Error>::kind", "Argument[self].Field[crate::error::Error::kind]", "ReturnValue.Reference", "value", "dfc-generated"]
       - ["repo:https://github.com/rwf2/Rocket:rocket", "<crate::error::Error>::new", "Argument[0]", "ReturnValue.Field[crate::error::Error::kind]", "value", "dfc-generated"]
       - ["repo:https://github.com/rwf2/Rocket:rocket", "<crate::error::Error>::shutdown", "Argument[0]", "ReturnValue.Field[crate::error::Error::kind].Field[crate::error::ErrorKind::Shutdown(0)]", "value", "dfc-generated"]
+      - ["repo:https://github.com/rwf2/Rocket:rocket", "<crate::error::ErrorKind as crate::fmt::Display>::fmt", "Argument[0]", "ReturnValue", "taint", "df-generated"]
       - ["repo:https://github.com/rwf2/Rocket:rocket", "<crate::ext::CancellableIo>::io", "Argument[self].Field[crate::ext::CancellableIo::io].Field[crate::option::Option::Some(0)]", "ReturnValue.Field[crate::option::Option::Some(0)].Reference", "value", "dfc-generated"]
       - ["repo:https://github.com/rwf2/Rocket:rocket", "<crate::ext::CancellableIo>::new", "Argument[1]", "ReturnValue.Field[crate::ext::CancellableIo::io].Field[crate::option::Option::Some(0)]", "value", "dfc-generated"]
       - ["repo:https://github.com/rwf2/Rocket:rocket", "<crate::ext::CancellableIo>::new", "Argument[2]", "ReturnValue.Field[crate::ext::CancellableIo::grace]", "value", "dfc-generated"]
@@ -88,6 +136,18 @@ extensions:
       - ["repo:https://github.com/rwf2/Rocket:rocket", "<crate::ext::Join>::new", "Argument[0]", "ReturnValue.Field[crate::ext::Join::a]", "value", "dfc-generated"]
       - ["repo:https://github.com/rwf2/Rocket:rocket", "<crate::ext::Join>::new", "Argument[1]", "ReturnValue.Field[crate::ext::Join::b]", "value", "dfc-generated"]
       - ["repo:https://github.com/rwf2/Rocket:rocket", "<crate::fairing::ad_hoc::AdHoc as crate::fairing::Fairing>::info", "Argument[self].Field[crate::fairing::ad_hoc::AdHoc::name]", "ReturnValue.Field[crate::fairing::info_kind::Info::name]", "value", "dfc-generated"]
+      - ["repo:https://github.com/rwf2/Rocket:rocket", "<crate::fairing::ad_hoc::AdHoc as crate::fairing::Fairing>::on_ignite", "Argument[0]", "ReturnValue.Reference", "value", "dfc-generated"]
+      - ["repo:https://github.com/rwf2/Rocket:rocket", "<crate::fairing::ad_hoc::AdHoc as crate::fairing::Fairing>::on_ignite", "Argument[self]", "ReturnValue.Reference", "value", "dfc-generated"]
+      - ["repo:https://github.com/rwf2/Rocket:rocket", "<crate::fairing::ad_hoc::AdHoc as crate::fairing::Fairing>::on_liftoff", "Argument[0]", "ReturnValue.Reference", "value", "dfc-generated"]
+      - ["repo:https://github.com/rwf2/Rocket:rocket", "<crate::fairing::ad_hoc::AdHoc as crate::fairing::Fairing>::on_liftoff", "Argument[self]", "ReturnValue.Reference", "value", "dfc-generated"]
+      - ["repo:https://github.com/rwf2/Rocket:rocket", "<crate::fairing::ad_hoc::AdHoc as crate::fairing::Fairing>::on_request", "Argument[0]", "ReturnValue.Reference", "value", "dfc-generated"]
+      - ["repo:https://github.com/rwf2/Rocket:rocket", "<crate::fairing::ad_hoc::AdHoc as crate::fairing::Fairing>::on_request", "Argument[1]", "ReturnValue.Reference", "value", "dfc-generated"]
+      - ["repo:https://github.com/rwf2/Rocket:rocket", "<crate::fairing::ad_hoc::AdHoc as crate::fairing::Fairing>::on_request", "Argument[self]", "ReturnValue.Reference", "value", "dfc-generated"]
+      - ["repo:https://github.com/rwf2/Rocket:rocket", "<crate::fairing::ad_hoc::AdHoc as crate::fairing::Fairing>::on_response", "Argument[0]", "ReturnValue.Reference", "value", "dfc-generated"]
+      - ["repo:https://github.com/rwf2/Rocket:rocket", "<crate::fairing::ad_hoc::AdHoc as crate::fairing::Fairing>::on_response", "Argument[1]", "ReturnValue.Reference", "value", "dfc-generated"]
+      - ["repo:https://github.com/rwf2/Rocket:rocket", "<crate::fairing::ad_hoc::AdHoc as crate::fairing::Fairing>::on_response", "Argument[self]", "ReturnValue.Reference", "value", "dfc-generated"]
+      - ["repo:https://github.com/rwf2/Rocket:rocket", "<crate::fairing::ad_hoc::AdHoc as crate::fairing::Fairing>::on_shutdown", "Argument[0]", "ReturnValue.Reference", "value", "dfc-generated"]
+      - ["repo:https://github.com/rwf2/Rocket:rocket", "<crate::fairing::ad_hoc::AdHoc as crate::fairing::Fairing>::on_shutdown", "Argument[self]", "ReturnValue.Reference", "value", "dfc-generated"]
       - ["repo:https://github.com/rwf2/Rocket:rocket", "<crate::fairing::ad_hoc::AdHoc>::on_ignite", "Argument[0]", "ReturnValue.Field[crate::fairing::ad_hoc::AdHoc::name]", "value", "dfc-generated"]
       - ["repo:https://github.com/rwf2/Rocket:rocket", "<crate::fairing::ad_hoc::AdHoc>::on_liftoff", "Argument[0]", "ReturnValue.Field[crate::fairing::ad_hoc::AdHoc::name]", "value", "dfc-generated"]
       - ["repo:https://github.com/rwf2/Rocket:rocket", "<crate::fairing::ad_hoc::AdHoc>::on_request", "Argument[0]", "ReturnValue.Field[crate::fairing::ad_hoc::AdHoc::name]", "value", "dfc-generated"]
@@ -101,7 +161,11 @@ extensions:
       - ["repo:https://github.com/rwf2/Rocket:rocket", "<crate::form::context::Context>::push_error", "Argument[0].Field[crate::form::error::Error::kind].Field[crate::form::error::ErrorKind::Custom(0)]", "Argument[self].Field[crate::form::context::Context::status]", "value", "dfc-generated"]
       - ["repo:https://github.com/rwf2/Rocket:rocket", "<crate::form::context::Context>::status", "Argument[self].Field[crate::form::context::Context::status]", "ReturnValue", "value", "dfc-generated"]
       - ["repo:https://github.com/rwf2/Rocket:rocket", "<crate::form::context::Contextual as crate::form::from_form::FromForm>::finalize", "Argument[0].Field[1]", "ReturnValue.Field[crate::result::Result::Ok(0)].Field[crate::form::context::Contextual::context]", "value", "dfc-generated"]
+      - ["repo:https://github.com/rwf2/Rocket:rocket", "<crate::form::context::Contextual as crate::form::from_form::FromForm>::push_data", "Argument[0]", "ReturnValue.Reference", "value", "dfc-generated"]
+      - ["repo:https://github.com/rwf2/Rocket:rocket", "<crate::form::context::Contextual as crate::form::from_form::FromForm>::push_data", "Argument[1]", "ReturnValue.Reference", "value", "dfc-generated"]
+      - ["repo:https://github.com/rwf2/Rocket:rocket", "<crate::form::error::Entity as crate::fmt::Display>::fmt", "Argument[0]", "ReturnValue", "taint", "df-generated"]
       - ["repo:https://github.com/rwf2/Rocket:rocket", "<crate::form::error::Error as crate::ext::IntoOwned>::into_owned", "Argument[self]", "ReturnValue", "taint", "df-generated"]
+      - ["repo:https://github.com/rwf2/Rocket:rocket", "<crate::form::error::Error as crate::fmt::Display>::fmt", "Argument[0]", "ReturnValue", "taint", "df-generated"]
       - ["repo:https://github.com/rwf2/Rocket:rocket", "<crate::form::error::Error as crate::ops::deref::Deref>::deref", "Argument[self].Field[crate::form::error::Error::kind]", "ReturnValue.Reference", "value", "dfc-generated"]
       - ["repo:https://github.com/rwf2/Rocket:rocket", "<crate::form::error::Error>::set_entity", "Argument[0]", "Argument[self].Field[crate::form::error::Error::entity]", "value", "dfc-generated"]
       - ["repo:https://github.com/rwf2/Rocket:rocket", "<crate::form::error::Error>::status", "Argument[self].Field[crate::form::error::Error::kind].Field[crate::form::error::ErrorKind::Custom(0)]", "ReturnValue", "value", "dfc-generated"]
@@ -119,6 +183,7 @@ extensions:
       - ["repo:https://github.com/rwf2/Rocket:rocket", "<crate::form::error::ErrorKind as crate::convert::From>::from", "Argument[0]", "ReturnValue.Field[crate::form::error::ErrorKind::Custom(1)]", "value", "dfc-generated"]
       - ["repo:https://github.com/rwf2/Rocket:rocket", "<crate::form::error::ErrorKind as crate::convert::From>::from", "Argument[0]", "ReturnValue", "taint", "df-generated"]
       - ["repo:https://github.com/rwf2/Rocket:rocket", "<crate::form::error::ErrorKind as crate::ext::IntoOwned>::into_owned", "Argument[self]", "ReturnValue", "taint", "df-generated"]
+      - ["repo:https://github.com/rwf2/Rocket:rocket", "<crate::form::error::ErrorKind as crate::fmt::Display>::fmt", "Argument[0]", "ReturnValue", "taint", "df-generated"]
       - ["repo:https://github.com/rwf2/Rocket:rocket", "<crate::form::error::Errors as crate::convert::From>::from", "Argument[0]", "ReturnValue.Field[crate::form::error::Errors(0)]", "value", "dfc-generated"]
       - ["repo:https://github.com/rwf2/Rocket:rocket", "<crate::form::error::Errors as crate::ops::deref::Deref>::deref", "Argument[self].Field[0]", "ReturnValue.Reference", "value", "dfc-generated"]
       - ["repo:https://github.com/rwf2/Rocket:rocket", "<crate::form::error::Errors as crate::ops::deref::Deref>::deref", "Argument[self].Field[crate::form::error::Errors(0)]", "ReturnValue.Reference", "value", "dfc-generated"]
@@ -131,6 +196,8 @@ extensions:
       - ["repo:https://github.com/rwf2/Rocket:rocket", "<crate::form::field::ValueField>::from_value", "Argument[0]", "ReturnValue.Field[crate::form::field::ValueField::value]", "value", "dfc-generated"]
       - ["repo:https://github.com/rwf2/Rocket:rocket", "<crate::form::field::ValueField>::shift", "Argument[self]", "ReturnValue", "value", "dfc-generated"]
       - ["repo:https://github.com/rwf2/Rocket:rocket", "<crate::form::form::Form as crate::convert::From>::from", "Argument[0]", "ReturnValue.Field[crate::form::form::Form(0)]", "value", "dfc-generated"]
+      - ["repo:https://github.com/rwf2/Rocket:rocket", "<crate::form::form::Form as crate::data::from_data::FromData>::from_data", "Argument[0]", "ReturnValue.Reference", "value", "dfc-generated"]
+      - ["repo:https://github.com/rwf2/Rocket:rocket", "<crate::form::form::Form as crate::data::from_data::FromData>::from_data", "Argument[1]", "ReturnValue.Reference", "value", "dfc-generated"]
       - ["repo:https://github.com/rwf2/Rocket:rocket", "<crate::form::form::Form as crate::ops::deref::Deref>::deref", "Argument[self].Field[0]", "ReturnValue.Reference", "value", "dfc-generated"]
       - ["repo:https://github.com/rwf2/Rocket:rocket", "<crate::form::form::Form as crate::ops::deref::Deref>::deref", "Argument[self].Field[crate::form::form::Form(0)]", "ReturnValue.Reference", "value", "dfc-generated"]
       - ["repo:https://github.com/rwf2/Rocket:rocket", "<crate::form::form::Form as crate::ops::deref::DerefMut>::deref_mut", "Argument[self].Field[0]", "ReturnValue.Reference", "value", "dfc-generated"]
@@ -138,6 +205,8 @@ extensions:
       - ["repo:https://github.com/rwf2/Rocket:rocket", "<crate::form::form::Form>::into_inner", "Argument[self].Field[0]", "ReturnValue", "value", "dfc-generated"]
       - ["repo:https://github.com/rwf2/Rocket:rocket", "<crate::form::form::Form>::into_inner", "Argument[self].Field[crate::form::form::Form(0)]", "ReturnValue", "value", "dfc-generated"]
       - ["repo:https://github.com/rwf2/Rocket:rocket", "<crate::form::lenient::Lenient as crate::convert::From>::from", "Argument[0]", "ReturnValue.Field[crate::form::lenient::Lenient(0)]", "value", "dfc-generated"]
+      - ["repo:https://github.com/rwf2/Rocket:rocket", "<crate::form::lenient::Lenient as crate::form::from_form::FromForm>::push_data", "Argument[0]", "ReturnValue.Reference", "value", "dfc-generated"]
+      - ["repo:https://github.com/rwf2/Rocket:rocket", "<crate::form::lenient::Lenient as crate::form::from_form::FromForm>::push_data", "Argument[1]", "ReturnValue.Reference", "value", "dfc-generated"]
       - ["repo:https://github.com/rwf2/Rocket:rocket", "<crate::form::lenient::Lenient as crate::ops::deref::Deref>::deref", "Argument[self].Field[0]", "ReturnValue.Reference", "value", "dfc-generated"]
       - ["repo:https://github.com/rwf2/Rocket:rocket", "<crate::form::lenient::Lenient as crate::ops::deref::Deref>::deref", "Argument[self].Field[crate::form::lenient::Lenient(0)]", "ReturnValue.Reference", "value", "dfc-generated"]
       - ["repo:https://github.com/rwf2/Rocket:rocket", "<crate::form::lenient::Lenient as crate::ops::deref::DerefMut>::deref_mut", "Argument[self].Field[0]", "ReturnValue.Reference", "value", "dfc-generated"]
@@ -149,15 +218,19 @@ extensions:
       - ["repo:https://github.com/rwf2/Rocket:rocket", "<crate::form::name::buf::NameBuf as crate::convert::From>::from", "Argument[0].Field[1]", "ReturnValue.Field[crate::form::name::buf::NameBuf::right]", "value", "dfc-generated"]
       - ["repo:https://github.com/rwf2/Rocket:rocket", "<crate::form::name::buf::NameBuf as crate::convert::From>::from", "Argument[0].Field[crate::form::name::view::NameView::name].Element", "ReturnValue.Field[crate::form::name::buf::NameBuf::left].Reference", "value", "dfc-generated"]
       - ["repo:https://github.com/rwf2/Rocket:rocket", "<crate::form::name::buf::NameBuf as crate::convert::From>::from", "Argument[0]", "ReturnValue.Field[crate::form::name::buf::NameBuf::left]", "value", "dfc-generated"]
+      - ["repo:https://github.com/rwf2/Rocket:rocket", "<crate::form::name::key::Key as crate::fmt::Display>::fmt", "Argument[0]", "ReturnValue", "taint", "df-generated"]
       - ["repo:https://github.com/rwf2/Rocket:rocket", "<crate::form::name::key::Key as crate::ops::deref::Deref>::deref", "Argument[self].Field[0]", "ReturnValue.Reference", "value", "dfc-generated"]
       - ["repo:https://github.com/rwf2/Rocket:rocket", "<crate::form::name::key::Key as crate::ops::deref::Deref>::deref", "Argument[self].Field[crate::form::name::key::Key(0)]", "ReturnValue.Reference", "value", "dfc-generated"]
       - ["repo:https://github.com/rwf2/Rocket:rocket", "<crate::form::name::key::Key>::as_str", "Argument[self].Reference", "ReturnValue.Reference", "value", "dfc-generated"]
       - ["repo:https://github.com/rwf2/Rocket:rocket", "<crate::form::name::name::Name as crate::convert::AsRef>::as_ref", "Argument[self]", "ReturnValue", "value", "dfc-generated"]
+      - ["repo:https://github.com/rwf2/Rocket:rocket", "<crate::form::name::name::Name as crate::fmt::Display>::fmt", "Argument[0]", "ReturnValue", "taint", "df-generated"]
       - ["repo:https://github.com/rwf2/Rocket:rocket", "<crate::form::name::name::Name as crate::ops::deref::Deref>::deref", "Argument[self].Field[0]", "ReturnValue.Reference", "value", "dfc-generated"]
       - ["repo:https://github.com/rwf2/Rocket:rocket", "<crate::form::name::name::Name as crate::ops::deref::Deref>::deref", "Argument[self].Field[crate::form::name::name::Name(0)]", "ReturnValue.Reference", "value", "dfc-generated"]
       - ["repo:https://github.com/rwf2/Rocket:rocket", "<crate::form::name::name::Name>::as_str", "Argument[self].Field[0]", "ReturnValue.Reference", "value", "dfc-generated"]
       - ["repo:https://github.com/rwf2/Rocket:rocket", "<crate::form::name::name::Name>::as_str", "Argument[self].Field[crate::form::name::name::Name(0)]", "ReturnValue.Reference", "value", "dfc-generated"]
       - ["repo:https://github.com/rwf2/Rocket:rocket", "<crate::form::name::view::NameView as crate::borrow::Borrow>::borrow", "Argument[self].Field[crate::form::name::view::NameView::name].Element", "ReturnValue.Reference", "value", "dfc-generated"]
+      - ["repo:https://github.com/rwf2/Rocket:rocket", "<crate::form::name::view::NameView as crate::fmt::Debug>::fmt", "Argument[0]", "ReturnValue", "taint", "df-generated"]
+      - ["repo:https://github.com/rwf2/Rocket:rocket", "<crate::form::name::view::NameView as crate::fmt::Display>::fmt", "Argument[0]", "ReturnValue", "taint", "df-generated"]
       - ["repo:https://github.com/rwf2/Rocket:rocket", "<crate::form::name::view::NameView>::as_name", "Argument[self].Field[crate::form::name::view::NameView::name].Element", "ReturnValue.Reference", "value", "dfc-generated"]
       - ["repo:https://github.com/rwf2/Rocket:rocket", "<crate::form::name::view::NameView>::parent", "Argument[self].Field[crate::form::name::view::NameView::name].Element", "ReturnValue.Field[crate::option::Option::Some(0)].Reference", "value", "dfc-generated"]
       - ["repo:https://github.com/rwf2/Rocket:rocket", "<crate::form::name::view::NameView>::shift", "Argument[self].Field[crate::form::name::view::NameView::end]", "Argument[self].Reference.Field[crate::form::name::view::NameView::start]", "value", "dfc-generated"]
@@ -167,6 +240,8 @@ extensions:
       - ["repo:https://github.com/rwf2/Rocket:rocket", "<crate::form::parser::RawStrParser>::new", "Argument[0]", "ReturnValue.Field[crate::form::parser::RawStrParser::buffer]", "value", "dfc-generated"]
       - ["repo:https://github.com/rwf2/Rocket:rocket", "<crate::form::parser::RawStrParser>::new", "Argument[1]", "ReturnValue.Field[crate::form::parser::RawStrParser::source]", "value", "dfc-generated"]
       - ["repo:https://github.com/rwf2/Rocket:rocket", "<crate::form::strict::Strict as crate::convert::From>::from", "Argument[0]", "ReturnValue.Field[crate::form::strict::Strict(0)]", "value", "dfc-generated"]
+      - ["repo:https://github.com/rwf2/Rocket:rocket", "<crate::form::strict::Strict as crate::form::from_form::FromForm>::push_data", "Argument[0]", "ReturnValue.Reference", "value", "dfc-generated"]
+      - ["repo:https://github.com/rwf2/Rocket:rocket", "<crate::form::strict::Strict as crate::form::from_form::FromForm>::push_data", "Argument[1]", "ReturnValue.Reference", "value", "dfc-generated"]
       - ["repo:https://github.com/rwf2/Rocket:rocket", "<crate::form::strict::Strict as crate::ops::deref::Deref>::deref", "Argument[self].Field[0]", "ReturnValue.Reference", "value", "dfc-generated"]
       - ["repo:https://github.com/rwf2/Rocket:rocket", "<crate::form::strict::Strict as crate::ops::deref::Deref>::deref", "Argument[self].Field[crate::form::strict::Strict(0)]", "ReturnValue.Reference", "value", "dfc-generated"]
       - ["repo:https://github.com/rwf2/Rocket:rocket", "<crate::form::strict::Strict as crate::ops::deref::DerefMut>::deref_mut", "Argument[self].Field[0]", "ReturnValue.Reference", "value", "dfc-generated"]
@@ -184,12 +259,18 @@ extensions:
       - ["repo:https://github.com/rwf2/Rocket:rocket", "<crate::fs::named_file::NamedFile>::path", "Argument[self]", "ReturnValue", "taint", "df-generated"]
       - ["repo:https://github.com/rwf2/Rocket:rocket", "<crate::fs::named_file::NamedFile>::take_file", "Argument[self].Field[1]", "ReturnValue", "value", "dfc-generated"]
       - ["repo:https://github.com/rwf2/Rocket:rocket", "<crate::fs::named_file::NamedFile>::take_file", "Argument[self].Field[crate::fs::named_file::NamedFile(1)]", "ReturnValue", "value", "dfc-generated"]
+      - ["repo:https://github.com/rwf2/Rocket:rocket", "<crate::fs::server::FileServer as crate::route::handler::Handler>::handle", "Argument[0]", "ReturnValue.Reference", "value", "dfc-generated"]
+      - ["repo:https://github.com/rwf2/Rocket:rocket", "<crate::fs::server::FileServer as crate::route::handler::Handler>::handle", "Argument[1]", "ReturnValue.Reference", "value", "dfc-generated"]
+      - ["repo:https://github.com/rwf2/Rocket:rocket", "<crate::fs::server::FileServer as crate::route::handler::Handler>::handle", "Argument[self]", "ReturnValue.Reference", "value", "dfc-generated"]
       - ["repo:https://github.com/rwf2/Rocket:rocket", "<crate::fs::server::FileServer>::new", "Argument[1]", "ReturnValue.Field[crate::fs::server::FileServer::options]", "value", "dfc-generated"]
       - ["repo:https://github.com/rwf2/Rocket:rocket", "<crate::fs::server::FileServer>::rank", "Argument[0]", "Argument[self].Field[crate::fs::server::FileServer::rank]", "value", "dfc-generated"]
       - ["repo:https://github.com/rwf2/Rocket:rocket", "<crate::fs::server::FileServer>::rank", "Argument[0]", "ReturnValue.Field[crate::fs::server::FileServer::rank]", "value", "dfc-generated"]
       - ["repo:https://github.com/rwf2/Rocket:rocket", "<crate::fs::server::FileServer>::rank", "Argument[self]", "ReturnValue", "value", "dfc-generated"]
       - ["repo:https://github.com/rwf2/Rocket:rocket", "<crate::fs::server::Options as crate::ops::bit::BitOr>::bitor", "Argument[0]", "ReturnValue", "taint", "df-generated"]
       - ["repo:https://github.com/rwf2/Rocket:rocket", "<crate::fs::server::Options as crate::ops::bit::BitOr>::bitor", "Argument[self]", "ReturnValue", "taint", "df-generated"]
+      - ["repo:https://github.com/rwf2/Rocket:rocket", "<crate::fs::temp_file::TempFile as crate::data::from_data::FromData>::from_data", "Argument[0]", "ReturnValue.Reference", "value", "dfc-generated"]
+      - ["repo:https://github.com/rwf2/Rocket:rocket", "<crate::fs::temp_file::TempFile as crate::data::from_data::FromData>::from_data", "Argument[1]", "ReturnValue.Reference", "value", "dfc-generated"]
+      - ["repo:https://github.com/rwf2/Rocket:rocket", "<crate::fs::temp_file::TempFile as crate::form::from_form_field::FromFormField>::from_data", "Argument[0]", "ReturnValue.Reference", "value", "dfc-generated"]
       - ["repo:https://github.com/rwf2/Rocket:rocket", "<crate::fs::temp_file::TempFile as crate::form::validate::Len>::len", "Argument[self].Field[crate::fs::temp_file::TempFile::File::len].Reference", "ReturnValue", "value", "dfc-generated"]
       - ["repo:https://github.com/rwf2/Rocket:rocket", "<crate::fs::temp_file::TempFile as crate::form::validate::Len>::len_into_u64", "Argument[0]", "ReturnValue", "taint", "df-generated"]
       - ["repo:https://github.com/rwf2/Rocket:rocket", "<crate::fs::temp_file::TempFile>::len", "Argument[self].Field[crate::fs::temp_file::TempFile::File::len].Reference", "ReturnValue", "value", "dfc-generated"]
@@ -214,6 +295,7 @@ extensions:
       - ["repo:https://github.com/rwf2/Rocket:rocket", "<crate::local::asynchronous::request::LocalRequest>::remote", "Argument[self]", "ReturnValue", "value", "dfc-generated"]
       - ["repo:https://github.com/rwf2/Rocket:rocket", "<crate::local::asynchronous::response::LocalResponse>::_cookies", "Argument[self].Field[crate::local::asynchronous::response::LocalResponse::cookies]", "ReturnValue.Reference", "value", "dfc-generated"]
       - ["repo:https://github.com/rwf2/Rocket:rocket", "<crate::local::asynchronous::response::LocalResponse>::_response", "Argument[self].Field[crate::local::asynchronous::response::LocalResponse::response]", "ReturnValue.Reference", "value", "dfc-generated"]
+      - ["repo:https://github.com/rwf2/Rocket:rocket", "<crate::local::asynchronous::response::LocalResponse>::new", "Argument[0]", "ReturnValue.Reference", "value", "dfc-generated"]
       - ["repo:https://github.com/rwf2/Rocket:rocket", "<crate::local::asynchronous::response::LocalResponse>::new", "Argument[1]", "ReturnValue", "value", "dfc-generated"]
       - ["repo:https://github.com/rwf2/Rocket:rocket", "<crate::local::blocking::client::Client>::_test", "Argument[0].ReturnValue", "ReturnValue", "value", "dfc-generated"]
       - ["repo:https://github.com/rwf2/Rocket:rocket", "<crate::local::blocking::client::Client>::_with_raw_cookies", "Argument[0].ReturnValue", "ReturnValue", "value", "dfc-generated"]
@@ -226,25 +308,43 @@ extensions:
       - ["repo:https://github.com/rwf2/Rocket:rocket", "<crate::local::blocking::request::LocalRequest>::new", "Argument[0]", "ReturnValue.Field[crate::local::blocking::request::LocalRequest::client]", "value", "dfc-generated"]
       - ["repo:https://github.com/rwf2/Rocket:rocket", "<crate::local::blocking::request::LocalRequest>::private_cookie", "Argument[self]", "ReturnValue", "value", "dfc-generated"]
       - ["repo:https://github.com/rwf2/Rocket:rocket", "<crate::local::blocking::request::LocalRequest>::remote", "Argument[self]", "ReturnValue", "value", "dfc-generated"]
+      - ["repo:https://github.com/rwf2/Rocket:rocket", "<crate::local::blocking::response::LocalResponse as crate::io::Read>::read", "Argument[self]", "Argument[0]", "taint", "df-generated"]
       - ["repo:https://github.com/rwf2/Rocket:rocket", "<crate::local::blocking::response::LocalResponse>::_cookies", "Argument[self].Field[crate::local::blocking::response::LocalResponse::inner].Field[crate::local::asynchronous::response::LocalResponse::cookies]", "ReturnValue.Reference", "value", "dfc-generated"]
+      - ["repo:https://github.com/rwf2/Rocket:rocket", "<crate::method::Method as crate::request::from_request::FromRequest>::from_request", "Argument[0]", "ReturnValue.Reference", "value", "dfc-generated"]
       - ["repo:https://github.com/rwf2/Rocket:rocket", "<crate::net::ip_addr::IpAddr as crate::form::from_form_field::FromFormField>::from_value", "Argument[0]", "ReturnValue", "taint", "df-generated"]
       - ["repo:https://github.com/rwf2/Rocket:rocket", "<crate::net::ip_addr::IpAddr as crate::request::from_param::FromParam>::from_param", "Argument[0]", "ReturnValue.Field[crate::result::Result::Err(0)]", "value", "dfc-generated"]
+      - ["repo:https://github.com/rwf2/Rocket:rocket", "<crate::net::ip_addr::IpAddr as crate::request::from_request::FromRequest>::from_request", "Argument[0]", "ReturnValue.Reference", "value", "dfc-generated"]
       - ["repo:https://github.com/rwf2/Rocket:rocket", "<crate::net::ip_addr::Ipv4Addr as crate::form::from_form_field::FromFormField>::from_value", "Argument[0]", "ReturnValue", "taint", "df-generated"]
       - ["repo:https://github.com/rwf2/Rocket:rocket", "<crate::net::ip_addr::Ipv4Addr as crate::request::from_param::FromParam>::from_param", "Argument[0]", "ReturnValue.Field[crate::result::Result::Err(0)]", "value", "dfc-generated"]
       - ["repo:https://github.com/rwf2/Rocket:rocket", "<crate::net::ip_addr::Ipv6Addr as crate::form::from_form_field::FromFormField>::from_value", "Argument[0]", "ReturnValue", "taint", "df-generated"]
       - ["repo:https://github.com/rwf2/Rocket:rocket", "<crate::net::ip_addr::Ipv6Addr as crate::request::from_param::FromParam>::from_param", "Argument[0]", "ReturnValue.Field[crate::result::Result::Err(0)]", "value", "dfc-generated"]
       - ["repo:https://github.com/rwf2/Rocket:rocket", "<crate::net::socket_addr::SocketAddr as crate::form::from_form_field::FromFormField>::from_value", "Argument[0]", "ReturnValue", "taint", "df-generated"]
       - ["repo:https://github.com/rwf2/Rocket:rocket", "<crate::net::socket_addr::SocketAddr as crate::request::from_param::FromParam>::from_param", "Argument[0]", "ReturnValue.Field[crate::result::Result::Err(0)]", "value", "dfc-generated"]
+      - ["repo:https://github.com/rwf2/Rocket:rocket", "<crate::net::socket_addr::SocketAddr as crate::request::from_request::FromRequest>::from_request", "Argument[0]", "ReturnValue.Reference", "value", "dfc-generated"]
       - ["repo:https://github.com/rwf2/Rocket:rocket", "<crate::net::socket_addr::SocketAddrV4 as crate::form::from_form_field::FromFormField>::from_value", "Argument[0]", "ReturnValue", "taint", "df-generated"]
       - ["repo:https://github.com/rwf2/Rocket:rocket", "<crate::net::socket_addr::SocketAddrV4 as crate::request::from_param::FromParam>::from_param", "Argument[0]", "ReturnValue.Field[crate::result::Result::Err(0)]", "value", "dfc-generated"]
       - ["repo:https://github.com/rwf2/Rocket:rocket", "<crate::net::socket_addr::SocketAddrV6 as crate::form::from_form_field::FromFormField>::from_value", "Argument[0]", "ReturnValue", "taint", "df-generated"]
       - ["repo:https://github.com/rwf2/Rocket:rocket", "<crate::net::socket_addr::SocketAddrV6 as crate::request::from_param::FromParam>::from_param", "Argument[0]", "ReturnValue.Field[crate::result::Result::Err(0)]", "value", "dfc-generated"]
       - ["repo:https://github.com/rwf2/Rocket:rocket", "<crate::num::nonzero::NonZero as crate::form::from_form_field::FromFormField>::from_value", "Argument[0]", "ReturnValue", "taint", "df-generated"]
       - ["repo:https://github.com/rwf2/Rocket:rocket", "<crate::num::nonzero::NonZero as crate::request::from_param::FromParam>::from_param", "Argument[0]", "ReturnValue.Field[crate::result::Result::Err(0)]", "value", "dfc-generated"]
+      - ["repo:https://github.com/rwf2/Rocket:rocket", "<crate::ops::range::Range as crate::form::from_form::FromForm>::push_data", "Argument[0]", "ReturnValue.Reference", "value", "dfc-generated"]
+      - ["repo:https://github.com/rwf2/Rocket:rocket", "<crate::ops::range::Range as crate::form::from_form::FromForm>::push_data", "Argument[1]", "ReturnValue.Reference", "value", "dfc-generated"]
+      - ["repo:https://github.com/rwf2/Rocket:rocket", "<crate::ops::range::RangeFrom as crate::form::from_form::FromForm>::push_data", "Argument[0]", "ReturnValue.Reference", "value", "dfc-generated"]
+      - ["repo:https://github.com/rwf2/Rocket:rocket", "<crate::ops::range::RangeFrom as crate::form::from_form::FromForm>::push_data", "Argument[1]", "ReturnValue.Reference", "value", "dfc-generated"]
+      - ["repo:https://github.com/rwf2/Rocket:rocket", "<crate::ops::range::RangeTo as crate::form::from_form::FromForm>::push_data", "Argument[0]", "ReturnValue.Reference", "value", "dfc-generated"]
+      - ["repo:https://github.com/rwf2/Rocket:rocket", "<crate::ops::range::RangeTo as crate::form::from_form::FromForm>::push_data", "Argument[1]", "ReturnValue.Reference", "value", "dfc-generated"]
+      - ["repo:https://github.com/rwf2/Rocket:rocket", "<crate::ops::range::RangeToInclusive as crate::form::from_form::FromForm>::push_data", "Argument[0]", "ReturnValue.Reference", "value", "dfc-generated"]
+      - ["repo:https://github.com/rwf2/Rocket:rocket", "<crate::ops::range::RangeToInclusive as crate::form::from_form::FromForm>::push_data", "Argument[1]", "ReturnValue.Reference", "value", "dfc-generated"]
+      - ["repo:https://github.com/rwf2/Rocket:rocket", "<crate::option::Option as crate::data::from_data::FromData>::from_data", "Argument[0]", "ReturnValue.Reference", "value", "dfc-generated"]
+      - ["repo:https://github.com/rwf2/Rocket:rocket", "<crate::option::Option as crate::data::from_data::FromData>::from_data", "Argument[1]", "ReturnValue.Reference", "value", "dfc-generated"]
+      - ["repo:https://github.com/rwf2/Rocket:rocket", "<crate::option::Option as crate::form::from_form::FromForm>::push_data", "Argument[0]", "ReturnValue.Reference", "value", "dfc-generated"]
+      - ["repo:https://github.com/rwf2/Rocket:rocket", "<crate::option::Option as crate::form::from_form::FromForm>::push_data", "Argument[1]", "ReturnValue.Reference", "value", "dfc-generated"]
       - ["repo:https://github.com/rwf2/Rocket:rocket", "<crate::option::Option as crate::outcome::IntoOutcome>::or_error", "Argument[0]", "ReturnValue.Field[crate::outcome::Outcome::Error(0)]", "value", "dfc-generated"]
       - ["repo:https://github.com/rwf2/Rocket:rocket", "<crate::option::Option as crate::outcome::IntoOutcome>::or_error", "Argument[self].Field[crate::option::Option::Some(0)]", "ReturnValue.Field[crate::outcome::Outcome::Success(0)]", "value", "dfc-generated"]
       - ["repo:https://github.com/rwf2/Rocket:rocket", "<crate::option::Option as crate::outcome::IntoOutcome>::or_forward", "Argument[0]", "ReturnValue.Field[crate::outcome::Outcome::Forward(0)]", "value", "dfc-generated"]
       - ["repo:https://github.com/rwf2/Rocket:rocket", "<crate::option::Option as crate::outcome::IntoOutcome>::or_forward", "Argument[self].Field[crate::option::Option::Some(0)]", "ReturnValue.Field[crate::outcome::Outcome::Success(0)]", "value", "dfc-generated"]
+      - ["repo:https://github.com/rwf2/Rocket:rocket", "<crate::option::Option as crate::request::from_request::FromRequest>::from_request", "Argument[0]", "ReturnValue.Reference", "value", "dfc-generated"]
+      - ["repo:https://github.com/rwf2/Rocket:rocket", "<crate::outcome::Outcome as crate::request::from_request::FromRequest>::from_request", "Argument[0]", "ReturnValue.Reference", "value", "dfc-generated"]
       - ["repo:https://github.com/rwf2/Rocket:rocket", "<crate::outcome::Outcome>::and_then", "Argument[0].ReturnValue", "ReturnValue", "value", "dfc-generated"]
       - ["repo:https://github.com/rwf2/Rocket:rocket", "<crate::outcome::Outcome>::and_then", "Argument[self].Field[crate::outcome::Outcome::Error(0)]", "ReturnValue.Field[crate::outcome::Outcome::Error(0)]", "value", "dfc-generated"]
       - ["repo:https://github.com/rwf2/Rocket:rocket", "<crate::outcome::Outcome>::and_then", "Argument[self].Field[crate::outcome::Outcome::Forward(0)]", "ReturnValue.Field[crate::outcome::Outcome::Forward(0)]", "value", "dfc-generated"]
@@ -287,6 +387,7 @@ extensions:
       - ["repo:https://github.com/rwf2/Rocket:rocket", "<crate::outcome::Outcome>::ok_map_forward", "Argument[self].Field[crate::outcome::Outcome::Error(0)]", "ReturnValue.Field[crate::result::Result::Err(0)]", "value", "dfc-generated"]
       - ["repo:https://github.com/rwf2/Rocket:rocket", "<crate::outcome::Outcome>::ok_map_forward", "Argument[self].Field[crate::outcome::Outcome::Forward(0)]", "Argument[0].Parameter[0]", "value", "dfc-generated"]
       - ["repo:https://github.com/rwf2/Rocket:rocket", "<crate::outcome::Outcome>::ok_map_forward", "Argument[self].Field[crate::outcome::Outcome::Success(0)]", "ReturnValue.Field[crate::result::Result::Ok(0)]", "value", "dfc-generated"]
+      - ["repo:https://github.com/rwf2/Rocket:rocket", "<crate::outcome::Outcome>::pin", "Argument[self]", "ReturnValue.Reference", "value", "dfc-generated"]
       - ["repo:https://github.com/rwf2/Rocket:rocket", "<crate::outcome::Outcome>::succeeded", "Argument[self].Field[crate::outcome::Outcome::Success(0)]", "ReturnValue.Field[crate::option::Option::Some(0)]", "value", "dfc-generated"]
       - ["repo:https://github.com/rwf2/Rocket:rocket", "<crate::outcome::Outcome>::success_or", "Argument[0]", "ReturnValue.Field[crate::result::Result::Err(0)]", "value", "dfc-generated"]
       - ["repo:https://github.com/rwf2/Rocket:rocket", "<crate::outcome::Outcome>::success_or", "Argument[self].Field[crate::outcome::Outcome::Success(0)]", "ReturnValue.Field[crate::result::Result::Ok(0)]", "value", "dfc-generated"]
@@ -308,14 +409,17 @@ extensions:
       - ["repo:https://github.com/rwf2/Rocket:rocket", "<crate::request::request::Request>::new", "Argument[2]", "ReturnValue.Field[crate::request::request::Request::uri]", "value", "dfc-generated"]
       - ["repo:https://github.com/rwf2/Rocket:rocket", "<crate::request::request::Request>::remote", "Argument[self].Field[crate::request::request::Request::connection].Field[crate::request::request::ConnectionMeta::remote]", "ReturnValue", "value", "dfc-generated"]
       - ["repo:https://github.com/rwf2/Rocket:rocket", "<crate::request::request::Request>::rocket", "Argument[self].Field[crate::request::request::Request::state].Field[crate::request::request::RequestState::rocket]", "ReturnValue.Reference", "value", "dfc-generated"]
+      - ["repo:https://github.com/rwf2/Rocket:rocket", "<crate::request::request::Request>::routed_segments", "Argument[0]", "ReturnValue", "taint", "df-generated"]
       - ["repo:https://github.com/rwf2/Rocket:rocket", "<crate::request::request::Request>::set_uri", "Argument[0]", "Argument[self].Field[crate::request::request::Request::uri]", "value", "dfc-generated"]
       - ["repo:https://github.com/rwf2/Rocket:rocket", "<crate::request::request::Request>::uri", "Argument[self].Field[crate::request::request::Request::uri]", "ReturnValue.Reference", "value", "dfc-generated"]
       - ["repo:https://github.com/rwf2/Rocket:rocket", "<crate::response::body::Body>::max_chunk_size", "Argument[self].Field[crate::response::body::Body::max_chunk]", "ReturnValue", "value", "dfc-generated"]
       - ["repo:https://github.com/rwf2/Rocket:rocket", "<crate::response::body::Body>::preset_size", "Argument[self].Field[crate::response::body::Body::size]", "ReturnValue", "value", "dfc-generated"]
       - ["repo:https://github.com/rwf2/Rocket:rocket", "<crate::response::body::Body>::set_max_chunk_size", "Argument[0]", "Argument[self].Field[crate::response::body::Body::max_chunk]", "value", "dfc-generated"]
-      - ["repo:https://github.com/rwf2/Rocket:rocket", "<crate::response::body::Body>::take", "Argument[self].Reference", "ReturnValue", "value", "dfc-generated"]
+      - ["repo:https://github.com/rwf2/Rocket:rocket", "<crate::response::body::Body>::to_bytes", "Argument[self]", "ReturnValue", "taint", "df-generated"]
       - ["repo:https://github.com/rwf2/Rocket:rocket", "<crate::response::body::Body>::with_sized", "Argument[1]", "ReturnValue.Field[crate::response::body::Body::size]", "value", "dfc-generated"]
+      - ["repo:https://github.com/rwf2/Rocket:rocket", "<crate::response::body::Body>::with_unsized", "Argument[0]", "ReturnValue", "taint", "df-generated"]
       - ["repo:https://github.com/rwf2/Rocket:rocket", "<crate::response::debug::Debug as crate::convert::From>::from", "Argument[0]", "ReturnValue.Field[crate::response::debug::Debug(0)]", "value", "dfc-generated"]
+      - ["repo:https://github.com/rwf2/Rocket:rocket", "<crate::response::flash::Flash as crate::request::from_request::FromRequest>::from_request", "Argument[0]", "ReturnValue.Reference", "value", "dfc-generated"]
       - ["repo:https://github.com/rwf2/Rocket:rocket", "<crate::response::flash::Flash>::error", "Argument[0]", "ReturnValue.Field[crate::response::flash::Flash::inner]", "value", "dfc-generated"]
       - ["repo:https://github.com/rwf2/Rocket:rocket", "<crate::response::flash::Flash>::into_inner", "Argument[self].Field[crate::response::flash::Flash::kind]", "ReturnValue.Field[0]", "value", "dfc-generated"]
       - ["repo:https://github.com/rwf2/Rocket:rocket", "<crate::response::flash::Flash>::into_inner", "Argument[self].Field[crate::response::flash::Flash::message]", "ReturnValue.Field[1]", "value", "dfc-generated"]
@@ -324,7 +428,6 @@ extensions:
       - ["repo:https://github.com/rwf2/Rocket:rocket", "<crate::response::flash::Flash>::new", "Argument[0]", "ReturnValue.Field[crate::response::flash::Flash::inner]", "value", "dfc-generated"]
       - ["repo:https://github.com/rwf2/Rocket:rocket", "<crate::response::flash::Flash>::success", "Argument[0]", "ReturnValue.Field[crate::response::flash::Flash::inner]", "value", "dfc-generated"]
       - ["repo:https://github.com/rwf2/Rocket:rocket", "<crate::response::flash::Flash>::warning", "Argument[0]", "ReturnValue.Field[crate::response::flash::Flash::inner]", "value", "dfc-generated"]
-      - ["repo:https://github.com/rwf2/Rocket:rocket", "<crate::response::response::Builder>::finalize", "Argument[self].Field[crate::response::response::Builder::response]", "ReturnValue", "value", "dfc-generated"]
       - ["repo:https://github.com/rwf2/Rocket:rocket", "<crate::response::response::Builder>::header", "Argument[self]", "ReturnValue", "value", "dfc-generated"]
       - ["repo:https://github.com/rwf2/Rocket:rocket", "<crate::response::response::Builder>::header_adjoin", "Argument[self]", "ReturnValue", "value", "dfc-generated"]
       - ["repo:https://github.com/rwf2/Rocket:rocket", "<crate::response::response::Builder>::join", "Argument[self]", "ReturnValue", "value", "dfc-generated"]
@@ -333,7 +436,6 @@ extensions:
       - ["repo:https://github.com/rwf2/Rocket:rocket", "<crate::response::response::Builder>::merge", "Argument[0].Field[crate::response::response::Response::body]", "ReturnValue.Field[crate::response::response::Builder::response].Field[crate::response::response::Response::body]", "value", "dfc-generated"]
       - ["repo:https://github.com/rwf2/Rocket:rocket", "<crate::response::response::Builder>::merge", "Argument[self]", "ReturnValue", "value", "dfc-generated"]
       - ["repo:https://github.com/rwf2/Rocket:rocket", "<crate::response::response::Builder>::new", "Argument[0]", "ReturnValue.Field[crate::response::response::Builder::response]", "value", "dfc-generated"]
-      - ["repo:https://github.com/rwf2/Rocket:rocket", "<crate::response::response::Builder>::ok", "Argument[self].Field[crate::response::response::Builder::response]", "ReturnValue.Field[crate::result::Result::Ok(0)]", "value", "dfc-generated"]
       - ["repo:https://github.com/rwf2/Rocket:rocket", "<crate::response::response::Builder>::raw_header", "Argument[self]", "ReturnValue", "value", "dfc-generated"]
       - ["repo:https://github.com/rwf2/Rocket:rocket", "<crate::response::response::Builder>::raw_header_adjoin", "Argument[self]", "ReturnValue", "value", "dfc-generated"]
       - ["repo:https://github.com/rwf2/Rocket:rocket", "<crate::response::response::Builder>::sized_body", "Argument[self]", "ReturnValue", "value", "dfc-generated"]
@@ -353,7 +455,6 @@ extensions:
       - ["repo:https://github.com/rwf2/Rocket:rocket", "<crate::response::status::Created>::tagged_body", "Argument[self]", "ReturnValue", "value", "dfc-generated"]
       - ["repo:https://github.com/rwf2/Rocket:rocket", "<crate::response::stream::bytes::ByteStream as crate::convert::From>::from", "Argument[0]", "ReturnValue.Field[crate::response::stream::bytes::ByteStream(0)]", "value", "dfc-generated"]
       - ["repo:https://github.com/rwf2/Rocket:rocket", "<crate::response::stream::one::One as crate::convert::From>::from", "Argument[0]", "ReturnValue.Field[crate::response::stream::one::One(0)].Field[crate::option::Option::Some(0)]", "value", "dfc-generated"]
-      - ["repo:https://github.com/rwf2/Rocket:rocket", "<crate::response::stream::one::One as crate::stream::Stream>::poll_next", "Argument[self].Field[0].Reference", "ReturnValue", "value", "dfc-generated"]
       - ["repo:https://github.com/rwf2/Rocket:rocket", "<crate::response::stream::reader::ReaderStream as crate::convert::From>::from", "Argument[0]", "ReturnValue.Field[crate::response::stream::reader::ReaderStream::stream]", "value", "dfc-generated"]
       - ["repo:https://github.com/rwf2/Rocket:rocket", "<crate::response::stream::sse::Event>::event", "Argument[self]", "ReturnValue", "value", "dfc-generated"]
       - ["repo:https://github.com/rwf2/Rocket:rocket", "<crate::response::stream::sse::Event>::id", "Argument[self]", "ReturnValue", "value", "dfc-generated"]
@@ -366,6 +467,11 @@ extensions:
       - ["repo:https://github.com/rwf2/Rocket:rocket", "<crate::response::stream::sse::EventStream as crate::convert::From>::from", "Argument[0]", "ReturnValue.Field[crate::response::stream::sse::EventStream::stream]", "value", "dfc-generated"]
       - ["repo:https://github.com/rwf2/Rocket:rocket", "<crate::response::stream::sse::EventStream>::heartbeat", "Argument[self]", "ReturnValue", "value", "dfc-generated"]
       - ["repo:https://github.com/rwf2/Rocket:rocket", "<crate::response::stream::text::TextStream as crate::convert::From>::from", "Argument[0]", "ReturnValue.Field[crate::response::stream::text::TextStream(0)]", "value", "dfc-generated"]
+      - ["repo:https://github.com/rwf2/Rocket:rocket", "<crate::result::Result as crate::data::from_data::FromData>::from_data", "Argument[0]", "ReturnValue.Reference", "value", "dfc-generated"]
+      - ["repo:https://github.com/rwf2/Rocket:rocket", "<crate::result::Result as crate::data::from_data::FromData>::from_data", "Argument[1]", "ReturnValue.Reference", "value", "dfc-generated"]
+      - ["repo:https://github.com/rwf2/Rocket:rocket", "<crate::result::Result as crate::form::from_form::FromForm>::push_data", "Argument[0]", "ReturnValue.Reference", "value", "dfc-generated"]
+      - ["repo:https://github.com/rwf2/Rocket:rocket", "<crate::result::Result as crate::form::from_form::FromForm>::push_data", "Argument[1]", "ReturnValue.Reference", "value", "dfc-generated"]
+      - ["repo:https://github.com/rwf2/Rocket:rocket", "<crate::result::Result as crate::form::validate::Contains>::contains", "Argument[0]", "ReturnValue.Field[1]", "value", "dfc-generated"]
       - ["repo:https://github.com/rwf2/Rocket:rocket", "<crate::result::Result as crate::outcome::IntoOutcome>::or_error", "Argument[0]", "ReturnValue.Field[crate::outcome::Outcome::Error(0)].Field[0]", "value", "dfc-generated"]
       - ["repo:https://github.com/rwf2/Rocket:rocket", "<crate::result::Result as crate::outcome::IntoOutcome>::or_error", "Argument[self].Field[crate::result::Result::Err(0)]", "ReturnValue.Field[crate::outcome::Outcome::Error(0)].Field[1]", "value", "dfc-generated"]
       - ["repo:https://github.com/rwf2/Rocket:rocket", "<crate::result::Result as crate::outcome::IntoOutcome>::or_error", "Argument[self].Field[crate::result::Result::Err(0)]", "ReturnValue.Field[crate::outcome::Outcome::Error(0)]", "value", "dfc-generated"]
@@ -374,6 +480,7 @@ extensions:
       - ["repo:https://github.com/rwf2/Rocket:rocket", "<crate::result::Result as crate::outcome::IntoOutcome>::or_forward", "Argument[0].Field[1]", "ReturnValue.Field[crate::outcome::Outcome::Forward(0)].Field[1]", "value", "dfc-generated"]
       - ["repo:https://github.com/rwf2/Rocket:rocket", "<crate::result::Result as crate::outcome::IntoOutcome>::or_forward", "Argument[0]", "ReturnValue.Field[crate::outcome::Outcome::Forward(0)]", "value", "dfc-generated"]
       - ["repo:https://github.com/rwf2/Rocket:rocket", "<crate::result::Result as crate::outcome::IntoOutcome>::or_forward", "Argument[self].Field[crate::result::Result::Ok(0)]", "ReturnValue.Field[crate::outcome::Outcome::Success(0)]", "value", "dfc-generated"]
+      - ["repo:https://github.com/rwf2/Rocket:rocket", "<crate::result::Result as crate::request::from_request::FromRequest>::from_request", "Argument[0]", "ReturnValue.Reference", "value", "dfc-generated"]
       - ["repo:https://github.com/rwf2/Rocket:rocket", "<crate::rkt::Rocket as crate::convert::From>::from", "Argument[0]", "ReturnValue.Field[crate::rkt::Rocket(0)]", "value", "dfc-generated"]
       - ["repo:https://github.com/rwf2/Rocket:rocket", "<crate::rkt::Rocket as crate::ops::deref::Deref>::deref", "Argument[self].Field[0]", "ReturnValue.Reference", "value", "dfc-generated"]
       - ["repo:https://github.com/rwf2/Rocket:rocket", "<crate::rkt::Rocket as crate::ops::deref::Deref>::deref", "Argument[self].Field[crate::rkt::Rocket(0)]", "ReturnValue.Reference", "value", "dfc-generated"]
@@ -383,19 +490,24 @@ extensions:
       - ["repo:https://github.com/rwf2/Rocket:rocket", "<crate::rkt::Rocket>::configure", "Argument[self]", "ReturnValue", "value", "dfc-generated"]
       - ["repo:https://github.com/rwf2/Rocket:rocket", "<crate::rkt::Rocket>::default_tcp_http_server", "Argument[self]", "Argument[0].Parameter[0].Reference", "value", "dfc-generated"]
       - ["repo:https://github.com/rwf2/Rocket:rocket", "<crate::rkt::Rocket>::manage", "Argument[self]", "ReturnValue", "value", "dfc-generated"]
-      - ["repo:https://github.com/rwf2/Rocket:rocket", "<crate::route::route::Route as crate::convert::From>::from", "Argument[0].Field[crate::route::route::StaticInfo::format]", "ReturnValue.Field[crate::route::route::Route::format]", "value", "dfc-generated"]
-      - ["repo:https://github.com/rwf2/Rocket:rocket", "<crate::route::route::Route as crate::convert::From>::from", "Argument[0].Field[crate::route::route::StaticInfo::method]", "ReturnValue.Field[crate::route::route::Route::method]", "value", "dfc-generated"]
-      - ["repo:https://github.com/rwf2/Rocket:rocket", "<crate::route::route::Route as crate::convert::From>::from", "Argument[0].Field[crate::route::route::StaticInfo::rank].Field[crate::option::Option::Some(0)]", "ReturnValue.Field[crate::route::route::Route::rank]", "value", "dfc-generated"]
+      - ["repo:https://github.com/rwf2/Rocket:rocket", "<crate::rkt::Rocket>::mount", "Argument[self]", "ReturnValue", "value", "dfc-generated"]
+      - ["repo:https://github.com/rwf2/Rocket:rocket", "<crate::rkt::Rocket>::register", "Argument[self]", "ReturnValue", "value", "dfc-generated"]
+      - ["repo:https://github.com/rwf2/Rocket:rocket", "<crate::route::route::Route as crate::convert::From>::from", "Argument[0]", "ReturnValue", "taint", "df-generated"]
       - ["repo:https://github.com/rwf2/Rocket:rocket", "<crate::route::route::Route>::map_base", "Argument[self].Field[crate::route::route::Route::uri].Field[crate::route::uri::RouteUri::base]", "Argument[0].Parameter[0]", "value", "dfc-generated"]
       - ["repo:https://github.com/rwf2/Rocket:rocket", "<crate::route::route::Route>::map_base", "Argument[self]", "ReturnValue.Field[crate::result::Result::Ok(0)]", "value", "dfc-generated"]
       - ["repo:https://github.com/rwf2/Rocket:rocket", "<crate::route::route::Route>::new", "Argument[0]", "ReturnValue.Field[crate::route::route::Route::method]", "value", "dfc-generated"]
+      - ["repo:https://github.com/rwf2/Rocket:rocket", "<crate::route::route::Route>::new", "Argument[2]", "ReturnValue.Field[crate::route::route::Route::handler].Reference", "value", "dfc-generated"]
       - ["repo:https://github.com/rwf2/Rocket:rocket", "<crate::route::route::Route>::ranked", "Argument[1]", "ReturnValue.Field[crate::route::route::Route::method]", "value", "dfc-generated"]
+      - ["repo:https://github.com/rwf2/Rocket:rocket", "<crate::route::route::Route>::ranked", "Argument[3]", "ReturnValue.Field[crate::route::route::Route::handler].Reference", "value", "dfc-generated"]
       - ["repo:https://github.com/rwf2/Rocket:rocket", "<crate::route::segment::Segment>::from", "Argument[0]", "ReturnValue", "taint", "df-generated"]
       - ["repo:https://github.com/rwf2/Rocket:rocket", "<crate::route::uri::RouteUri as crate::ops::deref::Deref>::deref", "Argument[self].Field[crate::route::uri::RouteUri::origin]", "ReturnValue.Reference", "value", "dfc-generated"]
       - ["repo:https://github.com/rwf2/Rocket:rocket", "<crate::route::uri::RouteUri>::as_str", "Argument[self].Field[crate::route::uri::RouteUri::source]", "ReturnValue.Reference", "value", "dfc-generated"]
       - ["repo:https://github.com/rwf2/Rocket:rocket", "<crate::route::uri::RouteUri>::default_rank", "Argument[self]", "ReturnValue", "taint", "df-generated"]
       - ["repo:https://github.com/rwf2/Rocket:rocket", "<crate::route::uri::RouteUri>::query", "Argument[self]", "ReturnValue", "taint", "df-generated"]
       - ["repo:https://github.com/rwf2/Rocket:rocket", "<crate::serde::json::Json as crate::convert::From>::from", "Argument[0]", "ReturnValue.Field[crate::serde::json::Json(0)]", "value", "dfc-generated"]
+      - ["repo:https://github.com/rwf2/Rocket:rocket", "<crate::serde::json::Json as crate::data::from_data::FromData>::from_data", "Argument[0]", "ReturnValue.Reference", "value", "dfc-generated"]
+      - ["repo:https://github.com/rwf2/Rocket:rocket", "<crate::serde::json::Json as crate::data::from_data::FromData>::from_data", "Argument[1]", "ReturnValue.Reference", "value", "dfc-generated"]
+      - ["repo:https://github.com/rwf2/Rocket:rocket", "<crate::serde::json::Json as crate::form::from_form_field::FromFormField>::from_data", "Argument[0]", "ReturnValue.Reference", "value", "dfc-generated"]
       - ["repo:https://github.com/rwf2/Rocket:rocket", "<crate::serde::json::Json as crate::ops::deref::Deref>::deref", "Argument[self].Field[0]", "ReturnValue.Reference", "value", "dfc-generated"]
       - ["repo:https://github.com/rwf2/Rocket:rocket", "<crate::serde::json::Json as crate::ops::deref::Deref>::deref", "Argument[self].Field[crate::serde::json::Json(0)]", "ReturnValue.Reference", "value", "dfc-generated"]
       - ["repo:https://github.com/rwf2/Rocket:rocket", "<crate::serde::json::Json as crate::ops::deref::DerefMut>::deref_mut", "Argument[self].Field[0]", "ReturnValue.Reference", "value", "dfc-generated"]
@@ -405,29 +517,60 @@ extensions:
       - ["repo:https://github.com/rwf2/Rocket:rocket", "<crate::serde::json::Json>::into_inner", "Argument[self].Field[0]", "ReturnValue", "value", "dfc-generated"]
       - ["repo:https://github.com/rwf2/Rocket:rocket", "<crate::serde::json::Json>::into_inner", "Argument[self].Field[crate::serde::json::Json(0)]", "ReturnValue", "value", "dfc-generated"]
       - ["repo:https://github.com/rwf2/Rocket:rocket", "<crate::serde::msgpack::MsgPack as crate::convert::From>::from", "Argument[0]", "ReturnValue.Field[crate::serde::msgpack::MsgPack(0)]", "value", "dfc-generated"]
+      - ["repo:https://github.com/rwf2/Rocket:rocket", "<crate::serde::msgpack::MsgPack as crate::data::from_data::FromData>::from_data", "Argument[0]", "ReturnValue.Reference", "value", "dfc-generated"]
+      - ["repo:https://github.com/rwf2/Rocket:rocket", "<crate::serde::msgpack::MsgPack as crate::data::from_data::FromData>::from_data", "Argument[1]", "ReturnValue.Reference", "value", "dfc-generated"]
+      - ["repo:https://github.com/rwf2/Rocket:rocket", "<crate::serde::msgpack::MsgPack as crate::form::from_form_field::FromFormField>::from_data", "Argument[0]", "ReturnValue.Reference", "value", "dfc-generated"]
       - ["repo:https://github.com/rwf2/Rocket:rocket", "<crate::serde::msgpack::MsgPack as crate::ops::deref::Deref>::deref", "Argument[self].Field[0]", "ReturnValue.Reference", "value", "dfc-generated"]
       - ["repo:https://github.com/rwf2/Rocket:rocket", "<crate::serde::msgpack::MsgPack as crate::ops::deref::Deref>::deref", "Argument[self].Field[crate::serde::msgpack::MsgPack(0)]", "ReturnValue.Reference", "value", "dfc-generated"]
       - ["repo:https://github.com/rwf2/Rocket:rocket", "<crate::serde::msgpack::MsgPack as crate::ops::deref::DerefMut>::deref_mut", "Argument[self].Field[0]", "ReturnValue.Reference", "value", "dfc-generated"]
       - ["repo:https://github.com/rwf2/Rocket:rocket", "<crate::serde::msgpack::MsgPack as crate::ops::deref::DerefMut>::deref_mut", "Argument[self].Field[crate::serde::msgpack::MsgPack(0)]", "ReturnValue.Reference", "value", "dfc-generated"]
       - ["repo:https://github.com/rwf2/Rocket:rocket", "<crate::serde::msgpack::MsgPack>::into_inner", "Argument[self].Field[0]", "ReturnValue", "value", "dfc-generated"]
       - ["repo:https://github.com/rwf2/Rocket:rocket", "<crate::serde::msgpack::MsgPack>::into_inner", "Argument[self].Field[crate::serde::msgpack::MsgPack(0)]", "ReturnValue", "value", "dfc-generated"]
+      - ["repo:https://github.com/rwf2/Rocket:rocket", "<crate::shield::policy::Feature as crate::fmt::Display>::fmt", "Argument[0]", "ReturnValue", "taint", "df-generated"]
       - ["repo:https://github.com/rwf2/Rocket:rocket", "<crate::shield::policy::Permission>::allow", "Argument[self]", "ReturnValue", "value", "dfc-generated"]
       - ["repo:https://github.com/rwf2/Rocket:rocket", "<crate::shield::policy::Permission>::block", "Argument[self]", "ReturnValue", "value", "dfc-generated"]
+      - ["repo:https://github.com/rwf2/Rocket:rocket", "<crate::shield::shield::Shield as crate::fairing::Fairing>::on_liftoff", "Argument[0]", "ReturnValue.Reference", "value", "dfc-generated"]
+      - ["repo:https://github.com/rwf2/Rocket:rocket", "<crate::shield::shield::Shield as crate::fairing::Fairing>::on_liftoff", "Argument[self]", "ReturnValue.Reference", "value", "dfc-generated"]
+      - ["repo:https://github.com/rwf2/Rocket:rocket", "<crate::shield::shield::Shield as crate::fairing::Fairing>::on_response", "Argument[1]", "ReturnValue.Reference", "value", "dfc-generated"]
+      - ["repo:https://github.com/rwf2/Rocket:rocket", "<crate::shield::shield::Shield as crate::fairing::Fairing>::on_response", "Argument[self]", "ReturnValue.Reference", "value", "dfc-generated"]
       - ["repo:https://github.com/rwf2/Rocket:rocket", "<crate::shield::shield::Shield>::disable", "Argument[self]", "ReturnValue", "value", "dfc-generated"]
       - ["repo:https://github.com/rwf2/Rocket:rocket", "<crate::shield::shield::Shield>::enable", "Argument[self]", "ReturnValue", "value", "dfc-generated"]
+      - ["repo:https://github.com/rwf2/Rocket:rocket", "<crate::shutdown::Shutdown as crate::request::from_request::FromRequest>::from_request", "Argument[0]", "ReturnValue.Reference", "value", "dfc-generated"]
       - ["repo:https://github.com/rwf2/Rocket:rocket", "<crate::state::State as crate::ops::deref::Deref>::deref", "Argument[self].Field[0]", "ReturnValue.Reference", "value", "dfc-generated"]
       - ["repo:https://github.com/rwf2/Rocket:rocket", "<crate::state::State as crate::ops::deref::Deref>::deref", "Argument[self].Field[crate::state::State(0)]", "ReturnValue.Reference", "value", "dfc-generated"]
       - ["repo:https://github.com/rwf2/Rocket:rocket", "<crate::state::State>::inner", "Argument[self].Field[0]", "ReturnValue.Reference", "value", "dfc-generated"]
       - ["repo:https://github.com/rwf2/Rocket:rocket", "<crate::state::State>::inner", "Argument[self].Field[crate::state::State(0)]", "ReturnValue.Reference", "value", "dfc-generated"]
       - ["repo:https://github.com/rwf2/Rocket:rocket", "<crate::status::Status as crate::response::responder::Responder>::respond_to", "Argument[self]", "ReturnValue.Field[crate::result::Result::Err(0)]", "value", "dfc-generated"]
+      - ["repo:https://github.com/rwf2/Rocket:rocket", "<crate::string::String as crate::data::from_data::FromData>::from_data", "Argument[0]", "ReturnValue.Reference", "value", "dfc-generated"]
+      - ["repo:https://github.com/rwf2/Rocket:rocket", "<crate::string::String as crate::data::from_data::FromData>::from_data", "Argument[1]", "ReturnValue.Reference", "value", "dfc-generated"]
+      - ["repo:https://github.com/rwf2/Rocket:rocket", "<crate::string::String as crate::form::from_form_field::FromFormField>::from_data", "Argument[0]", "ReturnValue.Reference", "value", "dfc-generated"]
       - ["repo:https://github.com/rwf2/Rocket:rocket", "<crate::string::String as crate::form::validate::Len>::len_into_u64", "Argument[0]", "ReturnValue", "taint", "df-generated"]
       - ["repo:https://github.com/rwf2/Rocket:rocket", "<crate::string::String as crate::request::from_param::FromParam>::from_param", "Argument[0]", "ReturnValue", "taint", "df-generated"]
+      - ["repo:https://github.com/rwf2/Rocket:rocket", "<crate::sync::Arc as crate::fairing::Fairing>::on_ignite", "Argument[0]", "ReturnValue.Reference", "value", "dfc-generated"]
+      - ["repo:https://github.com/rwf2/Rocket:rocket", "<crate::sync::Arc as crate::fairing::Fairing>::on_ignite", "Argument[self]", "ReturnValue.Reference", "value", "dfc-generated"]
+      - ["repo:https://github.com/rwf2/Rocket:rocket", "<crate::sync::Arc as crate::fairing::Fairing>::on_liftoff", "Argument[0]", "ReturnValue.Reference", "value", "dfc-generated"]
+      - ["repo:https://github.com/rwf2/Rocket:rocket", "<crate::sync::Arc as crate::fairing::Fairing>::on_liftoff", "Argument[self]", "ReturnValue.Reference", "value", "dfc-generated"]
+      - ["repo:https://github.com/rwf2/Rocket:rocket", "<crate::sync::Arc as crate::fairing::Fairing>::on_request", "Argument[0]", "ReturnValue.Reference", "value", "dfc-generated"]
+      - ["repo:https://github.com/rwf2/Rocket:rocket", "<crate::sync::Arc as crate::fairing::Fairing>::on_request", "Argument[1]", "ReturnValue.Reference", "value", "dfc-generated"]
+      - ["repo:https://github.com/rwf2/Rocket:rocket", "<crate::sync::Arc as crate::fairing::Fairing>::on_request", "Argument[self]", "ReturnValue.Reference", "value", "dfc-generated"]
+      - ["repo:https://github.com/rwf2/Rocket:rocket", "<crate::sync::Arc as crate::fairing::Fairing>::on_response", "Argument[0]", "ReturnValue.Reference", "value", "dfc-generated"]
+      - ["repo:https://github.com/rwf2/Rocket:rocket", "<crate::sync::Arc as crate::fairing::Fairing>::on_response", "Argument[1]", "ReturnValue.Reference", "value", "dfc-generated"]
+      - ["repo:https://github.com/rwf2/Rocket:rocket", "<crate::sync::Arc as crate::fairing::Fairing>::on_response", "Argument[self]", "ReturnValue.Reference", "value", "dfc-generated"]
+      - ["repo:https://github.com/rwf2/Rocket:rocket", "<crate::sync::Arc as crate::fairing::Fairing>::on_shutdown", "Argument[0]", "ReturnValue.Reference", "value", "dfc-generated"]
+      - ["repo:https://github.com/rwf2/Rocket:rocket", "<crate::sync::Arc as crate::fairing::Fairing>::on_shutdown", "Argument[self]", "ReturnValue.Reference", "value", "dfc-generated"]
+      - ["repo:https://github.com/rwf2/Rocket:rocket", "<crate::sync::Arc as crate::form::from_form::FromForm>::push_data", "Argument[0]", "ReturnValue.Reference", "value", "dfc-generated"]
+      - ["repo:https://github.com/rwf2/Rocket:rocket", "<crate::sync::Arc as crate::form::from_form::FromForm>::push_data", "Argument[1]", "ReturnValue.Reference", "value", "dfc-generated"]
+      - ["repo:https://github.com/rwf2/Rocket:rocket", "<crate::tls::mtls::Certificate as crate::request::from_request::FromRequest>::from_request", "Argument[0]", "ReturnValue.Reference", "value", "dfc-generated"]
       - ["repo:https://github.com/rwf2/Rocket:rocket", "<crate::trip_wire::TripWire as crate::clone::Clone>::clone", "Argument[self].Field[crate::trip_wire::TripWire::state].Reference", "ReturnValue.Field[crate::trip_wire::TripWire::state]", "value", "dfc-generated"]
       - ["repo:https://github.com/rwf2/Rocket:rocket", "<crate::trip_wire::TripWire as crate::ops::deref::Deref>::deref", "Argument[self].Field[crate::trip_wire::TripWire::state]", "ReturnValue.Reference", "value", "dfc-generated"]
       - ["repo:https://github.com/rwf2/Rocket:rocket", "<crate::uri::segments::Segments as crate::request::from_param::FromSegments>::from_segments", "Argument[0]", "ReturnValue.Field[crate::result::Result::Ok(0)]", "value", "dfc-generated"]
+      - ["repo:https://github.com/rwf2/Rocket:rocket", "<crate::vec::Vec as crate::data::from_data::FromData>::from_data", "Argument[0]", "ReturnValue.Reference", "value", "dfc-generated"]
+      - ["repo:https://github.com/rwf2/Rocket:rocket", "<crate::vec::Vec as crate::data::from_data::FromData>::from_data", "Argument[1]", "ReturnValue.Reference", "value", "dfc-generated"]
       - ["repo:https://github.com/rwf2/Rocket:rocket", "<crate::vec::Vec as crate::form::from_form::FromForm>::finalize", "Argument[0].Field[crate::form::from_form::VecContext::errors]", "ReturnValue.Field[crate::result::Result::Err(0)]", "value", "dfc-generated"]
       - ["repo:https://github.com/rwf2/Rocket:rocket", "<crate::vec::Vec as crate::form::from_form::FromForm>::finalize", "Argument[0].Field[crate::form::from_form::VecContext::items]", "ReturnValue.Field[crate::result::Result::Ok(0)]", "value", "dfc-generated"]
       - ["repo:https://github.com/rwf2/Rocket:rocket", "<crate::vec::Vec as crate::form::from_form::FromForm>::init", "Argument[0]", "ReturnValue.Field[crate::form::from_form::VecContext::opts]", "value", "dfc-generated"]
+      - ["repo:https://github.com/rwf2/Rocket:rocket", "<crate::vec::Vec as crate::form::from_form::FromForm>::push_data", "Argument[0]", "ReturnValue.Reference", "value", "dfc-generated"]
+      - ["repo:https://github.com/rwf2/Rocket:rocket", "<crate::vec::Vec as crate::form::from_form::FromForm>::push_data", "Argument[1]", "ReturnValue.Reference", "value", "dfc-generated"]
       - ["repo:https://github.com/rwf2/Rocket:rocket", "<crate::vec::Vec as crate::form::validate::Len>::len_into_u64", "Argument[0]", "ReturnValue", "taint", "df-generated"]
       - ["repo:https://github.com/rwf2/Rocket:rocket", "<f32 as crate::form::from_form_field::FromFormField>::from_value", "Argument[0]", "ReturnValue", "taint", "df-generated"]
       - ["repo:https://github.com/rwf2/Rocket:rocket", "<f32 as crate::request::from_param::FromParam>::from_param", "Argument[0]", "ReturnValue.Field[crate::result::Result::Err(0)]", "value", "dfc-generated"]
@@ -458,7 +601,6 @@ extensions:
       - ["repo:https://github.com/rwf2/Rocket:rocket", "<u8 as crate::request::from_param::FromParam>::from_param", "Argument[0]", "ReturnValue.Field[crate::result::Result::Err(0)]", "value", "dfc-generated"]
       - ["repo:https://github.com/rwf2/Rocket:rocket", "<usize as crate::form::from_form_field::FromFormField>::from_value", "Argument[0]", "ReturnValue", "taint", "df-generated"]
       - ["repo:https://github.com/rwf2/Rocket:rocket", "<usize as crate::request::from_param::FromParam>::from_param", "Argument[0]", "ReturnValue.Field[crate::result::Result::Err(0)]", "value", "dfc-generated"]
-      - ["repo:https://github.com/rwf2/Rocket:rocket", "crate::catcher::catcher::default_handler", "Argument[0]", "ReturnValue.Field[crate::response::response::Response::status].Field[crate::option::Option::Some(0)]", "value", "dfc-generated"]
       - ["repo:https://github.com/rwf2/Rocket:rocket", "crate::form::validate::try_with", "Argument[0]", "Argument[1].Parameter[0]", "value", "dfc-generated"]
       - ["repo:https://github.com/rwf2/Rocket:rocket", "crate::form::validate::with", "Argument[0]", "Argument[1].Parameter[0]", "value", "dfc-generated"]
       - ["repo:https://github.com/rwf2/Rocket:rocket", "crate::prepend", "Argument[1]", "ReturnValue", "value", "dfc-generated"]
@@ -468,8 +610,15 @@ extensions:
     data:
       - ["repo:https://github.com/rwf2/Rocket:rocket", "<crate::config::shutdown::Shutdown>::signal_stream", "Argument[self]", "log-injection", "df-generated"]
       - ["repo:https://github.com/rwf2/Rocket:rocket", "<crate::data::data_stream::StreamReader as crate::io::async_read::AsyncRead>::poll_read", "Argument[1]", "log-injection", "df-generated"]
+      - ["repo:https://github.com/rwf2/Rocket:rocket", "<crate::data::limits::Limits>::limit", "Argument[self]", "log-injection", "df-generated"]
+      - ["repo:https://github.com/rwf2/Rocket:rocket", "<crate::fairing::fairings::Fairings>::add", "Argument[self]", "log-injection", "df-generated"]
+      - ["repo:https://github.com/rwf2/Rocket:rocket", "<crate::fairing::fairings::Fairings>::append", "Argument[self]", "log-injection", "df-generated"]
+      - ["repo:https://github.com/rwf2/Rocket:rocket", "<crate::form::error::Error as crate::ext::IntoOwned>::into_owned", "Argument[self]", "pointer-access", "df-generated"]
+      - ["repo:https://github.com/rwf2/Rocket:rocket", "<crate::form::error::ErrorKind as crate::convert::From>::from", "Argument[0]", "pointer-access", "df-generated"]
       - ["repo:https://github.com/rwf2/Rocket:rocket", "<crate::outcome::Outcome>::expect", "Argument[0]", "log-injection", "df-generated"]
+      - ["repo:https://github.com/rwf2/Rocket:rocket", "<crate::request::request::Request>::client_ip", "Argument[self]", "pointer-access", "df-generated"]
       - ["repo:https://github.com/rwf2/Rocket:rocket", "<crate::response::stream::raw_sse::RawLinedEvent as crate::io::async_read::AsyncRead>::poll_read", "Argument[1]", "log-injection", "df-generated"]
+      - ["repo:https://github.com/rwf2/Rocket:rocket", "<crate::response::stream::sse::EventStream as crate::response::responder::Responder>::respond_to", "Argument[self]", "pointer-access", "df-generated"]
       - ["repo:https://github.com/rwf2/Rocket:rocket", "<crate::rkt::Rocket>::dispatch", "Argument[1]", "log-injection", "df-generated"]
       - ["repo:https://github.com/rwf2/Rocket:rocket", "<crate::rkt::Rocket>::handle_error", "Argument[0]", "log-injection", "df-generated"]
       - ["repo:https://github.com/rwf2/Rocket:rocket", "<crate::route::route::Route>::matches", "Argument[0]", "log-injection", "df-generated"]
@@ -479,3 +628,5 @@ extensions:
       extensible: sourceModel
     data:
       - ["repo:https://github.com/rwf2/Rocket:rocket", "<crate::config::tls::TlsConfig>::to_native_config", "ReturnValue", "file", "df-generated"]
+      - ["repo:https://github.com/rwf2/Rocket:rocket", "<crate::fs::named_file::NamedFile>::open", "ReturnValue", "file", "df-generated"]
+      - ["repo:https://github.com/rwf2/Rocket:rocket", "<crate::fs::temp_file::TempFile>::open", "ReturnValue", "file", "df-generated"]
diff --git a/rust/ql/lib/ext/generated/rocket/repo-https-github.com-rwf2-Rocket-rocket_codegen.model.yml b/rust/ql/lib/ext/generated/rocket/repo-https-github.com-rwf2-Rocket-rocket_codegen.model.yml
index 3c08a3aa283..ae08b4484be 100644
--- a/rust/ql/lib/ext/generated/rocket/repo-https-github.com-rwf2-Rocket-rocket_codegen.model.yml
+++ b/rust/ql/lib/ext/generated/rocket/repo-https-github.com-rwf2-Rocket-rocket_codegen.model.yml
@@ -5,6 +5,8 @@ extensions:
       extensible: summaryModel
     data:
       - ["repo:https://github.com/rwf2/Rocket:rocket_codegen", "<crate::Ident as crate::syn_ext::IdentExt>::with_span", "Argument[self]", "ReturnValue", "value", "dfc-generated"]
+      - ["repo:https://github.com/rwf2/Rocket:rocket_codegen", "<crate::Simple as crate::data::from_data::FromData>::from_data", "Argument[0]", "ReturnValue.Reference", "value", "dfc-generated"]
+      - ["repo:https://github.com/rwf2/Rocket:rocket_codegen", "<crate::Simple as crate::data::from_data::FromData>::from_data", "Argument[1]", "ReturnValue.Reference", "value", "dfc-generated"]
       - ["repo:https://github.com/rwf2/Rocket:rocket_codegen", "<crate::User as crate::uri::fmt::from_uri_param::FromUriParam>::from_uri_param", "Argument[0]", "ReturnValue", "taint", "df-generated"]
       - ["repo:https://github.com/rwf2/Rocket:rocket_codegen", "<crate::attribute::param::Dynamic as crate::ops::deref::Deref>::deref", "Argument[self].Field[crate::attribute::param::Dynamic::name]", "ReturnValue.Reference", "value", "dfc-generated"]
       - ["repo:https://github.com/rwf2/Rocket:rocket_codegen", "<crate::attribute::param::Dynamic>::parse", "Argument[0]", "ReturnValue.Field[crate::result::Result::Err(0)].Field[crate::attribute::param::parse::Error::segment]", "value", "dfc-generated"]
@@ -36,6 +38,7 @@ extensions:
       - ["repo:https://github.com/rwf2/Rocket:rocket_codegen", "<crate::attribute::param::parse::Error>::source", "Argument[1]", "Argument[self].Field[crate::attribute::param::parse::Error::source_span]", "value", "dfc-generated"]
       - ["repo:https://github.com/rwf2/Rocket:rocket_codegen", "<crate::attribute::param::parse::Error>::source", "Argument[1]", "ReturnValue.Field[crate::attribute::param::parse::Error::source_span]", "value", "dfc-generated"]
       - ["repo:https://github.com/rwf2/Rocket:rocket_codegen", "<crate::attribute::param::parse::Error>::source", "Argument[self]", "ReturnValue", "value", "dfc-generated"]
+      - ["repo:https://github.com/rwf2/Rocket:rocket_codegen", "<crate::attribute::param::parse::ErrorKind as crate::fmt::Display>::fmt", "Argument[0]", "ReturnValue", "taint", "df-generated"]
       - ["repo:https://github.com/rwf2/Rocket:rocket_codegen", "<crate::attribute::route::parse::Route>::from", "Argument[0]", "ReturnValue.Field[crate::result::Result::Ok(0)].Field[crate::attribute::route::parse::Route::attr]", "value", "dfc-generated"]
       - ["repo:https://github.com/rwf2/Rocket:rocket_codegen", "<crate::attribute::route::parse::Route>::from", "Argument[1]", "ReturnValue.Field[crate::result::Result::Ok(0)].Field[crate::attribute::route::parse::Route::handler]", "value", "dfc-generated"]
       - ["repo:https://github.com/rwf2/Rocket:rocket_codegen", "<crate::attribute::route::parse::Route>::upgrade_dynamic", "Argument[0]", "ReturnValue.Field[crate::result::Result::Ok(0)].Field[crate::attribute::param::Guard::source]", "value", "dfc-generated"]
@@ -48,7 +51,9 @@ extensions:
       - ["repo:https://github.com/rwf2/Rocket:rocket_codegen", "<crate::derive::form_field::FieldName as crate::ops::deref::Deref>::deref", "Argument[self].Field[crate::derive::form_field::FieldName::Cased(0)]", "ReturnValue", "value", "dfc-generated"]
       - ["repo:https://github.com/rwf2/Rocket:rocket_codegen", "<crate::derive::form_field::FieldName as crate::ops::deref::Deref>::deref", "Argument[self].Field[crate::derive::form_field::FieldName::Uncased(0)]", "ReturnValue", "value", "dfc-generated"]
       - ["repo:https://github.com/rwf2/Rocket:rocket_codegen", "<crate::exports::StaticPath>::respanned", "Argument[self]", "ReturnValue", "value", "dfc-generated"]
+      - ["repo:https://github.com/rwf2/Rocket:rocket_codegen", "<crate::http_codegen::ContentType as crate::from_meta::FromMeta>::from_meta", "Argument[0]", "ReturnValue.Field[crate::result::Result::Err(0)]", "value", "dfc-generated"]
       - ["repo:https://github.com/rwf2/Rocket:rocket_codegen", "<crate::name::Name as crate::convert::AsRef>::as_ref", "Argument[self].Field[crate::name::Name::value]", "ReturnValue.Reference", "value", "dfc-generated"]
+      - ["repo:https://github.com/rwf2/Rocket:rocket_codegen", "<crate::name::Name as crate::fmt::Display>::fmt", "Argument[0]", "ReturnValue", "taint", "df-generated"]
       - ["repo:https://github.com/rwf2/Rocket:rocket_codegen", "<crate::name::Name as crate::ops::deref::Deref>::deref", "Argument[self].Field[crate::name::Name::value]", "ReturnValue.Reference", "value", "dfc-generated"]
       - ["repo:https://github.com/rwf2/Rocket:rocket_codegen", "<crate::name::Name>::as_str", "Argument[self].Field[crate::name::Name::value]", "ReturnValue.Reference", "value", "dfc-generated"]
       - ["repo:https://github.com/rwf2/Rocket:rocket_codegen", "<crate::name::Name>::new", "Argument[1]", "ReturnValue.Field[crate::name::Name::span]", "value", "dfc-generated"]
@@ -57,6 +62,13 @@ extensions:
       - ["repo:https://github.com/rwf2/Rocket:rocket_codegen", "<crate::proc_macro_ext::Diagnostics>::head_err_or", "Argument[0]", "ReturnValue.Field[crate::result::Result::Ok(0)]", "value", "dfc-generated"]
       - ["repo:https://github.com/rwf2/Rocket:rocket_codegen", "<crate::proc_macro_ext::StringLit as crate::ops::deref::Deref>::deref", "Argument[self].Field[0]", "ReturnValue.Reference", "value", "dfc-generated"]
       - ["repo:https://github.com/rwf2/Rocket:rocket_codegen", "<crate::proc_macro_ext::StringLit as crate::ops::deref::Deref>::deref", "Argument[self].Field[crate::proc_macro_ext::StringLit(0)]", "ReturnValue.Reference", "value", "dfc-generated"]
+      - ["repo:https://github.com/rwf2/Rocket:rocket_codegen", "<crate::syn_ext::Child as crate::ext::IntoOwned>::into_owned", "Argument[self]", "ReturnValue", "taint", "df-generated"]
       - ["repo:https://github.com/rwf2/Rocket:rocket_codegen", "<crate::syn_ext::Child as crate::ops::deref::Deref>::deref", "Argument[self].Field[crate::syn_ext::Child::ty]", "ReturnValue.Reference", "value", "dfc-generated"]
       - ["repo:https://github.com/rwf2/Rocket:rocket_codegen", "<crate::ty::ReturnType as crate::syn_ext::ReturnTypeExt>::ty", "Argument[self]", "ReturnValue.Field[crate::option::Option::Some(0)]", "value", "dfc-generated"]
       - ["repo:https://github.com/rwf2/Rocket:rocket_codegen", "crate::derive::form_field::first_duplicate", "Argument[0].Element", "Argument[1].Parameter[0].Reference", "value", "dfc-generated"]
+  - addsTo:
+      pack: codeql/rust-all
+      extensible: sinkModel
+    data:
+      - ["repo:https://github.com/rwf2/Rocket:rocket_codegen", "<crate::attribute::route::parse::Route>::from", "Argument[0]", "pointer-access", "df-generated"]
+      - ["repo:https://github.com/rwf2/Rocket:rocket_codegen", "<crate::syn_ext::Child as crate::ext::IntoOwned>::into_owned", "Argument[self]", "pointer-access", "df-generated"]
diff --git a/rust/ql/lib/ext/generated/rocket/repo-https-github.com-rwf2-Rocket-rocket_http.model.yml b/rust/ql/lib/ext/generated/rocket/repo-https-github.com-rwf2-Rocket-rocket_http.model.yml
index c987027c185..0d36e150267 100644
--- a/rust/ql/lib/ext/generated/rocket/repo-https-github.com-rwf2-Rocket-rocket_http.model.yml
+++ b/rust/ql/lib/ext/generated/rocket/repo-https-github.com-rwf2-Rocket-rocket_http.model.yml
@@ -33,6 +33,7 @@ extensions:
       - ["repo:https://github.com/rwf2/Rocket:rocket_http", "<crate::header::content_type::ContentType>::with_params", "Argument[self].Field[crate::header::content_type::ContentType(0)]", "ReturnValue.Field[crate::header::content_type::ContentType(0)]", "value", "dfc-generated"]
       - ["repo:https://github.com/rwf2/Rocket:rocket_http", "<crate::header::header::Header>::name", "Argument[self].Field[crate::header::header::Header::name]", "ReturnValue.Reference", "value", "dfc-generated"]
       - ["repo:https://github.com/rwf2/Rocket:rocket_http", "<crate::header::header::Header>::value", "Argument[self].Field[crate::header::header::Header::value]", "ReturnValue.Reference", "value", "dfc-generated"]
+      - ["repo:https://github.com/rwf2/Rocket:rocket_http", "<crate::header::media_type::MediaType as crate::fmt::Display>::fmt", "Argument[0]", "ReturnValue", "taint", "df-generated"]
       - ["repo:https://github.com/rwf2/Rocket:rocket_http", "<crate::header::media_type::MediaType>::const_new", "Argument[2]", "ReturnValue.Field[crate::header::media_type::MediaType::params].Field[crate::header::media_type::MediaParams::Static(0)]", "value", "dfc-generated"]
       - ["repo:https://github.com/rwf2/Rocket:rocket_http", "<crate::header::media_type::MediaType>::known_source", "Argument[self].Field[crate::header::media_type::MediaType::source].Field[crate::header::media_type::Source::Known(0)]", "ReturnValue.Field[crate::option::Option::Some(0)]", "value", "dfc-generated"]
       - ["repo:https://github.com/rwf2/Rocket:rocket_http", "<crate::header::media_type::MediaType>::new_known", "Argument[0]", "ReturnValue.Field[crate::header::media_type::MediaType::source].Field[crate::header::media_type::Source::Known(0)]", "value", "dfc-generated"]
@@ -46,12 +47,16 @@ extensions:
       - ["repo:https://github.com/rwf2/Rocket:rocket_http", "<crate::listener::Incoming>::sleep_on_errors", "Argument[0]", "Argument[self].Field[crate::listener::Incoming::sleep_on_errors]", "value", "dfc-generated"]
       - ["repo:https://github.com/rwf2/Rocket:rocket_http", "<crate::listener::Incoming>::sleep_on_errors", "Argument[0]", "ReturnValue.Field[crate::listener::Incoming::sleep_on_errors]", "value", "dfc-generated"]
       - ["repo:https://github.com/rwf2/Rocket:rocket_http", "<crate::listener::Incoming>::sleep_on_errors", "Argument[self]", "ReturnValue", "value", "dfc-generated"]
+      - ["repo:https://github.com/rwf2/Rocket:rocket_http", "<crate::method::Method as crate::fmt::Display>::fmt", "Argument[0]", "ReturnValue", "taint", "df-generated"]
       - ["repo:https://github.com/rwf2/Rocket:rocket_http", "<crate::net::ip_addr::IpAddr as crate::uri::fmt::from_uri_param::FromUriParam>::from_uri_param", "Argument[0]", "ReturnValue", "value", "dfc-generated"]
       - ["repo:https://github.com/rwf2/Rocket:rocket_http", "<crate::net::ip_addr::Ipv4Addr as crate::uri::fmt::from_uri_param::FromUriParam>::from_uri_param", "Argument[0]", "ReturnValue", "value", "dfc-generated"]
       - ["repo:https://github.com/rwf2/Rocket:rocket_http", "<crate::net::ip_addr::Ipv6Addr as crate::uri::fmt::from_uri_param::FromUriParam>::from_uri_param", "Argument[0]", "ReturnValue", "value", "dfc-generated"]
       - ["repo:https://github.com/rwf2/Rocket:rocket_http", "<crate::net::socket_addr::SocketAddr as crate::uri::fmt::from_uri_param::FromUriParam>::from_uri_param", "Argument[0]", "ReturnValue", "value", "dfc-generated"]
+      - ["repo:https://github.com/rwf2/Rocket:rocket_http", "<crate::net::socket_addr::SocketAddr as crate::uri::fmt::uri_display::UriDisplay>::fmt", "Argument[self]", "ReturnValue", "taint", "df-generated"]
       - ["repo:https://github.com/rwf2/Rocket:rocket_http", "<crate::net::socket_addr::SocketAddrV4 as crate::uri::fmt::from_uri_param::FromUriParam>::from_uri_param", "Argument[0]", "ReturnValue", "value", "dfc-generated"]
+      - ["repo:https://github.com/rwf2/Rocket:rocket_http", "<crate::net::socket_addr::SocketAddrV4 as crate::uri::fmt::uri_display::UriDisplay>::fmt", "Argument[self]", "ReturnValue", "taint", "df-generated"]
       - ["repo:https://github.com/rwf2/Rocket:rocket_http", "<crate::net::socket_addr::SocketAddrV6 as crate::uri::fmt::from_uri_param::FromUriParam>::from_uri_param", "Argument[0]", "ReturnValue", "value", "dfc-generated"]
+      - ["repo:https://github.com/rwf2/Rocket:rocket_http", "<crate::net::socket_addr::SocketAddrV6 as crate::uri::fmt::uri_display::UriDisplay>::fmt", "Argument[self]", "ReturnValue", "taint", "df-generated"]
       - ["repo:https://github.com/rwf2/Rocket:rocket_http", "<crate::num::nonzero::NonZero as crate::uri::fmt::from_uri_param::FromUriParam>::from_uri_param", "Argument[0]", "ReturnValue", "value", "dfc-generated"]
       - ["repo:https://github.com/rwf2/Rocket:rocket_http", "<crate::option::Option as crate::ext::IntoOwned>::into_owned", "Argument[self]", "ReturnValue", "taint", "df-generated"]
       - ["repo:https://github.com/rwf2/Rocket:rocket_http", "<crate::option::Option as crate::uri::fmt::from_uri_param::FromUriParam>::from_uri_param", "Argument[0]", "ReturnValue", "taint", "df-generated"]
@@ -87,6 +92,7 @@ extensions:
       - ["repo:https://github.com/rwf2/Rocket:rocket_http", "<crate::raw_str::RawStr as crate::convert::AsRef>::as_ref", "Argument[self].Field[crate::raw_str::RawStr(0)]", "ReturnValue.Reference", "value", "dfc-generated"]
       - ["repo:https://github.com/rwf2/Rocket:rocket_http", "<crate::raw_str::RawStr as crate::convert::AsRef>::as_ref", "Argument[self]", "ReturnValue", "taint", "df-generated"]
       - ["repo:https://github.com/rwf2/Rocket:rocket_http", "<crate::raw_str::RawStr as crate::convert::AsRef>::as_ref", "Argument[self]", "ReturnValue", "value", "dfc-generated"]
+      - ["repo:https://github.com/rwf2/Rocket:rocket_http", "<crate::raw_str::RawStr as crate::fmt::Display>::fmt", "Argument[0]", "ReturnValue", "taint", "df-generated"]
       - ["repo:https://github.com/rwf2/Rocket:rocket_http", "<crate::raw_str::RawStr>::as_bytes", "Argument[self]", "ReturnValue", "taint", "df-generated"]
       - ["repo:https://github.com/rwf2/Rocket:rocket_http", "<crate::raw_str::RawStr>::as_ptr", "Argument[self]", "ReturnValue", "taint", "df-generated"]
       - ["repo:https://github.com/rwf2/Rocket:rocket_http", "<crate::raw_str::RawStr>::as_str", "Argument[self].Field[0]", "ReturnValue.Reference", "value", "dfc-generated"]
@@ -104,7 +110,6 @@ extensions:
       - ["repo:https://github.com/rwf2/Rocket:rocket_http", "<crate::time::Time as crate::uri::fmt::from_uri_param::FromUriParam>::from_uri_param", "Argument[0]", "ReturnValue", "value", "dfc-generated"]
       - ["repo:https://github.com/rwf2/Rocket:rocket_http", "<crate::tls::listener::TlsStream as crate::listener::Connection>::peer_address", "Argument[self].Field[crate::tls::listener::TlsStream::remote]", "ReturnValue.Field[crate::option::Option::Some(0)]", "value", "dfc-generated"]
       - ["repo:https://github.com/rwf2/Rocket:rocket_http", "<crate::tls::listener::TlsStream as crate::listener::Connection>::peer_certificates", "Argument[self].Field[crate::tls::listener::TlsStream::certs].Reference", "ReturnValue.Field[crate::option::Option::Some(0)]", "value", "dfc-generated"]
-      - ["repo:https://github.com/rwf2/Rocket:rocket_http", "<crate::tls::listener::TlsStream as crate::listener::Connection>::peer_certificates", "Argument[self].Field[crate::tls::listener::TlsStream::certs]", "ReturnValue.Field[crate::option::Option::Some(0)]", "value", "dfc-generated"]
       - ["repo:https://github.com/rwf2/Rocket:rocket_http", "<crate::tls::mtls::Certificate as crate::ops::deref::Deref>::deref", "Argument[self].Field[crate::tls::mtls::Certificate::x509]", "ReturnValue.Reference", "value", "dfc-generated"]
       - ["repo:https://github.com/rwf2/Rocket:rocket_http", "<crate::tls::mtls::Certificate>::as_bytes", "Argument[self].Field[crate::tls::mtls::Certificate::data].Field[0]", "ReturnValue.Reference", "value", "dfc-generated"]
       - ["repo:https://github.com/rwf2/Rocket:rocket_http", "<crate::tls::mtls::Certificate>::has_serial", "Argument[0]", "ReturnValue", "taint", "df-generated"]
@@ -113,6 +118,8 @@ extensions:
       - ["repo:https://github.com/rwf2/Rocket:rocket_http", "<crate::tls::mtls::Name as crate::ops::deref::Deref>::deref", "Argument[self].Field[0]", "ReturnValue.Reference", "value", "dfc-generated"]
       - ["repo:https://github.com/rwf2/Rocket:rocket_http", "<crate::tls::mtls::Name as crate::ops::deref::Deref>::deref", "Argument[self].Field[crate::tls::mtls::Name(0)]", "ReturnValue.Reference", "value", "dfc-generated"]
       - ["repo:https://github.com/rwf2/Rocket:rocket_http", "<crate::uri::absolute::Absolute as crate::convert::TryFrom>::try_from", "Argument[0].Field[crate::uri::uri::Uri::Absolute(0)]", "ReturnValue.Field[crate::result::Result::Ok(0)]", "value", "dfc-generated"]
+      - ["repo:https://github.com/rwf2/Rocket:rocket_http", "<crate::uri::absolute::Absolute as crate::ext::IntoOwned>::into_owned", "Argument[self].Field[crate::uri::absolute::Absolute::scheme].Field[crate::parse::indexed::Indexed::Indexed(0)]", "ReturnValue.Field[crate::uri::absolute::Absolute::scheme].Field[crate::parse::indexed::Indexed::Indexed(0)]", "value", "dfc-generated"]
+      - ["repo:https://github.com/rwf2/Rocket:rocket_http", "<crate::uri::absolute::Absolute as crate::ext::IntoOwned>::into_owned", "Argument[self].Field[crate::uri::absolute::Absolute::scheme].Field[crate::parse::indexed::Indexed::Indexed(1)]", "ReturnValue.Field[crate::uri::absolute::Absolute::scheme].Field[crate::parse::indexed::Indexed::Indexed(1)]", "value", "dfc-generated"]
       - ["repo:https://github.com/rwf2/Rocket:rocket_http", "<crate::uri::absolute::Absolute as crate::uri::fmt::formatter::ValidRoutePrefix>::append", "Argument[self]", "ReturnValue", "value", "dfc-generated"]
       - ["repo:https://github.com/rwf2/Rocket:rocket_http", "<crate::uri::absolute::Absolute as crate::uri::fmt::formatter::ValidRouteSuffix>::prepend", "Argument[0]", "ReturnValue", "value", "dfc-generated"]
       - ["repo:https://github.com/rwf2/Rocket:rocket_http", "<crate::uri::absolute::Absolute>::authority", "Argument[self].Field[crate::uri::absolute::Absolute::authority].Field[crate::option::Option::Some(0)]", "ReturnValue.Field[crate::option::Option::Some(0)].Reference", "value", "dfc-generated"]
@@ -122,16 +129,23 @@ extensions:
       - ["repo:https://github.com/rwf2/Rocket:rocket_http", "<crate::uri::absolute::Absolute>::path", "Argument[self].Field[crate::uri::absolute::Absolute::source]", "ReturnValue.Field[crate::uri::path_query::Path::source].Reference", "value", "dfc-generated"]
       - ["repo:https://github.com/rwf2/Rocket:rocket_http", "<crate::uri::absolute::Absolute>::query", "Argument[self]", "ReturnValue", "taint", "df-generated"]
       - ["repo:https://github.com/rwf2/Rocket:rocket_http", "<crate::uri::absolute::Absolute>::raw", "Argument[2]", "ReturnValue.Field[crate::uri::absolute::Absolute::authority]", "value", "dfc-generated"]
+      - ["repo:https://github.com/rwf2/Rocket:rocket_http", "<crate::uri::absolute::Absolute>::scheme", "Argument[self].Field[crate::uri::absolute::Absolute::scheme].Field[crate::parse::indexed::Indexed::Concrete(0)]", "ReturnValue.Reference", "value", "dfc-generated"]
       - ["repo:https://github.com/rwf2/Rocket:rocket_http", "<crate::uri::absolute::Absolute>::set_authority", "Argument[0]", "Argument[self].Field[crate::uri::absolute::Absolute::authority].Field[crate::option::Option::Some(0)]", "value", "dfc-generated"]
       - ["repo:https://github.com/rwf2/Rocket:rocket_http", "<crate::uri::absolute::Absolute>::with_authority", "Argument[0]", "Argument[self].Field[crate::uri::absolute::Absolute::authority].Field[crate::option::Option::Some(0)]", "value", "dfc-generated"]
       - ["repo:https://github.com/rwf2/Rocket:rocket_http", "<crate::uri::absolute::Absolute>::with_authority", "Argument[0]", "ReturnValue.Field[crate::uri::absolute::Absolute::authority].Field[crate::option::Option::Some(0)]", "value", "dfc-generated"]
       - ["repo:https://github.com/rwf2/Rocket:rocket_http", "<crate::uri::absolute::Absolute>::with_authority", "Argument[self]", "ReturnValue", "value", "dfc-generated"]
       - ["repo:https://github.com/rwf2/Rocket:rocket_http", "<crate::uri::asterisk::Asterisk as crate::convert::TryFrom>::try_from", "Argument[0].Field[crate::uri::uri::Uri::Asterisk(0)]", "ReturnValue.Field[crate::result::Result::Ok(0)]", "value", "dfc-generated"]
+      - ["repo:https://github.com/rwf2/Rocket:rocket_http", "<crate::uri::asterisk::Asterisk as crate::fmt::Display>::fmt", "Argument[0]", "ReturnValue", "taint", "df-generated"]
       - ["repo:https://github.com/rwf2/Rocket:rocket_http", "<crate::uri::authority::Authority as crate::convert::TryFrom>::try_from", "Argument[0].Field[crate::uri::uri::Uri::Authority(0)]", "ReturnValue.Field[crate::result::Result::Ok(0)]", "value", "dfc-generated"]
+      - ["repo:https://github.com/rwf2/Rocket:rocket_http", "<crate::uri::authority::Authority as crate::ext::IntoOwned>::into_owned", "Argument[self].Field[crate::uri::authority::Authority::host].Field[crate::parse::indexed::Indexed::Indexed(0)]", "ReturnValue.Field[crate::uri::authority::Authority::host].Field[crate::parse::indexed::Indexed::Indexed(0)]", "value", "dfc-generated"]
+      - ["repo:https://github.com/rwf2/Rocket:rocket_http", "<crate::uri::authority::Authority as crate::ext::IntoOwned>::into_owned", "Argument[self].Field[crate::uri::authority::Authority::host].Field[crate::parse::indexed::Indexed::Indexed(1)]", "ReturnValue.Field[crate::uri::authority::Authority::host].Field[crate::parse::indexed::Indexed::Indexed(1)]", "value", "dfc-generated"]
+      - ["repo:https://github.com/rwf2/Rocket:rocket_http", "<crate::uri::authority::Authority as crate::fmt::Display>::fmt", "Argument[0]", "ReturnValue", "taint", "df-generated"]
       - ["repo:https://github.com/rwf2/Rocket:rocket_http", "<crate::uri::authority::Authority>::const_new", "Argument[2]", "ReturnValue.Field[crate::uri::authority::Authority::port]", "value", "dfc-generated"]
+      - ["repo:https://github.com/rwf2/Rocket:rocket_http", "<crate::uri::authority::Authority>::host", "Argument[self].Field[crate::uri::authority::Authority::host].Field[crate::parse::indexed::Indexed::Concrete(0)]", "ReturnValue.Reference", "value", "dfc-generated"]
       - ["repo:https://github.com/rwf2/Rocket:rocket_http", "<crate::uri::authority::Authority>::port", "Argument[self].Field[crate::uri::authority::Authority::port]", "ReturnValue", "value", "dfc-generated"]
       - ["repo:https://github.com/rwf2/Rocket:rocket_http", "<crate::uri::authority::Authority>::raw", "Argument[3]", "ReturnValue.Field[crate::uri::authority::Authority::port]", "value", "dfc-generated"]
       - ["repo:https://github.com/rwf2/Rocket:rocket_http", "<crate::uri::authority::Authority>::user_info", "Argument[self]", "ReturnValue", "taint", "df-generated"]
+      - ["repo:https://github.com/rwf2/Rocket:rocket_http", "<crate::uri::error::TryFromUriError as crate::fmt::Display>::fmt", "Argument[0]", "ReturnValue", "taint", "df-generated"]
       - ["repo:https://github.com/rwf2/Rocket:rocket_http", "<crate::uri::fmt::formatter::Formatter>::new", "Argument[0]", "ReturnValue.Field[crate::uri::fmt::formatter::Formatter::inner]", "value", "dfc-generated"]
       - ["repo:https://github.com/rwf2/Rocket:rocket_http", "<crate::uri::fmt::formatter::PrefixedRouteUri>::render", "Argument[self].Field[0]", "ReturnValue", "value", "dfc-generated"]
       - ["repo:https://github.com/rwf2/Rocket:rocket_http", "<crate::uri::fmt::formatter::PrefixedRouteUri>::render", "Argument[self].Field[crate::uri::fmt::formatter::PrefixedRouteUri(0)]", "ReturnValue", "value", "dfc-generated"]
@@ -140,12 +154,16 @@ extensions:
       - ["repo:https://github.com/rwf2/Rocket:rocket_http", "<crate::uri::fmt::formatter::SuffixedRouteUri>::render", "Argument[self].Field[crate::uri::fmt::formatter::SuffixedRouteUri(0)]", "ReturnValue", "value", "dfc-generated"]
       - ["repo:https://github.com/rwf2/Rocket:rocket_http", "<crate::uri::fmt::uri_display::uri_display_tests::Wrapper as crate::uri::fmt::from_uri_param::FromUriParam>::from_uri_param", "Argument[0]", "ReturnValue", "value", "dfc-generated"]
       - ["repo:https://github.com/rwf2/Rocket:rocket_http", "<crate::uri::host::Host as crate::convert::From>::from", "Argument[0]", "ReturnValue.Field[crate::uri::host::Host(0)]", "value", "dfc-generated"]
+      - ["repo:https://github.com/rwf2/Rocket:rocket_http", "<crate::uri::host::Host as crate::ext::IntoOwned>::into_owned", "Argument[self]", "ReturnValue", "taint", "df-generated"]
       - ["repo:https://github.com/rwf2/Rocket:rocket_http", "<crate::uri::host::Host>::new", "Argument[0]", "ReturnValue.Field[crate::uri::host::Host(0)]", "value", "dfc-generated"]
       - ["repo:https://github.com/rwf2/Rocket:rocket_http", "<crate::uri::host::Host>::port", "Argument[self].Field[0].Field[crate::uri::authority::Authority::port]", "ReturnValue", "value", "dfc-generated"]
       - ["repo:https://github.com/rwf2/Rocket:rocket_http", "<crate::uri::host::Host>::port", "Argument[self].Field[crate::uri::host::Host(0)].Field[crate::uri::authority::Authority::port]", "ReturnValue", "value", "dfc-generated"]
       - ["repo:https://github.com/rwf2/Rocket:rocket_http", "<crate::uri::host::Host>::to_absolute", "Argument[0]", "ReturnValue", "value", "dfc-generated"]
+      - ["repo:https://github.com/rwf2/Rocket:rocket_http", "<crate::uri::host::Host>::to_absolute", "Argument[self].Field[0].Reference", "ReturnValue", "value", "dfc-generated"]
+      - ["repo:https://github.com/rwf2/Rocket:rocket_http", "<crate::uri::host::Host>::to_absolute", "Argument[self].Field[crate::uri::host::Host(0)].Reference", "ReturnValue", "value", "dfc-generated"]
       - ["repo:https://github.com/rwf2/Rocket:rocket_http", "<crate::uri::host::Host>::to_authority", "Argument[self]", "ReturnValue", "taint", "df-generated"]
       - ["repo:https://github.com/rwf2/Rocket:rocket_http", "<crate::uri::origin::Origin as crate::convert::TryFrom>::try_from", "Argument[0].Field[crate::uri::uri::Uri::Origin(0)]", "ReturnValue.Field[crate::result::Result::Ok(0)]", "value", "dfc-generated"]
+      - ["repo:https://github.com/rwf2/Rocket:rocket_http", "<crate::uri::origin::Origin as crate::ext::IntoOwned>::into_owned", "Argument[self]", "ReturnValue", "taint", "df-generated"]
       - ["repo:https://github.com/rwf2/Rocket:rocket_http", "<crate::uri::origin::Origin as crate::uri::fmt::formatter::ValidRoutePrefix>::append", "Argument[self]", "ReturnValue", "value", "dfc-generated"]
       - ["repo:https://github.com/rwf2/Rocket:rocket_http", "<crate::uri::origin::Origin>::into_normalized", "Argument[self]", "ReturnValue", "value", "dfc-generated"]
       - ["repo:https://github.com/rwf2/Rocket:rocket_http", "<crate::uri::origin::Origin>::map_path", "Argument[self]", "ReturnValue", "taint", "df-generated"]
@@ -154,12 +172,15 @@ extensions:
       - ["repo:https://github.com/rwf2/Rocket:rocket_http", "<crate::uri::origin::Origin>::path", "Argument[self].Field[crate::uri::origin::Origin::source]", "ReturnValue.Field[crate::uri::path_query::Path::source].Reference", "value", "dfc-generated"]
       - ["repo:https://github.com/rwf2/Rocket:rocket_http", "<crate::uri::origin::Origin>::query", "Argument[self]", "ReturnValue", "taint", "df-generated"]
       - ["repo:https://github.com/rwf2/Rocket:rocket_http", "<crate::uri::origin::Origin>::raw", "Argument[2]", "ReturnValue", "taint", "df-generated"]
+      - ["repo:https://github.com/rwf2/Rocket:rocket_http", "<crate::uri::path_query::Data as crate::ext::IntoOwned>::into_owned", "Argument[self].Field[crate::uri::path_query::Data::value].Field[crate::parse::indexed::Indexed::Indexed(0)]", "ReturnValue.Field[crate::uri::path_query::Data::value].Field[crate::parse::indexed::Indexed::Indexed(0)]", "value", "dfc-generated"]
+      - ["repo:https://github.com/rwf2/Rocket:rocket_http", "<crate::uri::path_query::Data as crate::ext::IntoOwned>::into_owned", "Argument[self].Field[crate::uri::path_query::Data::value].Field[crate::parse::indexed::Indexed::Indexed(1)]", "ReturnValue.Field[crate::uri::path_query::Data::value].Field[crate::parse::indexed::Indexed::Indexed(1)]", "value", "dfc-generated"]
       - ["repo:https://github.com/rwf2/Rocket:rocket_http", "<crate::uri::reference::Reference as crate::convert::From>::from", "Argument[0].Field[crate::uri::origin::Origin::path]", "ReturnValue.Field[crate::uri::reference::Reference::path]", "value", "dfc-generated"]
       - ["repo:https://github.com/rwf2/Rocket:rocket_http", "<crate::uri::reference::Reference as crate::convert::From>::from", "Argument[0].Field[crate::uri::origin::Origin::query]", "ReturnValue.Field[crate::uri::reference::Reference::query]", "value", "dfc-generated"]
       - ["repo:https://github.com/rwf2/Rocket:rocket_http", "<crate::uri::reference::Reference as crate::convert::From>::from", "Argument[0].Field[crate::uri::origin::Origin::source]", "ReturnValue.Field[crate::uri::reference::Reference::source]", "value", "dfc-generated"]
       - ["repo:https://github.com/rwf2/Rocket:rocket_http", "<crate::uri::reference::Reference as crate::convert::From>::from", "Argument[0]", "ReturnValue.Field[crate::uri::reference::Reference::authority].Field[crate::option::Option::Some(0)]", "value", "dfc-generated"]
       - ["repo:https://github.com/rwf2/Rocket:rocket_http", "<crate::uri::reference::Reference as crate::convert::From>::from", "Argument[0]", "ReturnValue", "taint", "df-generated"]
       - ["repo:https://github.com/rwf2/Rocket:rocket_http", "<crate::uri::reference::Reference as crate::convert::TryFrom>::try_from", "Argument[0].Field[crate::uri::uri::Uri::Reference(0)]", "ReturnValue.Field[crate::result::Result::Ok(0)]", "value", "dfc-generated"]
+      - ["repo:https://github.com/rwf2/Rocket:rocket_http", "<crate::uri::reference::Reference as crate::ext::IntoOwned>::into_owned", "Argument[self]", "ReturnValue", "taint", "df-generated"]
       - ["repo:https://github.com/rwf2/Rocket:rocket_http", "<crate::uri::reference::Reference as crate::uri::fmt::formatter::ValidRouteSuffix>::prepend", "Argument[0]", "ReturnValue", "taint", "df-generated"]
       - ["repo:https://github.com/rwf2/Rocket:rocket_http", "<crate::uri::reference::Reference>::authority", "Argument[self].Field[crate::uri::reference::Reference::authority].Field[crate::option::Option::Some(0)]", "ReturnValue.Field[crate::option::Option::Some(0)].Reference", "value", "dfc-generated"]
       - ["repo:https://github.com/rwf2/Rocket:rocket_http", "<crate::uri::reference::Reference>::const_new", "Argument[1]", "ReturnValue.Field[crate::uri::reference::Reference::authority]", "value", "dfc-generated"]
@@ -171,6 +192,8 @@ extensions:
       - ["repo:https://github.com/rwf2/Rocket:rocket_http", "<crate::uri::reference::Reference>::raw", "Argument[2]", "ReturnValue.Field[crate::uri::reference::Reference::authority]", "value", "dfc-generated"]
       - ["repo:https://github.com/rwf2/Rocket:rocket_http", "<crate::uri::reference::Reference>::scheme", "Argument[self]", "ReturnValue", "taint", "df-generated"]
       - ["repo:https://github.com/rwf2/Rocket:rocket_http", "<crate::uri::reference::Reference>::with_query_fragment_of", "Argument[self]", "ReturnValue", "value", "dfc-generated"]
+      - ["repo:https://github.com/rwf2/Rocket:rocket_http", "<crate::uri::segments::Segments as crate::iter::traits::iterator::Iterator>::count", "Argument[self]", "ReturnValue", "taint", "df-generated"]
+      - ["repo:https://github.com/rwf2/Rocket:rocket_http", "<crate::uri::segments::Segments as crate::iter::traits::iterator::Iterator>::size_hint", "Argument[self]", "ReturnValue", "taint", "df-generated"]
       - ["repo:https://github.com/rwf2/Rocket:rocket_http", "<crate::uri::segments::Segments>::get", "Argument[self]", "ReturnValue", "taint", "df-generated"]
       - ["repo:https://github.com/rwf2/Rocket:rocket_http", "<crate::uri::segments::Segments>::len", "Argument[self]", "ReturnValue", "taint", "df-generated"]
       - ["repo:https://github.com/rwf2/Rocket:rocket_http", "<crate::uri::segments::Segments>::new", "Argument[0]", "ReturnValue.Field[crate::uri::segments::Segments::source]", "value", "dfc-generated"]
@@ -200,6 +223,7 @@ extensions:
       - ["repo:https://github.com/rwf2/Rocket:rocket_http", "<i8 as crate::uri::fmt::from_uri_param::FromUriParam>::from_uri_param", "Argument[0]", "ReturnValue", "value", "dfc-generated"]
       - ["repo:https://github.com/rwf2/Rocket:rocket_http", "<isize as crate::ext::IntoOwned>::into_owned", "Argument[self]", "ReturnValue", "value", "dfc-generated"]
       - ["repo:https://github.com/rwf2/Rocket:rocket_http", "<isize as crate::uri::fmt::from_uri_param::FromUriParam>::from_uri_param", "Argument[0]", "ReturnValue", "value", "dfc-generated"]
+      - ["repo:https://github.com/rwf2/Rocket:rocket_http", "<str as crate::parse::indexed::AsPtr>::as_ptr", "Argument[self]", "ReturnValue", "taint", "df-generated"]
       - ["repo:https://github.com/rwf2/Rocket:rocket_http", "<u128 as crate::uri::fmt::from_uri_param::FromUriParam>::from_uri_param", "Argument[0]", "ReturnValue", "value", "dfc-generated"]
       - ["repo:https://github.com/rwf2/Rocket:rocket_http", "<u16 as crate::ext::IntoOwned>::into_owned", "Argument[self]", "ReturnValue", "value", "dfc-generated"]
       - ["repo:https://github.com/rwf2/Rocket:rocket_http", "<u16 as crate::uri::fmt::from_uri_param::FromUriParam>::from_uri_param", "Argument[0]", "ReturnValue", "value", "dfc-generated"]
@@ -213,3 +237,25 @@ extensions:
       - ["repo:https://github.com/rwf2/Rocket:rocket_http", "<usize as crate::uri::fmt::from_uri_param::FromUriParam>::from_uri_param", "Argument[0]", "ReturnValue", "value", "dfc-generated"]
       - ["repo:https://github.com/rwf2/Rocket:rocket_http", "crate::parse::uri::parser::complete", "Argument[0]", "Argument[1].Parameter[0]", "value", "dfc-generated"]
       - ["repo:https://github.com/rwf2/Rocket:rocket_http", "crate::parse::uri::scheme_from_str", "Argument[0]", "ReturnValue.Field[crate::result::Result::Ok(0)]", "value", "dfc-generated"]
+  - addsTo:
+      pack: codeql/rust-all
+      extensible: sinkModel
+    data:
+      - ["repo:https://github.com/rwf2/Rocket:rocket_http", "<crate::option::Option as crate::ext::IntoOwned>::into_owned", "Argument[self]", "pointer-access", "df-generated"]
+      - ["repo:https://github.com/rwf2/Rocket:rocket_http", "<crate::option::Option as crate::uri::fmt::from_uri_param::FromUriParam>::from_uri_param", "Argument[0]", "pointer-access", "df-generated"]
+      - ["repo:https://github.com/rwf2/Rocket:rocket_http", "<crate::result::Result as crate::uri::fmt::from_uri_param::FromUriParam>::from_uri_param", "Argument[0]", "pointer-access", "df-generated"]
+      - ["repo:https://github.com/rwf2/Rocket:rocket_http", "<crate::uri::absolute::Absolute as crate::ext::IntoOwned>::into_owned", "Argument[self]", "pointer-access", "df-generated"]
+      - ["repo:https://github.com/rwf2/Rocket:rocket_http", "<crate::uri::absolute::Absolute>::raw", "Argument[4]", "pointer-access", "df-generated"]
+      - ["repo:https://github.com/rwf2/Rocket:rocket_http", "<crate::uri::authority::Authority as crate::ext::IntoOwned>::into_owned", "Argument[self]", "pointer-access", "df-generated"]
+      - ["repo:https://github.com/rwf2/Rocket:rocket_http", "<crate::uri::authority::Authority>::raw", "Argument[1]", "pointer-access", "df-generated"]
+      - ["repo:https://github.com/rwf2/Rocket:rocket_http", "<crate::uri::fmt::formatter::RouteUriBuilder>::render", "Argument[self]", "pointer-access", "df-generated"]
+      - ["repo:https://github.com/rwf2/Rocket:rocket_http", "<crate::uri::fmt::formatter::RouteUriBuilder>::with_suffix", "Argument[self]", "pointer-access", "df-generated"]
+      - ["repo:https://github.com/rwf2/Rocket:rocket_http", "<crate::uri::host::Host as crate::ext::IntoOwned>::into_owned", "Argument[self]", "pointer-access", "df-generated"]
+      - ["repo:https://github.com/rwf2/Rocket:rocket_http", "<crate::uri::origin::Origin as crate::ext::IntoOwned>::into_owned", "Argument[self]", "pointer-access", "df-generated"]
+      - ["repo:https://github.com/rwf2/Rocket:rocket_http", "<crate::uri::origin::Origin as crate::uri::fmt::formatter::ValidRoutePrefix>::append", "Argument[1]", "pointer-access", "df-generated"]
+      - ["repo:https://github.com/rwf2/Rocket:rocket_http", "<crate::uri::origin::Origin>::new", "Argument[1]", "pointer-access", "df-generated"]
+      - ["repo:https://github.com/rwf2/Rocket:rocket_http", "<crate::uri::origin::Origin>::raw", "Argument[2]", "pointer-access", "df-generated"]
+      - ["repo:https://github.com/rwf2/Rocket:rocket_http", "<crate::uri::reference::Reference as crate::ext::IntoOwned>::into_owned", "Argument[self]", "pointer-access", "df-generated"]
+      - ["repo:https://github.com/rwf2/Rocket:rocket_http", "<crate::uri::reference::Reference>::raw", "Argument[1]", "pointer-access", "df-generated"]
+      - ["repo:https://github.com/rwf2/Rocket:rocket_http", "<crate::uri::reference::Reference>::raw", "Argument[4]", "pointer-access", "df-generated"]
+      - ["repo:https://github.com/rwf2/Rocket:rocket_http", "<crate::uri::reference::Reference>::raw", "Argument[5]", "pointer-access", "df-generated"]
diff --git a/rust/ql/lib/ext/generated/rocket/repo-https-github.com-rwf2-Rocket-tree-v0.5-contrib-db_pools-rocket_db_pools.model.yml b/rust/ql/lib/ext/generated/rocket/repo-https-github.com-rwf2-Rocket-tree-v0.5-contrib-db_pools-rocket_db_pools.model.yml
index 64aa3ccb425..4eb2dc1c577 100644
--- a/rust/ql/lib/ext/generated/rocket/repo-https-github.com-rwf2-Rocket-tree-v0.5-contrib-db_pools-rocket_db_pools.model.yml
+++ b/rust/ql/lib/ext/generated/rocket/repo-https-github.com-rwf2-Rocket-tree-v0.5-contrib-db_pools-rocket_db_pools.model.yml
@@ -4,11 +4,25 @@ extensions:
       pack: codeql/rust-all
       extensible: summaryModel
     data:
+      - ["repo:https://github.com/rwf2/Rocket/tree/v0.5/contrib/db_pools:rocket_db_pools", "<crate::client::Client as crate::pool::Pool>::close", "Argument[self]", "ReturnValue.Reference", "value", "dfc-generated"]
+      - ["repo:https://github.com/rwf2/Rocket/tree/v0.5/contrib/db_pools:rocket_db_pools", "<crate::client::Client as crate::pool::Pool>::get", "Argument[self]", "ReturnValue.Reference", "value", "dfc-generated"]
+      - ["repo:https://github.com/rwf2/Rocket/tree/v0.5/contrib/db_pools:rocket_db_pools", "<crate::client::Client as crate::pool::Pool>::init", "Argument[0]", "ReturnValue.Reference", "value", "dfc-generated"]
       - ["repo:https://github.com/rwf2/Rocket/tree/v0.5/contrib/db_pools:rocket_db_pools", "<crate::database::Connection as crate::ops::deref::Deref>::deref", "Argument[self].Field[0]", "ReturnValue.Reference", "value", "dfc-generated"]
       - ["repo:https://github.com/rwf2/Rocket/tree/v0.5/contrib/db_pools:rocket_db_pools", "<crate::database::Connection as crate::ops::deref::Deref>::deref", "Argument[self].Field[crate::database::Connection(0)]", "ReturnValue.Reference", "value", "dfc-generated"]
       - ["repo:https://github.com/rwf2/Rocket/tree/v0.5/contrib/db_pools:rocket_db_pools", "<crate::database::Connection as crate::ops::deref::DerefMut>::deref_mut", "Argument[self].Field[0]", "ReturnValue.Reference", "value", "dfc-generated"]
       - ["repo:https://github.com/rwf2/Rocket/tree/v0.5/contrib/db_pools:rocket_db_pools", "<crate::database::Connection as crate::ops::deref::DerefMut>::deref_mut", "Argument[self].Field[crate::database::Connection(0)]", "ReturnValue.Reference", "value", "dfc-generated"]
+      - ["repo:https://github.com/rwf2/Rocket/tree/v0.5/contrib/db_pools:rocket_db_pools", "<crate::database::Connection as crate::request::from_request::FromRequest>::from_request", "Argument[0]", "ReturnValue.Reference", "value", "dfc-generated"]
       - ["repo:https://github.com/rwf2/Rocket/tree/v0.5/contrib/db_pools:rocket_db_pools", "<crate::database::Connection>::into_inner", "Argument[self].Field[0]", "ReturnValue", "value", "dfc-generated"]
       - ["repo:https://github.com/rwf2/Rocket/tree/v0.5/contrib/db_pools:rocket_db_pools", "<crate::database::Connection>::into_inner", "Argument[self].Field[crate::database::Connection(0)]", "ReturnValue", "value", "dfc-generated"]
       - ["repo:https://github.com/rwf2/Rocket/tree/v0.5/contrib/db_pools:rocket_db_pools", "<crate::database::Initializer as crate::fairing::Fairing>::info", "Argument[self].Field[0].Field[crate::option::Option::Some(0)]", "ReturnValue.Field[crate::fairing::info_kind::Info::name]", "value", "dfc-generated"]
       - ["repo:https://github.com/rwf2/Rocket/tree/v0.5/contrib/db_pools:rocket_db_pools", "<crate::database::Initializer as crate::fairing::Fairing>::info", "Argument[self].Field[crate::database::Initializer(0)].Field[crate::option::Option::Some(0)]", "ReturnValue.Field[crate::fairing::info_kind::Info::name]", "value", "dfc-generated"]
+      - ["repo:https://github.com/rwf2/Rocket/tree/v0.5/contrib/db_pools:rocket_db_pools", "<crate::database::Initializer as crate::fairing::Fairing>::on_ignite", "Argument[0]", "ReturnValue.Reference", "value", "dfc-generated"]
+      - ["repo:https://github.com/rwf2/Rocket/tree/v0.5/contrib/db_pools:rocket_db_pools", "<crate::database::Initializer as crate::fairing::Fairing>::on_ignite", "Argument[self]", "ReturnValue.Reference", "value", "dfc-generated"]
+      - ["repo:https://github.com/rwf2/Rocket/tree/v0.5/contrib/db_pools:rocket_db_pools", "<crate::database::Initializer as crate::fairing::Fairing>::on_shutdown", "Argument[0]", "ReturnValue.Reference", "value", "dfc-generated"]
+      - ["repo:https://github.com/rwf2/Rocket/tree/v0.5/contrib/db_pools:rocket_db_pools", "<crate::database::Initializer as crate::fairing::Fairing>::on_shutdown", "Argument[self]", "ReturnValue.Reference", "value", "dfc-generated"]
+      - ["repo:https://github.com/rwf2/Rocket/tree/v0.5/contrib/db_pools:rocket_db_pools", "<crate::managed::Pool as crate::pool::Pool>::close", "Argument[self]", "ReturnValue.Reference", "value", "dfc-generated"]
+      - ["repo:https://github.com/rwf2/Rocket/tree/v0.5/contrib/db_pools:rocket_db_pools", "<crate::managed::Pool as crate::pool::Pool>::get", "Argument[self]", "ReturnValue.Reference", "value", "dfc-generated"]
+      - ["repo:https://github.com/rwf2/Rocket/tree/v0.5/contrib/db_pools:rocket_db_pools", "<crate::managed::Pool as crate::pool::Pool>::init", "Argument[0]", "ReturnValue.Reference", "value", "dfc-generated"]
+      - ["repo:https://github.com/rwf2/Rocket/tree/v0.5/contrib/db_pools:rocket_db_pools", "<crate::pool::Pool as crate::pool::Pool>::close", "Argument[self]", "ReturnValue.Reference", "value", "dfc-generated"]
+      - ["repo:https://github.com/rwf2/Rocket/tree/v0.5/contrib/db_pools:rocket_db_pools", "<crate::pool::Pool as crate::pool::Pool>::get", "Argument[self]", "ReturnValue.Reference", "value", "dfc-generated"]
+      - ["repo:https://github.com/rwf2/Rocket/tree/v0.5/contrib/db_pools:rocket_db_pools", "<crate::pool::Pool as crate::pool::Pool>::init", "Argument[0]", "ReturnValue.Reference", "value", "dfc-generated"]
diff --git a/rust/ql/lib/ext/generated/rocket/repo-https-github.com-rwf2-Rocket-tree-v0.5-contrib-dyn_templates-rocket_dyn_templates.model.yml b/rust/ql/lib/ext/generated/rocket/repo-https-github.com-rwf2-Rocket-tree-v0.5-contrib-dyn_templates-rocket_dyn_templates.model.yml
index bfd8737a5e3..133692f2ce8 100644
--- a/rust/ql/lib/ext/generated/rocket/repo-https-github.com-rwf2-Rocket-tree-v0.5-contrib-dyn_templates-rocket_dyn_templates.model.yml
+++ b/rust/ql/lib/ext/generated/rocket/repo-https-github.com-rwf2-Rocket-tree-v0.5-contrib-dyn_templates-rocket_dyn_templates.model.yml
@@ -7,7 +7,14 @@ extensions:
       - ["repo:https://github.com/rwf2/Rocket/tree/v0.5/contrib/dyn_templates:rocket_dyn_templates", "<crate::context::manager::ContextManager>::context", "Argument[self].Field[0]", "ReturnValue.Reference", "value", "dfc-generated"]
       - ["repo:https://github.com/rwf2/Rocket/tree/v0.5/contrib/dyn_templates:rocket_dyn_templates", "<crate::context::manager::ContextManager>::context", "Argument[self].Field[crate::context::manager::ContextManager(0)]", "ReturnValue.Reference", "value", "dfc-generated"]
       - ["repo:https://github.com/rwf2/Rocket/tree/v0.5/contrib/dyn_templates:rocket_dyn_templates", "<crate::context::manager::ContextManager>::new", "Argument[0]", "ReturnValue.Field[crate::context::manager::ContextManager(0)]", "value", "dfc-generated"]
+      - ["repo:https://github.com/rwf2/Rocket/tree/v0.5/contrib/dyn_templates:rocket_dyn_templates", "<crate::fairing::TemplateFairing as crate::fairing::Fairing>::on_ignite", "Argument[0]", "ReturnValue.Reference", "value", "dfc-generated"]
+      - ["repo:https://github.com/rwf2/Rocket/tree/v0.5/contrib/dyn_templates:rocket_dyn_templates", "<crate::fairing::TemplateFairing as crate::fairing::Fairing>::on_ignite", "Argument[self]", "ReturnValue.Reference", "value", "dfc-generated"]
+      - ["repo:https://github.com/rwf2/Rocket/tree/v0.5/contrib/dyn_templates:rocket_dyn_templates", "<crate::fairing::TemplateFairing as crate::fairing::Fairing>::on_liftoff", "Argument[0]", "ReturnValue.Reference", "value", "dfc-generated"]
+      - ["repo:https://github.com/rwf2/Rocket/tree/v0.5/contrib/dyn_templates:rocket_dyn_templates", "<crate::fairing::TemplateFairing as crate::fairing::Fairing>::on_liftoff", "Argument[self]", "ReturnValue.Reference", "value", "dfc-generated"]
+      - ["repo:https://github.com/rwf2/Rocket/tree/v0.5/contrib/dyn_templates:rocket_dyn_templates", "<crate::metadata::Metadata as crate::request::from_request::FromRequest>::from_request", "Argument[0]", "ReturnValue.Reference", "value", "dfc-generated"]
+      - ["repo:https://github.com/rwf2/Rocket/tree/v0.5/contrib/dyn_templates:rocket_dyn_templates", "<crate::template::Template>::custom", "Argument[0]", "ReturnValue", "taint", "df-generated"]
       - ["repo:https://github.com/rwf2/Rocket/tree/v0.5/contrib/dyn_templates:rocket_dyn_templates", "<crate::template::Template>::finalize", "Argument[self].Field[crate::template::Template::value].Field[crate::result::Result::Ok(0)]", "ReturnValue", "value", "dfc-generated"]
+      - ["repo:https://github.com/rwf2/Rocket/tree/v0.5/contrib/dyn_templates:rocket_dyn_templates", "<crate::template::Template>::try_custom", "Argument[0]", "ReturnValue.Field[crate::fairing::TemplateFairing::callback].Reference", "value", "dfc-generated"]
   - addsTo:
       pack: codeql/rust-all
       extensible: sinkModel
diff --git a/rust/ql/lib/ext/generated/rocket/repo-https-github.com-rwf2-Rocket-tree-v0.5-contrib-sync_db_pools-rocket_sync_db_pools.model.yml b/rust/ql/lib/ext/generated/rocket/repo-https-github.com-rwf2-Rocket-tree-v0.5-contrib-sync_db_pools-rocket_sync_db_pools.model.yml
index 552ca54324b..e78dc4b47f1 100644
--- a/rust/ql/lib/ext/generated/rocket/repo-https-github.com-rwf2-Rocket-tree-v0.5-contrib-sync_db_pools-rocket_sync_db_pools.model.yml
+++ b/rust/ql/lib/ext/generated/rocket/repo-https-github.com-rwf2-Rocket-tree-v0.5-contrib-sync_db_pools-rocket_sync_db_pools.model.yml
@@ -4,6 +4,7 @@ extensions:
       pack: codeql/rust-all
       extensible: summaryModel
     data:
+      - ["repo:https://github.com/rwf2/Rocket/tree/v0.5/contrib/sync_db_pools:rocket_sync_db_pools", "<crate::connection::Connection as crate::request::from_request::FromRequest>::from_request", "Argument[0]", "ReturnValue.Reference", "value", "dfc-generated"]
       - ["repo:https://github.com/rwf2/Rocket/tree/v0.5/contrib/sync_db_pools:rocket_sync_db_pools", "<crate::connection::ConnectionPool as crate::clone::Clone>::clone", "Argument[self]", "ReturnValue", "taint", "df-generated"]
       - ["repo:https://github.com/rwf2/Rocket/tree/v0.5/contrib/sync_db_pools:rocket_sync_db_pools", "<crate::connection::ConnectionPool>::fairing", "Argument[0]", "ReturnValue.Field[crate::fairing::ad_hoc::AdHoc::name]", "value", "dfc-generated"]
       - ["repo:https://github.com/rwf2/Rocket/tree/v0.5/contrib/sync_db_pools:rocket_sync_db_pools", "<crate::error::Error as crate::convert::From>::from", "Argument[0]", "ReturnValue.Field[crate::error::Error::Config(0)]", "value", "dfc-generated"]
diff --git a/rust/ql/lib/ext/generated/rocket/repo-https-github.com-rwf2-Rocket-tree-v0.5-contrib-ws-rocket_ws.model.yml b/rust/ql/lib/ext/generated/rocket/repo-https-github.com-rwf2-Rocket-tree-v0.5-contrib-ws-rocket_ws.model.yml
index 66aadb9919b..6f12d3f7f37 100644
--- a/rust/ql/lib/ext/generated/rocket/repo-https-github.com-rwf2-Rocket-tree-v0.5-contrib-ws-rocket_ws.model.yml
+++ b/rust/ql/lib/ext/generated/rocket/repo-https-github.com-rwf2-Rocket-tree-v0.5-contrib-ws-rocket_ws.model.yml
@@ -4,9 +4,16 @@ extensions:
       pack: codeql/rust-all
       extensible: summaryModel
     data:
+      - ["repo:https://github.com/rwf2/Rocket/tree/v0.5/contrib/ws:rocket_ws", "<crate::websocket::Channel as crate::data::io_stream::IoHandler>::io", "Argument[0]", "ReturnValue.Reference", "value", "dfc-generated"]
+      - ["repo:https://github.com/rwf2/Rocket/tree/v0.5/contrib/ws:rocket_ws", "<crate::websocket::Channel as crate::data::io_stream::IoHandler>::io", "Argument[self]", "ReturnValue.Reference", "value", "dfc-generated"]
+      - ["repo:https://github.com/rwf2/Rocket/tree/v0.5/contrib/ws:rocket_ws", "<crate::websocket::MessageStream as crate::data::io_stream::IoHandler>::io", "Argument[0]", "ReturnValue.Reference", "value", "dfc-generated"]
+      - ["repo:https://github.com/rwf2/Rocket/tree/v0.5/contrib/ws:rocket_ws", "<crate::websocket::MessageStream as crate::data::io_stream::IoHandler>::io", "Argument[self]", "ReturnValue.Reference", "value", "dfc-generated"]
+      - ["repo:https://github.com/rwf2/Rocket/tree/v0.5/contrib/ws:rocket_ws", "<crate::websocket::WebSocket as crate::request::from_request::FromRequest>::from_request", "Argument[0]", "ReturnValue.Reference", "value", "dfc-generated"]
       - ["repo:https://github.com/rwf2/Rocket/tree/v0.5/contrib/ws:rocket_ws", "<crate::websocket::WebSocket>::accept_key", "Argument[self].Field[crate::websocket::WebSocket::key]", "ReturnValue.Reference", "value", "dfc-generated"]
+      - ["repo:https://github.com/rwf2/Rocket/tree/v0.5/contrib/ws:rocket_ws", "<crate::websocket::WebSocket>::channel", "Argument[0]", "ReturnValue.Field[crate::websocket::Channel::handler].Reference", "value", "dfc-generated"]
       - ["repo:https://github.com/rwf2/Rocket/tree/v0.5/contrib/ws:rocket_ws", "<crate::websocket::WebSocket>::channel", "Argument[self]", "ReturnValue.Field[crate::websocket::Channel::ws]", "value", "dfc-generated"]
       - ["repo:https://github.com/rwf2/Rocket/tree/v0.5/contrib/ws:rocket_ws", "<crate::websocket::WebSocket>::config", "Argument[0]", "Argument[self].Field[crate::websocket::WebSocket::config]", "value", "dfc-generated"]
       - ["repo:https://github.com/rwf2/Rocket/tree/v0.5/contrib/ws:rocket_ws", "<crate::websocket::WebSocket>::config", "Argument[0]", "ReturnValue.Field[crate::websocket::WebSocket::config]", "value", "dfc-generated"]
       - ["repo:https://github.com/rwf2/Rocket/tree/v0.5/contrib/ws:rocket_ws", "<crate::websocket::WebSocket>::config", "Argument[self]", "ReturnValue", "value", "dfc-generated"]
+      - ["repo:https://github.com/rwf2/Rocket/tree/v0.5/contrib/ws:rocket_ws", "<crate::websocket::WebSocket>::stream", "Argument[0]", "ReturnValue.Field[crate::websocket::MessageStream::handler].Reference", "value", "dfc-generated"]
       - ["repo:https://github.com/rwf2/Rocket/tree/v0.5/contrib/ws:rocket_ws", "<crate::websocket::WebSocket>::stream", "Argument[self]", "ReturnValue.Field[crate::websocket::MessageStream::ws]", "value", "dfc-generated"]
diff --git a/rust/ql/lib/ext/generated/rocket/repo-manual_routes.model.yml b/rust/ql/lib/ext/generated/rocket/repo-manual_routes.model.yml
new file mode 100644
index 00000000000..cbefe026a95
--- /dev/null
+++ b/rust/ql/lib/ext/generated/rocket/repo-manual_routes.model.yml
@@ -0,0 +1,9 @@
+# THIS FILE IS AN AUTO-GENERATED MODELS AS DATA FILE. DO NOT EDIT.
+extensions:
+  - addsTo:
+      pack: codeql/rust-all
+      extensible: summaryModel
+    data:
+      - ["repo::manual_routes", "<crate::CustomHandler as crate::route::handler::Handler>::handle", "Argument[0]", "ReturnValue.Reference", "value", "dfc-generated"]
+      - ["repo::manual_routes", "<crate::CustomHandler as crate::route::handler::Handler>::handle", "Argument[1]", "ReturnValue.Reference", "value", "dfc-generated"]
+      - ["repo::manual_routes", "<crate::CustomHandler as crate::route::handler::Handler>::handle", "Argument[self]", "ReturnValue.Reference", "value", "dfc-generated"]
diff --git a/rust/ql/lib/ext/generated/rocket/repo-state.model.yml b/rust/ql/lib/ext/generated/rocket/repo-state.model.yml
new file mode 100644
index 00000000000..eb0be86bc6e
--- /dev/null
+++ b/rust/ql/lib/ext/generated/rocket/repo-state.model.yml
@@ -0,0 +1,10 @@
+# THIS FILE IS AN AUTO-GENERATED MODELS AS DATA FILE. DO NOT EDIT.
+extensions:
+  - addsTo:
+      pack: codeql/rust-all
+      extensible: summaryModel
+    data:
+      - ["repo::state", "<crate::request_local::Guard1 as crate::request::from_request::FromRequest>::from_request", "Argument[0]", "ReturnValue.Reference", "value", "dfc-generated"]
+      - ["repo::state", "<crate::request_local::Guard2 as crate::request::from_request::FromRequest>::from_request", "Argument[0]", "ReturnValue.Reference", "value", "dfc-generated"]
+      - ["repo::state", "<crate::request_local::Guard3 as crate::request::from_request::FromRequest>::from_request", "Argument[0]", "ReturnValue.Reference", "value", "dfc-generated"]
+      - ["repo::state", "<crate::request_local::Guard4 as crate::request::from_request::FromRequest>::from_request", "Argument[0]", "ReturnValue.Reference", "value", "dfc-generated"]
diff --git a/rust/ql/lib/ext/generated/rocket/repo-static-files.model.yml b/rust/ql/lib/ext/generated/rocket/repo-static-files.model.yml
new file mode 100644
index 00000000000..68eee7cfaf4
--- /dev/null
+++ b/rust/ql/lib/ext/generated/rocket/repo-static-files.model.yml
@@ -0,0 +1,7 @@
+# THIS FILE IS AN AUTO-GENERATED MODELS AS DATA FILE. DO NOT EDIT.
+extensions:
+  - addsTo:
+      pack: codeql/rust-all
+      extensible: sinkModel
+    data:
+      - ["repo::static-files", "crate::manual::second", "Argument[0]", "path-injection", "df-generated"]
diff --git a/rust/ql/lib/ext/generated/rocket/repo-tls.model.yml b/rust/ql/lib/ext/generated/rocket/repo-tls.model.yml
index f2bb481b1af..caf88cb7a9e 100644
--- a/rust/ql/lib/ext/generated/rocket/repo-tls.model.yml
+++ b/rust/ql/lib/ext/generated/rocket/repo-tls.model.yml
@@ -4,4 +4,6 @@ extensions:
       pack: codeql/rust-all
       extensible: summaryModel
     data:
+      - ["repo::tls", "<crate::redirector::Redirector as crate::fairing::Fairing>::on_liftoff", "Argument[0]", "ReturnValue.Reference", "value", "dfc-generated"]
+      - ["repo::tls", "<crate::redirector::Redirector as crate::fairing::Fairing>::on_liftoff", "Argument[self]", "ReturnValue.Reference", "value", "dfc-generated"]
       - ["repo::tls", "<crate::redirector::Redirector>::try_launch", "Argument[self].Field[crate::redirector::Redirector::port]", "Argument[0].Field[crate::config::config::Config::port]", "value", "dfc-generated"]
diff --git a/rust/ql/lib/ext/generated/rust/lang-alloc.model.yml b/rust/ql/lib/ext/generated/rust/lang-alloc.model.yml
index 2b91ef42107..753581c7642 100644
--- a/rust/ql/lib/ext/generated/rust/lang-alloc.model.yml
+++ b/rust/ql/lib/ext/generated/rust/lang-alloc.model.yml
@@ -5,14 +5,18 @@ extensions:
       extensible: summaryModel
     data:
       - ["lang:alloc", "<&&str as crate::string::SpecToString>::spec_to_string", "Argument[self].Reference.Reference", "ReturnValue", "value", "dfc-generated"]
+      - ["lang:alloc", "<&crate::collections::btree::map::BTreeMap as crate::iter::traits::collect::IntoIterator>::into_iter", "Argument[self].Field[crate::collections::btree::map::BTreeMap::length]", "ReturnValue.Field[crate::collections::btree::map::Iter::length]", "value", "dfc-generated"]
+      - ["lang:alloc", "<&crate::collections::linked_list::LinkedList as crate::iter::traits::collect::IntoIterator>::into_iter", "Argument[self].Field[crate::collections::linked_list::LinkedList::head]", "ReturnValue.Field[crate::collections::linked_list::Iter::head]", "value", "dfc-generated"]
+      - ["lang:alloc", "<&crate::collections::linked_list::LinkedList as crate::iter::traits::collect::IntoIterator>::into_iter", "Argument[self].Field[crate::collections::linked_list::LinkedList::len]", "ReturnValue.Field[crate::collections::linked_list::Iter::len]", "value", "dfc-generated"]
+      - ["lang:alloc", "<&crate::collections::linked_list::LinkedList as crate::iter::traits::collect::IntoIterator>::into_iter", "Argument[self].Field[crate::collections::linked_list::LinkedList::tail]", "ReturnValue.Field[crate::collections::linked_list::Iter::tail]", "value", "dfc-generated"]
       - ["lang:alloc", "<&crate::string::String as crate::str::pattern::Pattern>::as_utf8_pattern", "Argument[self]", "ReturnValue.Field[crate::option::Option::Some(0)].Field[crate::str::pattern::Utf8Pattern::StringPattern(0)]", "value", "dfc-generated"]
-      - ["lang:alloc", "<&str as crate::string::SpecToString>::spec_to_string", "Argument[self].Reference.Field[crate::string::String::vec]", "ReturnValue.Field[crate::string::String::vec]", "value", "dfc-generated"]
-      - ["lang:alloc", "<&str as crate::string::SpecToString>::spec_to_string", "Argument[self].Reference.Reference", "ReturnValue", "value", "dfc-generated"]
-      - ["lang:alloc", "<&str as crate::string::SpecToString>::spec_to_string", "Argument[self].Reference", "ReturnValue", "value", "dfc-generated"]
+      - ["lang:alloc", "<&mut crate::collections::btree::map::BTreeMap as crate::iter::traits::collect::IntoIterator>::into_iter", "Argument[self].Field[crate::collections::btree::map::BTreeMap::length]", "ReturnValue.Field[crate::collections::btree::map::IterMut::length]", "value", "dfc-generated"]
+      - ["lang:alloc", "<&mut crate::collections::linked_list::LinkedList as crate::iter::traits::collect::IntoIterator>::into_iter", "Argument[self].Field[crate::collections::linked_list::LinkedList::head]", "ReturnValue.Field[crate::collections::linked_list::IterMut::head]", "value", "dfc-generated"]
+      - ["lang:alloc", "<&mut crate::collections::linked_list::LinkedList as crate::iter::traits::collect::IntoIterator>::into_iter", "Argument[self].Field[crate::collections::linked_list::LinkedList::len]", "ReturnValue.Field[crate::collections::linked_list::IterMut::len]", "value", "dfc-generated"]
+      - ["lang:alloc", "<&mut crate::collections::linked_list::LinkedList as crate::iter::traits::collect::IntoIterator>::into_iter", "Argument[self].Field[crate::collections::linked_list::LinkedList::tail]", "ReturnValue.Field[crate::collections::linked_list::IterMut::tail]", "value", "dfc-generated"]
+      - ["lang:alloc", "<&str as crate::string::SpecToString>::spec_to_string", "Argument[self]", "ReturnValue", "taint", "df-generated"]
       - ["lang:alloc", "<_ as crate::borrow::ToOwned>::clone_into", "Argument[self].Reference", "Argument[0].Reference", "value", "dfc-generated"]
-      - ["lang:alloc", "<_ as crate::borrow::ToOwned>::clone_into", "Argument[self]", "Argument[0].Reference", "value", "dfc-generated"]
       - ["lang:alloc", "<_ as crate::borrow::ToOwned>::to_owned", "Argument[self].Reference", "ReturnValue", "value", "dfc-generated"]
-      - ["lang:alloc", "<_ as crate::borrow::ToOwned>::to_owned", "Argument[self]", "ReturnValue", "value", "dfc-generated"]
       - ["lang:alloc", "<_ as crate::vec::spec_from_elem::SpecFromElem>::from_elem", "Argument[1]", "ReturnValue.Field[crate::vec::Vec::len]", "value", "dfc-generated"]
       - ["lang:alloc", "<crate::borrow::Cow as crate::borrow::Borrow>::borrow", "Argument[self].Reference.Reference", "ReturnValue.Reference", "value", "dfc-generated"]
       - ["lang:alloc", "<crate::borrow::Cow as crate::clone::Clone>::clone", "Argument[self].Reference.Field[crate::borrow::Cow::Borrowed(0)]", "ReturnValue.Field[crate::borrow::Cow::Borrowed(0)]", "value", "dfc-generated"]
@@ -29,9 +33,10 @@ extensions:
       - ["lang:alloc", "<crate::boxed::Box as crate::borrow::Borrow>::borrow", "Argument[self].Reference.Reference", "ReturnValue.Reference", "value", "dfc-generated"]
       - ["lang:alloc", "<crate::boxed::Box as crate::borrow::BorrowMut>::borrow_mut", "Argument[self].Reference.Reference", "ReturnValue.Reference", "value", "dfc-generated"]
       - ["lang:alloc", "<crate::boxed::Box as crate::clone::Clone>::clone_from", "Argument[0].Reference", "Argument[self].Reference", "value", "dfc-generated"]
-      - ["lang:alloc", "<crate::boxed::Box as crate::clone::Clone>::clone_from", "Argument[0]", "Argument[self].Reference", "value", "dfc-generated"]
       - ["lang:alloc", "<crate::boxed::Box as crate::convert::AsMut>::as_mut", "Argument[self].Reference.Reference", "ReturnValue.Reference", "value", "dfc-generated"]
       - ["lang:alloc", "<crate::boxed::Box as crate::convert::AsRef>::as_ref", "Argument[self].Reference.Reference", "ReturnValue.Reference", "value", "dfc-generated"]
+      - ["lang:alloc", "<crate::boxed::Box as crate::convert::From>::from", "Argument[0]", "ReturnValue.Reference", "value", "dfc-generated"]
+      - ["lang:alloc", "<crate::boxed::Box as crate::convert::From>::from", "Argument[0]", "ReturnValue", "taint", "df-generated"]
       - ["lang:alloc", "<crate::boxed::Box as crate::convert::TryFrom>::try_from", "Argument[0]", "ReturnValue.Field[crate::result::Result::Err(0)]", "value", "dfc-generated"]
       - ["lang:alloc", "<crate::boxed::Box as crate::iter::traits::iterator::Iterator>::next", "Argument[self]", "ReturnValue", "taint", "df-generated"]
       - ["lang:alloc", "<crate::boxed::Box as crate::iter::traits::iterator::Iterator>::nth", "Argument[self]", "ReturnValue", "taint", "df-generated"]
@@ -45,9 +50,11 @@ extensions:
       - ["lang:alloc", "<crate::boxed::Box>::from_non_null_in", "Argument[1]", "ReturnValue.Field[crate::boxed::Box(1)]", "value", "dfc-generated"]
       - ["lang:alloc", "<crate::boxed::Box>::from_raw_in", "Argument[1]", "ReturnValue.Field[crate::boxed::Box(1)]", "value", "dfc-generated"]
       - ["lang:alloc", "<crate::boxed::Box>::into_inner", "Argument[0].Reference", "ReturnValue", "value", "dfc-generated"]
+      - ["lang:alloc", "<crate::boxed::Box>::into_pin", "Argument[0].Reference", "ReturnValue", "value", "dfc-generated"]
       - ["lang:alloc", "<crate::boxed::Box>::into_pin", "Argument[0]", "ReturnValue.Field[crate::pin::Pin::__pointer]", "value", "dfc-generated"]
       - ["lang:alloc", "<crate::boxed::Box>::new_uninit_in", "Argument[0]", "ReturnValue.Field[crate::boxed::Box(1)]", "value", "dfc-generated"]
       - ["lang:alloc", "<crate::boxed::Box>::new_zeroed_in", "Argument[0]", "ReturnValue.Field[crate::boxed::Box(1)]", "value", "dfc-generated"]
+      - ["lang:alloc", "<crate::boxed::Box>::try_new_in", "Argument[1]", "ReturnValue.Field[crate::boxed::Box(1)]", "value", "dfc-generated"]
       - ["lang:alloc", "<crate::boxed::Box>::try_new_uninit_in", "Argument[0]", "ReturnValue.Field[crate::result::Result::Ok(0)].Field[crate::boxed::Box(1)]", "value", "dfc-generated"]
       - ["lang:alloc", "<crate::boxed::Box>::try_new_zeroed_in", "Argument[0]", "ReturnValue.Field[crate::result::Result::Ok(0)].Field[crate::boxed::Box(1)]", "value", "dfc-generated"]
       - ["lang:alloc", "<crate::bstr::ByteString as crate::borrow::Borrow>::borrow", "Argument[self].Field[0]", "ReturnValue.Reference", "value", "dfc-generated"]
@@ -70,64 +77,63 @@ extensions:
       - ["lang:alloc", "<crate::bstr::ByteString>::as_bytes", "Argument[self].Field[crate::bstr::ByteString(0)]", "ReturnValue.Reference", "value", "dfc-generated"]
       - ["lang:alloc", "<crate::collections::TryReserveError as crate::convert::From>::from", "Argument[0]", "ReturnValue.Field[crate::collections::TryReserveError::kind]", "value", "dfc-generated"]
       - ["lang:alloc", "<crate::collections::TryReserveError>::kind", "Argument[self].Field[crate::collections::TryReserveError::kind].Reference", "ReturnValue", "value", "dfc-generated"]
-      - ["lang:alloc", "<crate::collections::TryReserveError>::kind", "Argument[self].Field[crate::collections::TryReserveError::kind]", "ReturnValue.Reference", "value", "dfc-generated"]
-      - ["lang:alloc", "<crate::collections::TryReserveError>::kind", "Argument[self].Field[crate::collections::TryReserveError::kind]", "ReturnValue", "value", "dfc-generated"]
       - ["lang:alloc", "<crate::collections::binary_heap::BinaryHeap as crate::clone::Clone>::clone", "Argument[self].Field[crate::collections::binary_heap::BinaryHeap::data].Reference", "ReturnValue.Field[crate::collections::binary_heap::BinaryHeap::data]", "value", "dfc-generated"]
       - ["lang:alloc", "<crate::collections::binary_heap::BinaryHeap as crate::clone::Clone>::clone", "Argument[self].Field[crate::collections::binary_heap::BinaryHeap::data]", "ReturnValue.Field[crate::collections::binary_heap::BinaryHeap::data]", "value", "dfc-generated"]
       - ["lang:alloc", "<crate::collections::binary_heap::BinaryHeap as crate::convert::From>::from", "Argument[0]", "ReturnValue.Field[crate::collections::binary_heap::BinaryHeap::data]", "value", "dfc-generated"]
+      - ["lang:alloc", "<crate::collections::binary_heap::BinaryHeap>::drain", "Argument[self].Field[crate::collections::binary_heap::BinaryHeap::data].Field[crate::ptr::unique::Unique::pointer]", "ReturnValue.Field[crate::collections::binary_heap::Drain::iter].Field[crate::vec::drain::Drain::vec]", "value", "dfc-generated"]
       - ["lang:alloc", "<crate::collections::binary_heap::BinaryHeap>::drain_sorted", "Argument[self]", "ReturnValue.Field[crate::collections::binary_heap::DrainSorted::inner]", "value", "dfc-generated"]
       - ["lang:alloc", "<crate::collections::binary_heap::BinaryHeap>::into_iter_sorted", "Argument[self]", "ReturnValue.Field[crate::collections::binary_heap::IntoIterSorted::inner]", "value", "dfc-generated"]
+      - ["lang:alloc", "<crate::collections::binary_heap::BinaryHeap>::len", "Argument[self].Field[crate::collections::binary_heap::BinaryHeap::data].Field[crate::vec::Vec::len]", "ReturnValue", "value", "dfc-generated"]
       - ["lang:alloc", "<crate::collections::binary_heap::BinaryHeap>::peek_mut", "Argument[self]", "ReturnValue.Field[crate::option::Option::Some(0)].Field[crate::collections::binary_heap::PeekMut::heap]", "value", "dfc-generated"]
       - ["lang:alloc", "<crate::collections::binary_heap::IntoIter as crate::iter::adapters::SourceIter>::as_inner", "Argument[self]", "ReturnValue", "value", "dfc-generated"]
       - ["lang:alloc", "<crate::collections::binary_heap::IntoIter as crate::vec::in_place_collect::AsVecIntoIter>::as_into_iter", "Argument[self].Field[crate::collections::binary_heap::IntoIter::iter]", "ReturnValue.Reference", "value", "dfc-generated"]
+      - ["lang:alloc", "<crate::collections::binary_heap::IntoIter>::allocator", "Argument[self].Field[crate::collections::binary_heap::IntoIter::iter].Field[crate::vec::into_iter::IntoIter::alloc]", "ReturnValue.Reference", "value", "dfc-generated"]
       - ["lang:alloc", "<crate::collections::binary_heap::Iter as crate::clone::Clone>::clone", "Argument[self]", "ReturnValue", "taint", "df-generated"]
       - ["lang:alloc", "<crate::collections::binary_heap::Iter as crate::iter::traits::iterator::Iterator>::next", "Argument[self].Field[crate::collections::binary_heap::Iter::iter].Element", "ReturnValue.Field[crate::option::Option::Some(0)]", "value", "dfc-generated"]
+      - ["lang:alloc", "<crate::collections::btree::borrow::DormantMutRef>::new", "Argument[0].Field[crate::ptr::unique::Unique::pointer]", "ReturnValue.Field[1].Field[crate::collections::btree::borrow::DormantMutRef::ptr]", "value", "dfc-generated"]
+      - ["lang:alloc", "<crate::collections::btree::dedup_sorted_iter::DedupSortedIter as crate::iter::traits::iterator::Iterator>::next", "Argument[self]", "ReturnValue", "taint", "df-generated"]
       - ["lang:alloc", "<crate::collections::btree::dedup_sorted_iter::DedupSortedIter>::new", "Argument[0]", "ReturnValue.Field[crate::collections::btree::dedup_sorted_iter::DedupSortedIter::iter].Field[crate::iter::adapters::peekable::Peekable::iter]", "value", "dfc-generated"]
-      - ["lang:alloc", "<crate::collections::btree::map::BTreeMap as crate::clone::Clone>::clone", "Argument[self].Field[crate::collections::btree::map::BTreeMap::alloc].Reference", "ReturnValue.Field[crate::collections::btree::map::BTreeMap::alloc].Field[crate::mem::manually_drop::ManuallyDrop::value]", "value", "dfc-generated"]
       - ["lang:alloc", "<crate::collections::btree::map::BTreeMap>::bulk_build_from_sorted_iter", "Argument[1]", "ReturnValue.Field[crate::collections::btree::map::BTreeMap::alloc].Field[crate::mem::manually_drop::ManuallyDrop::value]", "value", "dfc-generated"]
       - ["lang:alloc", "<crate::collections::btree::map::BTreeMap>::entry", "Argument[0]", "ReturnValue.Field[crate::collections::btree::map::entry::Entry::Vacant(0)].Field[crate::collections::btree::map::entry::VacantEntry::key]", "value", "dfc-generated"]
       - ["lang:alloc", "<crate::collections::btree::map::BTreeMap>::extract_if", "Argument[0]", "ReturnValue.Field[crate::collections::btree::map::ExtractIf::pred]", "value", "dfc-generated"]
-      - ["lang:alloc", "<crate::collections::btree::map::BTreeMap>::extract_if_inner", "Argument[self].Field[crate::collections::btree::map::BTreeMap::alloc].Reference", "ReturnValue.Field[1]", "value", "dfc-generated"]
+      - ["lang:alloc", "<crate::collections::btree::map::BTreeMap>::extract_if_inner", "Argument[self]", "ReturnValue", "taint", "df-generated"]
+      - ["lang:alloc", "<crate::collections::btree::map::BTreeMap>::first_key_value", "Argument[self].Field[crate::collections::btree::map::BTreeMap::root].Field[crate::option::Option::Some(0)]", "ReturnValue.Reference", "value", "dfc-generated"]
+      - ["lang:alloc", "<crate::collections::btree::map::BTreeMap>::get", "Argument[self].Field[crate::collections::btree::map::BTreeMap::root].Field[crate::option::Option::Some(0)]", "ReturnValue.Reference", "value", "dfc-generated"]
+      - ["lang:alloc", "<crate::collections::btree::map::BTreeMap>::get_key_value", "Argument[self].Field[crate::collections::btree::map::BTreeMap::root].Field[crate::option::Option::Some(0)]", "ReturnValue.Reference", "value", "dfc-generated"]
+      - ["lang:alloc", "<crate::collections::btree::map::BTreeMap>::get_mut", "Argument[self].Field[crate::collections::btree::map::BTreeMap::root].Field[crate::option::Option::Some(0)]", "ReturnValue.Reference", "value", "dfc-generated"]
       - ["lang:alloc", "<crate::collections::btree::map::BTreeMap>::get_or_insert_with", "Argument[0]", "Argument[1].Parameter[0]", "value", "dfc-generated"]
       - ["lang:alloc", "<crate::collections::btree::map::BTreeMap>::iter", "Argument[self].Field[crate::collections::btree::map::BTreeMap::length]", "ReturnValue.Field[crate::collections::btree::map::Iter::length]", "value", "dfc-generated"]
       - ["lang:alloc", "<crate::collections::btree::map::BTreeMap>::iter_mut", "Argument[self].Field[crate::collections::btree::map::BTreeMap::length]", "ReturnValue.Field[crate::collections::btree::map::IterMut::length]", "value", "dfc-generated"]
+      - ["lang:alloc", "<crate::collections::btree::map::BTreeMap>::keys", "Argument[self].Field[crate::collections::btree::map::BTreeMap::length]", "ReturnValue.Field[crate::collections::btree::map::Keys::inner].Field[crate::collections::btree::map::Iter::length]", "value", "dfc-generated"]
+      - ["lang:alloc", "<crate::collections::btree::map::BTreeMap>::last_key_value", "Argument[self].Field[crate::collections::btree::map::BTreeMap::root].Field[crate::option::Option::Some(0)]", "ReturnValue.Reference", "value", "dfc-generated"]
       - ["lang:alloc", "<crate::collections::btree::map::BTreeMap>::len", "Argument[self].Field[crate::collections::btree::map::BTreeMap::length]", "ReturnValue", "value", "dfc-generated"]
       - ["lang:alloc", "<crate::collections::btree::map::BTreeMap>::lower_bound", "Argument[self]", "ReturnValue", "taint", "df-generated"]
       - ["lang:alloc", "<crate::collections::btree::map::BTreeMap>::lower_bound_mut", "Argument[self]", "ReturnValue", "taint", "df-generated"]
       - ["lang:alloc", "<crate::collections::btree::map::BTreeMap>::new_in", "Argument[0]", "ReturnValue.Field[crate::collections::btree::map::BTreeMap::alloc].Field[crate::mem::manually_drop::ManuallyDrop::value]", "value", "dfc-generated"]
       - ["lang:alloc", "<crate::collections::btree::map::BTreeMap>::split_off", "Argument[self].Field[crate::collections::btree::map::BTreeMap::alloc].Reference", "ReturnValue.Field[crate::collections::btree::map::BTreeMap::alloc]", "value", "dfc-generated"]
-      - ["lang:alloc", "<crate::collections::btree::map::BTreeMap>::split_off", "Argument[self].Field[crate::collections::btree::map::BTreeMap::alloc]", "ReturnValue.Field[crate::collections::btree::map::BTreeMap::alloc].Reference", "value", "dfc-generated"]
-      - ["lang:alloc", "<crate::collections::btree::map::BTreeMap>::split_off", "Argument[self].Field[crate::collections::btree::map::BTreeMap::alloc]", "ReturnValue.Field[crate::collections::btree::map::BTreeMap::alloc]", "value", "dfc-generated"]
       - ["lang:alloc", "<crate::collections::btree::map::BTreeMap>::try_insert", "Argument[1]", "ReturnValue.Field[crate::result::Result::Err(0)].Field[crate::collections::btree::map::entry::OccupiedError::value]", "value", "dfc-generated"]
       - ["lang:alloc", "<crate::collections::btree::map::BTreeMap>::upper_bound", "Argument[self]", "ReturnValue", "taint", "df-generated"]
       - ["lang:alloc", "<crate::collections::btree::map::BTreeMap>::upper_bound_mut", "Argument[self]", "ReturnValue", "taint", "df-generated"]
+      - ["lang:alloc", "<crate::collections::btree::map::BTreeMap>::values", "Argument[self].Field[crate::collections::btree::map::BTreeMap::length]", "ReturnValue.Field[crate::collections::btree::map::Values::inner].Field[crate::collections::btree::map::Iter::length]", "value", "dfc-generated"]
+      - ["lang:alloc", "<crate::collections::btree::map::BTreeMap>::values_mut", "Argument[self].Field[crate::collections::btree::map::BTreeMap::length]", "ReturnValue.Field[crate::collections::btree::map::ValuesMut::inner].Field[crate::collections::btree::map::IterMut::length]", "value", "dfc-generated"]
       - ["lang:alloc", "<crate::collections::btree::map::Cursor as crate::clone::Clone>::clone", "Argument[self].Reference.Field[crate::collections::btree::map::Cursor::current]", "ReturnValue.Field[crate::collections::btree::map::Cursor::current]", "value", "dfc-generated"]
       - ["lang:alloc", "<crate::collections::btree::map::Cursor as crate::clone::Clone>::clone", "Argument[self].Reference.Field[crate::collections::btree::map::Cursor::root]", "ReturnValue.Field[crate::collections::btree::map::Cursor::root]", "value", "dfc-generated"]
-      - ["lang:alloc", "<crate::collections::btree::map::Cursor>::next", "Argument[self].Field[crate::collections::btree::map::Cursor::current].Field[crate::option::Option::Some(0)]", "ReturnValue", "value", "dfc-generated"]
-      - ["lang:alloc", "<crate::collections::btree::map::Cursor>::next", "Argument[self].Field[crate::collections::btree::map::Cursor::current].Field[crate::result::Result::Ok(0)]", "ReturnValue", "value", "dfc-generated"]
-      - ["lang:alloc", "<crate::collections::btree::map::Cursor>::peek_next", "Argument[self].Field[crate::collections::btree::map::Cursor::current].Field[crate::option::Option::Some(0)]", "ReturnValue", "value", "dfc-generated"]
-      - ["lang:alloc", "<crate::collections::btree::map::Cursor>::peek_next", "Argument[self].Field[crate::collections::btree::map::Cursor::current].Field[crate::result::Result::Ok(0)]", "ReturnValue", "value", "dfc-generated"]
-      - ["lang:alloc", "<crate::collections::btree::map::Cursor>::peek_prev", "Argument[self].Field[crate::collections::btree::map::Cursor::current].Field[crate::option::Option::Some(0)]", "ReturnValue", "value", "dfc-generated"]
-      - ["lang:alloc", "<crate::collections::btree::map::Cursor>::peek_prev", "Argument[self].Field[crate::collections::btree::map::Cursor::current].Field[crate::result::Result::Ok(0)]", "ReturnValue", "value", "dfc-generated"]
-      - ["lang:alloc", "<crate::collections::btree::map::Cursor>::prev", "Argument[self].Field[crate::collections::btree::map::Cursor::current].Field[crate::option::Option::Some(0)]", "ReturnValue", "value", "dfc-generated"]
-      - ["lang:alloc", "<crate::collections::btree::map::Cursor>::prev", "Argument[self].Field[crate::collections::btree::map::Cursor::current].Field[crate::result::Result::Ok(0)]", "ReturnValue", "value", "dfc-generated"]
       - ["lang:alloc", "<crate::collections::btree::map::CursorMut>::with_mutable_key", "Argument[self].Field[crate::collections::btree::map::CursorMut::inner]", "ReturnValue", "value", "dfc-generated"]
-      - ["lang:alloc", "<crate::collections::btree::map::CursorMutKey>::next", "Argument[self].Field[crate::collections::btree::map::CursorMutKey::current].Field[crate::option::Option::Some(0)]", "ReturnValue", "value", "dfc-generated"]
-      - ["lang:alloc", "<crate::collections::btree::map::CursorMutKey>::next", "Argument[self].Field[crate::collections::btree::map::CursorMutKey::current].Field[crate::result::Result::Ok(0)]", "ReturnValue", "value", "dfc-generated"]
-      - ["lang:alloc", "<crate::collections::btree::map::CursorMutKey>::prev", "Argument[self].Field[crate::collections::btree::map::CursorMutKey::current].Field[crate::option::Option::Some(0)]", "ReturnValue", "value", "dfc-generated"]
-      - ["lang:alloc", "<crate::collections::btree::map::CursorMutKey>::prev", "Argument[self].Field[crate::collections::btree::map::CursorMutKey::current].Field[crate::result::Result::Ok(0)]", "ReturnValue", "value", "dfc-generated"]
-      - ["lang:alloc", "<crate::collections::btree::map::CursorMutKey>::remove_next", "Argument[self]", "ReturnValue", "taint", "df-generated"]
-      - ["lang:alloc", "<crate::collections::btree::map::CursorMutKey>::remove_prev", "Argument[self]", "ReturnValue", "taint", "df-generated"]
-      - ["lang:alloc", "<crate::collections::btree::map::ExtractIfInner>::next", "Argument[self].Field[crate::collections::btree::map::ExtractIfInner::cur_leaf_edge].Field[crate::option::Option::Some(0)]", "ReturnValue", "value", "dfc-generated"]
-      - ["lang:alloc", "<crate::collections::btree::map::ExtractIfInner>::next", "Argument[self].Field[crate::collections::btree::map::ExtractIfInner::cur_leaf_edge].Field[crate::result::Result::Ok(0)]", "ReturnValue", "value", "dfc-generated"]
+      - ["lang:alloc", "<crate::collections::btree::map::CursorMutKey>::peek_next", "Argument[self].Field[crate::collections::btree::map::CursorMutKey::current].Field[crate::option::Option::Some(0)]", "ReturnValue.Reference", "value", "dfc-generated"]
+      - ["lang:alloc", "<crate::collections::btree::map::CursorMutKey>::peek_prev", "Argument[self].Field[crate::collections::btree::map::CursorMutKey::current].Field[crate::option::Option::Some(0)]", "ReturnValue.Reference", "value", "dfc-generated"]
+      - ["lang:alloc", "<crate::collections::btree::map::ExtractIfInner>::peek", "Argument[self].Field[crate::collections::btree::map::ExtractIfInner::cur_leaf_edge].Field[crate::option::Option::Some(0)]", "ReturnValue.Reference", "value", "dfc-generated"]
       - ["lang:alloc", "<crate::collections::btree::map::ExtractIfInner>::size_hint", "Argument[self].Field[crate::collections::btree::map::ExtractIfInner::length].Reference", "ReturnValue.Field[1].Field[crate::option::Option::Some(0)]", "value", "dfc-generated"]
       - ["lang:alloc", "<crate::collections::btree::map::IntoIter as crate::iter::traits::exact_size::ExactSizeIterator>::len", "Argument[self].Field[crate::collections::btree::map::IntoIter::length]", "ReturnValue", "value", "dfc-generated"]
       - ["lang:alloc", "<crate::collections::btree::map::IntoIter as crate::iter::traits::iterator::Iterator>::size_hint", "Argument[self].Field[crate::collections::btree::map::IntoIter::length]", "ReturnValue.Field[0]", "value", "dfc-generated"]
       - ["lang:alloc", "<crate::collections::btree::map::IntoIter as crate::iter::traits::iterator::Iterator>::size_hint", "Argument[self].Field[crate::collections::btree::map::IntoIter::length]", "ReturnValue.Field[1].Field[crate::option::Option::Some(0)]", "value", "dfc-generated"]
       - ["lang:alloc", "<crate::collections::btree::map::IntoIter>::iter", "Argument[self].Field[crate::collections::btree::map::IntoIter::length]", "ReturnValue.Field[crate::collections::btree::map::Iter::length]", "value", "dfc-generated"]
-      - ["lang:alloc", "<crate::collections::btree::map::Iter as crate::clone::Clone>::clone", "Argument[self].Field[crate::collections::btree::map::Iter::length]", "ReturnValue.Field[crate::collections::btree::map::Iter::length]", "value", "dfc-generated"]
-      - ["lang:alloc", "<crate::collections::btree::map::Iter as crate::clone::Clone>::clone", "Argument[self].Field[crate::collections::btree::map::Iter::range].Reference", "ReturnValue.Field[crate::collections::btree::map::Iter::range]", "value", "dfc-generated"]
-      - ["lang:alloc", "<crate::collections::btree::map::Iter as crate::clone::Clone>::clone", "Argument[self].Field[crate::collections::btree::map::Iter::range]", "ReturnValue.Field[crate::collections::btree::map::Iter::range]", "value", "dfc-generated"]
+      - ["lang:alloc", "<crate::collections::btree::map::IntoKeys as crate::iter::traits::exact_size::ExactSizeIterator>::len", "Argument[self].Field[crate::collections::btree::map::IntoKeys::inner].Field[crate::collections::btree::map::IntoIter::length]", "ReturnValue", "value", "dfc-generated"]
+      - ["lang:alloc", "<crate::collections::btree::map::IntoKeys as crate::iter::traits::iterator::Iterator>::size_hint", "Argument[self].Field[crate::collections::btree::map::IntoKeys::inner].Field[crate::collections::btree::map::IntoIter::length]", "ReturnValue.Field[0]", "value", "dfc-generated"]
+      - ["lang:alloc", "<crate::collections::btree::map::IntoKeys as crate::iter::traits::iterator::Iterator>::size_hint", "Argument[self].Field[crate::collections::btree::map::IntoKeys::inner].Field[crate::collections::btree::map::IntoIter::length]", "ReturnValue.Field[1].Field[crate::option::Option::Some(0)]", "value", "dfc-generated"]
+      - ["lang:alloc", "<crate::collections::btree::map::IntoValues as crate::iter::traits::exact_size::ExactSizeIterator>::len", "Argument[self].Field[crate::collections::btree::map::IntoValues::inner].Field[crate::collections::btree::map::IntoIter::length]", "ReturnValue", "value", "dfc-generated"]
+      - ["lang:alloc", "<crate::collections::btree::map::IntoValues as crate::iter::traits::iterator::Iterator>::size_hint", "Argument[self].Field[crate::collections::btree::map::IntoValues::inner].Field[crate::collections::btree::map::IntoIter::length]", "ReturnValue.Field[0]", "value", "dfc-generated"]
+      - ["lang:alloc", "<crate::collections::btree::map::IntoValues as crate::iter::traits::iterator::Iterator>::size_hint", "Argument[self].Field[crate::collections::btree::map::IntoValues::inner].Field[crate::collections::btree::map::IntoIter::length]", "ReturnValue.Field[1].Field[crate::option::Option::Some(0)]", "value", "dfc-generated"]
+      - ["lang:alloc", "<crate::collections::btree::map::Iter as crate::clone::Clone>::clone", "Argument[self]", "ReturnValue", "taint", "df-generated"]
       - ["lang:alloc", "<crate::collections::btree::map::Iter as crate::iter::traits::exact_size::ExactSizeIterator>::len", "Argument[self].Field[crate::collections::btree::map::Iter::length]", "ReturnValue", "value", "dfc-generated"]
       - ["lang:alloc", "<crate::collections::btree::map::Iter as crate::iter::traits::iterator::Iterator>::size_hint", "Argument[self].Field[crate::collections::btree::map::Iter::length]", "ReturnValue.Field[0]", "value", "dfc-generated"]
       - ["lang:alloc", "<crate::collections::btree::map::Iter as crate::iter::traits::iterator::Iterator>::size_hint", "Argument[self].Field[crate::collections::btree::map::Iter::length]", "ReturnValue.Field[1].Field[crate::option::Option::Some(0)]", "value", "dfc-generated"]
@@ -139,8 +145,7 @@ extensions:
       - ["lang:alloc", "<crate::collections::btree::map::Keys as crate::iter::traits::exact_size::ExactSizeIterator>::len", "Argument[self].Field[crate::collections::btree::map::Keys::inner].Field[crate::collections::btree::map::Iter::length]", "ReturnValue", "value", "dfc-generated"]
       - ["lang:alloc", "<crate::collections::btree::map::Keys as crate::iter::traits::iterator::Iterator>::size_hint", "Argument[self].Field[crate::collections::btree::map::Keys::inner].Field[crate::collections::btree::map::Iter::length]", "ReturnValue.Field[0]", "value", "dfc-generated"]
       - ["lang:alloc", "<crate::collections::btree::map::Keys as crate::iter::traits::iterator::Iterator>::size_hint", "Argument[self].Field[crate::collections::btree::map::Keys::inner].Field[crate::collections::btree::map::Iter::length]", "ReturnValue.Field[1].Field[crate::option::Option::Some(0)]", "value", "dfc-generated"]
-      - ["lang:alloc", "<crate::collections::btree::map::Range as crate::clone::Clone>::clone", "Argument[self].Field[crate::collections::btree::map::Range::inner].Reference", "ReturnValue.Field[crate::collections::btree::map::Range::inner]", "value", "dfc-generated"]
-      - ["lang:alloc", "<crate::collections::btree::map::Range as crate::clone::Clone>::clone", "Argument[self].Field[crate::collections::btree::map::Range::inner]", "ReturnValue.Field[crate::collections::btree::map::Range::inner]", "value", "dfc-generated"]
+      - ["lang:alloc", "<crate::collections::btree::map::Range as crate::clone::Clone>::clone", "Argument[self]", "ReturnValue", "taint", "df-generated"]
       - ["lang:alloc", "<crate::collections::btree::map::Values as crate::clone::Clone>::clone", "Argument[self]", "ReturnValue", "taint", "df-generated"]
       - ["lang:alloc", "<crate::collections::btree::map::Values as crate::iter::traits::exact_size::ExactSizeIterator>::len", "Argument[self].Field[crate::collections::btree::map::Values::inner].Field[crate::collections::btree::map::Iter::length]", "ReturnValue", "value", "dfc-generated"]
       - ["lang:alloc", "<crate::collections::btree::map::Values as crate::iter::traits::iterator::Iterator>::size_hint", "Argument[self].Field[crate::collections::btree::map::Values::inner].Field[crate::collections::btree::map::Iter::length]", "ReturnValue.Field[0]", "value", "dfc-generated"]
@@ -175,13 +180,21 @@ extensions:
       - ["lang:alloc", "<crate::collections::btree::node::BalancingContext>::steal_right", "Argument[self].Field[crate::collections::btree::node::BalancingContext::left_child]", "ReturnValue.Field[crate::collections::btree::node::Handle::node]", "value", "dfc-generated"]
       - ["lang:alloc", "<crate::collections::btree::node::Handle as crate::clone::Clone>::clone", "Argument[self].Reference", "ReturnValue", "value", "dfc-generated"]
       - ["lang:alloc", "<crate::collections::btree::node::Handle>::awaken", "Argument[self].Field[crate::collections::btree::node::Handle::idx]", "ReturnValue.Field[crate::collections::btree::node::Handle::idx]", "value", "dfc-generated"]
+      - ["lang:alloc", "<crate::collections::btree::node::Handle>::awaken", "Argument[self].Field[crate::collections::btree::node::Handle::node].Field[crate::collections::btree::node::NodeRef::height]", "ReturnValue.Field[crate::collections::btree::node::Handle::node].Field[crate::collections::btree::node::NodeRef::height]", "value", "dfc-generated"]
+      - ["lang:alloc", "<crate::collections::btree::node::Handle>::awaken", "Argument[self].Field[crate::collections::btree::node::Handle::node].Field[crate::collections::btree::node::NodeRef::node]", "ReturnValue.Field[crate::collections::btree::node::Handle::node].Field[crate::collections::btree::node::NodeRef::node]", "value", "dfc-generated"]
       - ["lang:alloc", "<crate::collections::btree::node::Handle>::cast_to_leaf_unchecked", "Argument[self].Field[crate::collections::btree::node::Handle::idx]", "ReturnValue.Field[crate::collections::btree::node::Handle::idx]", "value", "dfc-generated"]
+      - ["lang:alloc", "<crate::collections::btree::node::Handle>::cast_to_leaf_unchecked", "Argument[self].Field[crate::collections::btree::node::Handle::node].Field[crate::collections::btree::node::NodeRef::height]", "ReturnValue.Field[crate::collections::btree::node::Handle::node].Field[crate::collections::btree::node::NodeRef::height]", "value", "dfc-generated"]
+      - ["lang:alloc", "<crate::collections::btree::node::Handle>::cast_to_leaf_unchecked", "Argument[self].Field[crate::collections::btree::node::Handle::node].Field[crate::collections::btree::node::NodeRef::node]", "ReturnValue.Field[crate::collections::btree::node::Handle::node].Field[crate::collections::btree::node::NodeRef::node]", "value", "dfc-generated"]
       - ["lang:alloc", "<crate::collections::btree::node::Handle>::consider_for_balancing", "Argument[self]", "ReturnValue.Field[crate::collections::btree::node::BalancingContext::parent]", "value", "dfc-generated"]
       - ["lang:alloc", "<crate::collections::btree::node::Handle>::descend", "Argument[self]", "ReturnValue", "taint", "df-generated"]
       - ["lang:alloc", "<crate::collections::btree::node::Handle>::dormant", "Argument[self].Field[crate::collections::btree::node::Handle::idx]", "ReturnValue.Field[crate::collections::btree::node::Handle::idx]", "value", "dfc-generated"]
+      - ["lang:alloc", "<crate::collections::btree::node::Handle>::dormant", "Argument[self].Field[crate::collections::btree::node::Handle::node].Field[crate::collections::btree::node::NodeRef::height]", "ReturnValue.Field[crate::collections::btree::node::Handle::node].Field[crate::collections::btree::node::NodeRef::height]", "value", "dfc-generated"]
+      - ["lang:alloc", "<crate::collections::btree::node::Handle>::dormant", "Argument[self].Field[crate::collections::btree::node::Handle::node].Field[crate::collections::btree::node::NodeRef::node]", "ReturnValue.Field[crate::collections::btree::node::Handle::node].Field[crate::collections::btree::node::NodeRef::node]", "value", "dfc-generated"]
       - ["lang:alloc", "<crate::collections::btree::node::Handle>::force", "Argument[self].Field[crate::collections::btree::node::Handle::idx]", "ReturnValue.Field[crate::collections::btree::node::ForceResult::Internal(0)].Field[crate::collections::btree::node::Handle::idx]", "value", "dfc-generated"]
       - ["lang:alloc", "<crate::collections::btree::node::Handle>::force", "Argument[self].Field[crate::collections::btree::node::Handle::idx]", "ReturnValue.Field[crate::collections::btree::node::ForceResult::Leaf(0)].Field[crate::collections::btree::node::Handle::idx]", "value", "dfc-generated"]
       - ["lang:alloc", "<crate::collections::btree::node::Handle>::forget_node_type", "Argument[self].Field[crate::collections::btree::node::Handle::idx]", "ReturnValue.Field[crate::collections::btree::node::Handle::idx]", "value", "dfc-generated"]
+      - ["lang:alloc", "<crate::collections::btree::node::Handle>::forget_node_type", "Argument[self].Field[crate::collections::btree::node::Handle::node].Field[crate::collections::btree::node::NodeRef::height]", "ReturnValue.Field[crate::collections::btree::node::Handle::node].Field[crate::collections::btree::node::NodeRef::height]", "value", "dfc-generated"]
+      - ["lang:alloc", "<crate::collections::btree::node::Handle>::forget_node_type", "Argument[self].Field[crate::collections::btree::node::Handle::node].Field[crate::collections::btree::node::NodeRef::node]", "ReturnValue.Field[crate::collections::btree::node::Handle::node].Field[crate::collections::btree::node::NodeRef::node]", "value", "dfc-generated"]
       - ["lang:alloc", "<crate::collections::btree::node::Handle>::idx", "Argument[self].Field[crate::collections::btree::node::Handle::idx]", "ReturnValue", "value", "dfc-generated"]
       - ["lang:alloc", "<crate::collections::btree::node::Handle>::into_node", "Argument[self].Field[crate::collections::btree::node::Handle::node]", "ReturnValue", "value", "dfc-generated"]
       - ["lang:alloc", "<crate::collections::btree::node::Handle>::left_edge", "Argument[self].Field[crate::collections::btree::node::Handle::idx]", "ReturnValue.Field[crate::collections::btree::node::Handle::idx]", "value", "dfc-generated"]
@@ -196,6 +209,10 @@ extensions:
       - ["lang:alloc", "<crate::collections::btree::node::Handle>::reborrow", "Argument[self].Field[crate::collections::btree::node::Handle::node].Field[crate::collections::btree::node::NodeRef::height]", "ReturnValue.Field[crate::collections::btree::node::Handle::node].Field[crate::collections::btree::node::NodeRef::height]", "value", "dfc-generated"]
       - ["lang:alloc", "<crate::collections::btree::node::Handle>::reborrow", "Argument[self].Field[crate::collections::btree::node::Handle::node].Field[crate::collections::btree::node::NodeRef::node]", "ReturnValue.Field[crate::collections::btree::node::Handle::node].Field[crate::collections::btree::node::NodeRef::node]", "value", "dfc-generated"]
       - ["lang:alloc", "<crate::collections::btree::node::Handle>::reborrow_mut", "Argument[self].Field[crate::collections::btree::node::Handle::idx]", "ReturnValue.Field[crate::collections::btree::node::Handle::idx]", "value", "dfc-generated"]
+      - ["lang:alloc", "<crate::collections::btree::node::Handle>::reborrow_mut", "Argument[self].Field[crate::collections::btree::node::Handle::node].Field[crate::collections::btree::node::NodeRef::height]", "ReturnValue.Field[crate::collections::btree::node::Handle::node].Field[crate::collections::btree::node::NodeRef::height]", "value", "dfc-generated"]
+      - ["lang:alloc", "<crate::collections::btree::node::Handle>::reborrow_mut", "Argument[self].Field[crate::collections::btree::node::Handle::node].Field[crate::collections::btree::node::NodeRef::node]", "ReturnValue.Field[crate::collections::btree::node::Handle::node].Field[crate::collections::btree::node::NodeRef::node]", "value", "dfc-generated"]
+      - ["lang:alloc", "<crate::collections::btree::node::Handle>::remove", "Argument[self].Field[crate::collections::btree::node::Handle::idx]", "ReturnValue.Field[1].Field[crate::collections::btree::node::Handle::idx]", "value", "dfc-generated"]
+      - ["lang:alloc", "<crate::collections::btree::node::Handle>::remove", "Argument[self].Field[crate::collections::btree::node::Handle::node]", "ReturnValue.Field[1].Field[crate::collections::btree::node::Handle::node]", "value", "dfc-generated"]
       - ["lang:alloc", "<crate::collections::btree::node::Handle>::right_edge", "Argument[self].Field[crate::collections::btree::node::Handle::node]", "ReturnValue.Field[crate::collections::btree::node::Handle::node]", "value", "dfc-generated"]
       - ["lang:alloc", "<crate::collections::btree::node::Handle>::right_kv", "Argument[self].Field[crate::collections::btree::node::Handle::idx]", "ReturnValue.Field[crate::result::Result::Ok(0)].Field[crate::collections::btree::node::Handle::idx]", "value", "dfc-generated"]
       - ["lang:alloc", "<crate::collections::btree::node::Handle>::right_kv", "Argument[self].Field[crate::collections::btree::node::Handle::node]", "ReturnValue.Field[crate::result::Result::Ok(0)].Field[crate::collections::btree::node::Handle::node]", "value", "dfc-generated"]
@@ -238,7 +255,7 @@ extensions:
       - ["lang:alloc", "<crate::collections::btree::node::NodeRef>::search_node", "Argument[self]", "ReturnValue.Field[crate::collections::btree::search::SearchResult::GoDown(0)].Field[crate::collections::btree::node::Handle::node]", "value", "dfc-generated"]
       - ["lang:alloc", "<crate::collections::btree::node::NodeRef>::search_tree_for_bifurcation", "Argument[self]", "ReturnValue.Field[crate::result::Result::Ok(0)].Field[0]", "value", "dfc-generated"]
       - ["lang:alloc", "<crate::collections::btree::node::NodeRef>::visit_nodes_in_order", "Argument[0].ReturnValue", "ReturnValue", "value", "dfc-generated"]
-      - ["lang:alloc", "<crate::collections::btree::node::SplitResult>::forget_node_type", "Argument[self].Field[crate::collections::btree::node::SplitResult::kv]", "ReturnValue.Field[crate::collections::btree::node::SplitResult::kv]", "value", "dfc-generated"]
+      - ["lang:alloc", "<crate::collections::btree::node::SplitResult>::forget_node_type", "Argument[self]", "ReturnValue", "taint", "df-generated"]
       - ["lang:alloc", "<crate::collections::btree::search::SearchBound>::from_range", "Argument[0].Field[crate::ops::range::Bound::Excluded(0)]", "ReturnValue.Field[crate::collections::btree::search::SearchBound::Excluded(0)]", "value", "dfc-generated"]
       - ["lang:alloc", "<crate::collections::btree::search::SearchBound>::from_range", "Argument[0].Field[crate::ops::range::Bound::Included(0)]", "ReturnValue.Field[crate::collections::btree::search::SearchBound::Included(0)]", "value", "dfc-generated"]
       - ["lang:alloc", "<crate::collections::btree::set::BTreeSet as crate::clone::Clone>::clone", "Argument[self].Field[crate::collections::btree::set::BTreeSet::map].Reference", "ReturnValue.Field[crate::collections::btree::set::BTreeSet::map]", "value", "dfc-generated"]
@@ -247,16 +264,28 @@ extensions:
       - ["lang:alloc", "<crate::collections::btree::set::BTreeSet as crate::clone::Clone>::clone_from", "Argument[0].Field[crate::collections::btree::set::BTreeSet::map]", "Argument[self].Field[crate::collections::btree::set::BTreeSet::map]", "value", "dfc-generated"]
       - ["lang:alloc", "<crate::collections::btree::set::BTreeSet>::difference", "Argument[0]", "ReturnValue.Field[crate::collections::btree::set::Difference::inner].Field[crate::collections::btree::set::DifferenceInner::Search::other_set]", "value", "dfc-generated"]
       - ["lang:alloc", "<crate::collections::btree::set::BTreeSet>::extract_if", "Argument[0]", "ReturnValue.Field[crate::collections::btree::set::ExtractIf::pred]", "value", "dfc-generated"]
+      - ["lang:alloc", "<crate::collections::btree::set::BTreeSet>::get_or_insert_with", "Argument[0]", "Argument[1].Parameter[0]", "value", "dfc-generated"]
       - ["lang:alloc", "<crate::collections::btree::set::BTreeSet>::intersection", "Argument[0]", "ReturnValue.Field[crate::collections::btree::set::Intersection::inner].Field[crate::collections::btree::set::IntersectionInner::Search::large_set]", "value", "dfc-generated"]
       - ["lang:alloc", "<crate::collections::btree::set::BTreeSet>::intersection", "Argument[self]", "ReturnValue.Field[crate::collections::btree::set::Intersection::inner].Field[crate::collections::btree::set::IntersectionInner::Search::large_set]", "value", "dfc-generated"]
+      - ["lang:alloc", "<crate::collections::btree::set::BTreeSet>::len", "Argument[self].Field[crate::collections::btree::set::BTreeSet::map].Field[crate::collections::btree::map::BTreeMap::length]", "ReturnValue", "value", "dfc-generated"]
+      - ["lang:alloc", "<crate::collections::btree::set::BTreeSet>::split_off", "Argument[self]", "ReturnValue", "taint", "df-generated"]
       - ["lang:alloc", "<crate::collections::btree::set::CursorMut>::with_mutable_key", "Argument[self].Field[crate::collections::btree::set::CursorMut::inner].Field[crate::collections::btree::map::CursorMut::inner]", "ReturnValue.Field[crate::collections::btree::set::CursorMutKey::inner]", "value", "dfc-generated"]
       - ["lang:alloc", "<crate::collections::btree::set::Difference as crate::clone::Clone>::clone", "Argument[self]", "ReturnValue", "taint", "df-generated"]
       - ["lang:alloc", "<crate::collections::btree::set::Intersection as crate::clone::Clone>::clone", "Argument[self]", "ReturnValue", "taint", "df-generated"]
-      - ["lang:alloc", "<crate::collections::btree::set::Iter as crate::clone::Clone>::clone", "Argument[self]", "ReturnValue", "taint", "df-generated"]
-      - ["lang:alloc", "<crate::collections::btree::set::Range as crate::clone::Clone>::clone", "Argument[self]", "ReturnValue", "taint", "df-generated"]
+      - ["lang:alloc", "<crate::collections::btree::set::IntoIter as crate::iter::traits::exact_size::ExactSizeIterator>::len", "Argument[self].Field[crate::collections::btree::set::IntoIter::iter].Field[crate::collections::btree::map::IntoIter::length]", "ReturnValue", "value", "dfc-generated"]
+      - ["lang:alloc", "<crate::collections::btree::set::IntoIter as crate::iter::traits::iterator::Iterator>::size_hint", "Argument[self].Field[crate::collections::btree::set::IntoIter::iter].Field[crate::collections::btree::map::IntoIter::length]", "ReturnValue.Field[0]", "value", "dfc-generated"]
+      - ["lang:alloc", "<crate::collections::btree::set::IntoIter as crate::iter::traits::iterator::Iterator>::size_hint", "Argument[self].Field[crate::collections::btree::set::IntoIter::iter].Field[crate::collections::btree::map::IntoIter::length]", "ReturnValue.Field[1].Field[crate::option::Option::Some(0)]", "value", "dfc-generated"]
+      - ["lang:alloc", "<crate::collections::btree::set::Iter as crate::clone::Clone>::clone", "Argument[self].Field[crate::collections::btree::set::Iter::iter].Field[crate::collections::btree::map::Keys::inner]", "ReturnValue.Field[crate::collections::btree::set::Iter::iter].Field[crate::collections::btree::map::Keys::inner]", "value", "dfc-generated"]
+      - ["lang:alloc", "<crate::collections::btree::set::Iter as crate::clone::Clone>::clone", "Argument[self].Field[crate::collections::btree::set::Iter::iter].Reference", "ReturnValue.Field[crate::collections::btree::set::Iter::iter]", "value", "dfc-generated"]
+      - ["lang:alloc", "<crate::collections::btree::set::Iter as crate::clone::Clone>::clone", "Argument[self].Field[crate::collections::btree::set::Iter::iter]", "ReturnValue.Field[crate::collections::btree::set::Iter::iter]", "value", "dfc-generated"]
+      - ["lang:alloc", "<crate::collections::btree::set::Range as crate::clone::Clone>::clone", "Argument[self].Field[crate::collections::btree::set::Range::iter].Field[crate::collections::btree::map::Range::inner]", "ReturnValue.Field[crate::collections::btree::set::Range::iter].Field[crate::collections::btree::map::Range::inner]", "value", "dfc-generated"]
+      - ["lang:alloc", "<crate::collections::btree::set::Range as crate::clone::Clone>::clone", "Argument[self].Field[crate::collections::btree::set::Range::iter].Reference", "ReturnValue.Field[crate::collections::btree::set::Range::iter]", "value", "dfc-generated"]
+      - ["lang:alloc", "<crate::collections::btree::set::Range as crate::clone::Clone>::clone", "Argument[self].Field[crate::collections::btree::set::Range::iter]", "ReturnValue.Field[crate::collections::btree::set::Range::iter]", "value", "dfc-generated"]
       - ["lang:alloc", "<crate::collections::btree::set::SymmetricDifference as crate::clone::Clone>::clone", "Argument[self]", "ReturnValue", "taint", "df-generated"]
       - ["lang:alloc", "<crate::collections::btree::set::Union as crate::clone::Clone>::clone", "Argument[self]", "ReturnValue", "taint", "df-generated"]
       - ["lang:alloc", "<crate::collections::btree::set::entry::Entry>::insert", "Argument[self].Field[crate::collections::btree::set::entry::Entry::Occupied(0)]", "ReturnValue", "value", "dfc-generated"]
+      - ["lang:alloc", "<crate::collections::btree::set::entry::VacantEntry>::get", "Argument[self].Field[crate::collections::btree::set::entry::VacantEntry::inner].Field[crate::collections::btree::map::entry::VacantEntry::key]", "ReturnValue.Reference", "value", "dfc-generated"]
+      - ["lang:alloc", "<crate::collections::btree::set::entry::VacantEntry>::into_value", "Argument[self].Field[crate::collections::btree::set::entry::VacantEntry::inner].Field[crate::collections::btree::map::entry::VacantEntry::key]", "ReturnValue", "value", "dfc-generated"]
       - ["lang:alloc", "<crate::collections::linked_list::Cursor as crate::clone::Clone>::clone", "Argument[self].Reference.Field[crate::collections::linked_list::Cursor::current]", "ReturnValue.Field[crate::collections::linked_list::Cursor::current]", "value", "dfc-generated"]
       - ["lang:alloc", "<crate::collections::linked_list::Cursor as crate::clone::Clone>::clone", "Argument[self].Reference.Field[crate::collections::linked_list::Cursor::index]", "ReturnValue.Field[crate::collections::linked_list::Cursor::index]", "value", "dfc-generated"]
       - ["lang:alloc", "<crate::collections::linked_list::Cursor as crate::clone::Clone>::clone", "Argument[self].Reference.Field[crate::collections::linked_list::Cursor::list]", "ReturnValue.Field[crate::collections::linked_list::Cursor::list]", "value", "dfc-generated"]
@@ -265,6 +294,7 @@ extensions:
       - ["lang:alloc", "<crate::collections::linked_list::Cursor>::index", "Argument[self].Field[crate::collections::linked_list::Cursor::current].Field[crate::result::Result::Ok(0)]", "ReturnValue", "value", "dfc-generated"]
       - ["lang:alloc", "<crate::collections::linked_list::Cursor>::index", "Argument[self].Field[crate::collections::linked_list::Cursor::index]", "ReturnValue.Field[crate::option::Option::Some(0)]", "value", "dfc-generated"]
       - ["lang:alloc", "<crate::collections::linked_list::Cursor>::move_next", "Argument[self].Field[crate::collections::linked_list::Cursor::list].Field[crate::collections::linked_list::LinkedList::head]", "Argument[self].Field[crate::collections::linked_list::Cursor::current]", "value", "dfc-generated"]
+      - ["lang:alloc", "<crate::collections::linked_list::Cursor>::move_prev", "Argument[self].Field[crate::collections::linked_list::Cursor::list].Field[crate::collections::linked_list::LinkedList::len]", "Argument[self].Field[crate::collections::linked_list::Cursor::index]", "value", "dfc-generated"]
       - ["lang:alloc", "<crate::collections::linked_list::Cursor>::move_prev", "Argument[self].Field[crate::collections::linked_list::Cursor::list].Field[crate::collections::linked_list::LinkedList::tail]", "Argument[self].Field[crate::collections::linked_list::Cursor::current]", "value", "dfc-generated"]
       - ["lang:alloc", "<crate::collections::linked_list::CursorMut>::as_cursor", "Argument[self].Field[crate::collections::linked_list::CursorMut::current]", "ReturnValue.Field[crate::collections::linked_list::Cursor::current]", "value", "dfc-generated"]
       - ["lang:alloc", "<crate::collections::linked_list::CursorMut>::as_cursor", "Argument[self].Field[crate::collections::linked_list::CursorMut::index]", "ReturnValue.Field[crate::collections::linked_list::Cursor::index]", "value", "dfc-generated"]
@@ -275,13 +305,16 @@ extensions:
       - ["lang:alloc", "<crate::collections::linked_list::CursorMut>::index", "Argument[self].Field[crate::collections::linked_list::CursorMut::index]", "ReturnValue.Field[crate::option::Option::Some(0)]", "value", "dfc-generated"]
       - ["lang:alloc", "<crate::collections::linked_list::CursorMut>::insert_after", "Argument[self].Field[crate::collections::linked_list::CursorMut::list].Field[crate::collections::linked_list::LinkedList::len]", "Argument[self].Field[crate::collections::linked_list::CursorMut::index]", "value", "dfc-generated"]
       - ["lang:alloc", "<crate::collections::linked_list::CursorMut>::move_next", "Argument[self].Field[crate::collections::linked_list::CursorMut::list].Field[crate::collections::linked_list::LinkedList::head]", "Argument[self].Field[crate::collections::linked_list::CursorMut::current]", "value", "dfc-generated"]
+      - ["lang:alloc", "<crate::collections::linked_list::CursorMut>::move_prev", "Argument[self].Field[crate::collections::linked_list::CursorMut::list].Field[crate::collections::linked_list::LinkedList::len]", "Argument[self].Field[crate::collections::linked_list::CursorMut::index]", "value", "dfc-generated"]
       - ["lang:alloc", "<crate::collections::linked_list::CursorMut>::move_prev", "Argument[self].Field[crate::collections::linked_list::CursorMut::list].Field[crate::collections::linked_list::LinkedList::tail]", "Argument[self].Field[crate::collections::linked_list::CursorMut::current]", "value", "dfc-generated"]
       - ["lang:alloc", "<crate::collections::linked_list::CursorMut>::remove_current", "Argument[self].Field[crate::collections::linked_list::CursorMut::current].Field[crate::option::Option::Some(0)]", "ReturnValue", "value", "dfc-generated"]
       - ["lang:alloc", "<crate::collections::linked_list::CursorMut>::remove_current", "Argument[self].Field[crate::collections::linked_list::CursorMut::current].Field[crate::result::Result::Ok(0)]", "ReturnValue", "value", "dfc-generated"]
       - ["lang:alloc", "<crate::collections::linked_list::CursorMut>::remove_current_as_list", "Argument[self].Field[crate::collections::linked_list::CursorMut::current].Field[crate::option::Option::Some(0)]", "ReturnValue", "value", "dfc-generated"]
       - ["lang:alloc", "<crate::collections::linked_list::CursorMut>::remove_current_as_list", "Argument[self].Field[crate::collections::linked_list::CursorMut::current].Field[crate::result::Result::Ok(0)]", "ReturnValue", "value", "dfc-generated"]
-      - ["lang:alloc", "<crate::collections::linked_list::CursorMut>::remove_current_as_list", "Argument[self].Field[crate::collections::linked_list::CursorMut::list].Field[crate::collections::linked_list::LinkedList::alloc]", "ReturnValue.Field[crate::option::Option::Some(0)].Field[crate::collections::linked_list::LinkedList::alloc]", "value", "dfc-generated"]
       - ["lang:alloc", "<crate::collections::linked_list::CursorMut>::splice_after", "Argument[self].Field[crate::collections::linked_list::CursorMut::list].Field[crate::collections::linked_list::LinkedList::len]", "Argument[self].Field[crate::collections::linked_list::CursorMut::index]", "value", "dfc-generated"]
+      - ["lang:alloc", "<crate::collections::linked_list::CursorMut>::split_after", "Argument[self].Field[crate::collections::linked_list::CursorMut::list].Field[crate::collections::linked_list::LinkedList::tail]", "ReturnValue.Field[crate::collections::linked_list::LinkedList::tail]", "value", "dfc-generated"]
+      - ["lang:alloc", "<crate::collections::linked_list::CursorMut>::split_before", "Argument[self].Field[crate::collections::linked_list::CursorMut::index]", "ReturnValue.Field[crate::collections::linked_list::LinkedList::len]", "value", "dfc-generated"]
+      - ["lang:alloc", "<crate::collections::linked_list::CursorMut>::split_before", "Argument[self].Field[crate::collections::linked_list::CursorMut::list].Field[crate::collections::linked_list::LinkedList::head]", "ReturnValue.Field[crate::collections::linked_list::LinkedList::head]", "value", "dfc-generated"]
       - ["lang:alloc", "<crate::collections::linked_list::ExtractIf as crate::iter::traits::iterator::Iterator>::size_hint", "Argument[self]", "ReturnValue", "taint", "df-generated"]
       - ["lang:alloc", "<crate::collections::linked_list::IntoIter as crate::iter::traits::iterator::Iterator>::size_hint", "Argument[self].Field[crate::collections::linked_list::IntoIter::list].Field[crate::collections::linked_list::LinkedList::len]", "ReturnValue.Field[0]", "value", "dfc-generated"]
       - ["lang:alloc", "<crate::collections::linked_list::IntoIter as crate::iter::traits::iterator::Iterator>::size_hint", "Argument[self].Field[crate::collections::linked_list::IntoIter::list].Field[crate::collections::linked_list::LinkedList::len]", "ReturnValue.Field[1].Field[crate::option::Option::Some(0)]", "value", "dfc-generated"]
@@ -289,9 +322,7 @@ extensions:
       - ["lang:alloc", "<crate::collections::linked_list::Iter as crate::iter::traits::iterator::Iterator>::size_hint", "Argument[self].Field[crate::collections::linked_list::Iter::len]", "ReturnValue.Field[1].Field[crate::option::Option::Some(0)]", "value", "dfc-generated"]
       - ["lang:alloc", "<crate::collections::linked_list::IterMut as crate::iter::traits::iterator::Iterator>::size_hint", "Argument[self].Field[crate::collections::linked_list::IterMut::len]", "ReturnValue.Field[0]", "value", "dfc-generated"]
       - ["lang:alloc", "<crate::collections::linked_list::IterMut as crate::iter::traits::iterator::Iterator>::size_hint", "Argument[self].Field[crate::collections::linked_list::IterMut::len]", "ReturnValue.Field[1].Field[crate::option::Option::Some(0)]", "value", "dfc-generated"]
-      - ["lang:alloc", "<crate::collections::linked_list::LinkedList as crate::collections::SpecExtend>::spec_extend", "Argument[0]", "Argument[self]", "taint", "df-generated"]
-      - ["lang:alloc", "<crate::collections::linked_list::LinkedList>::append", "Argument[0].Field[crate::collections::linked_list::LinkedList::tail].Reference", "Argument[self].Field[crate::collections::linked_list::LinkedList::tail]", "value", "dfc-generated"]
-      - ["lang:alloc", "<crate::collections::linked_list::LinkedList>::append", "Argument[0].Field[crate::collections::linked_list::LinkedList::tail]", "Argument[self].Field[crate::collections::linked_list::LinkedList::tail]", "value", "dfc-generated"]
+      - ["lang:alloc", "<crate::collections::linked_list::LinkedList as crate::clone::Clone>::clone_from", "Argument[0].Field[crate::collections::linked_list::LinkedList::len]", "Argument[self].Field[crate::collections::linked_list::LinkedList::len]", "value", "dfc-generated"]
       - ["lang:alloc", "<crate::collections::linked_list::LinkedList>::cursor_back", "Argument[self].Field[crate::collections::linked_list::LinkedList::tail]", "ReturnValue.Field[crate::collections::linked_list::Cursor::current]", "value", "dfc-generated"]
       - ["lang:alloc", "<crate::collections::linked_list::LinkedList>::cursor_back", "Argument[self]", "ReturnValue.Field[crate::collections::linked_list::Cursor::list]", "value", "dfc-generated"]
       - ["lang:alloc", "<crate::collections::linked_list::LinkedList>::cursor_back_mut", "Argument[self].Field[crate::collections::linked_list::LinkedList::tail]", "ReturnValue.Field[crate::collections::linked_list::CursorMut::current]", "value", "dfc-generated"]
@@ -312,21 +343,30 @@ extensions:
       - ["lang:alloc", "<crate::collections::linked_list::LinkedList>::iter_mut", "Argument[self].Field[crate::collections::linked_list::LinkedList::tail]", "ReturnValue.Field[crate::collections::linked_list::IterMut::tail]", "value", "dfc-generated"]
       - ["lang:alloc", "<crate::collections::linked_list::LinkedList>::len", "Argument[self].Field[crate::collections::linked_list::LinkedList::len]", "ReturnValue", "value", "dfc-generated"]
       - ["lang:alloc", "<crate::collections::linked_list::LinkedList>::new_in", "Argument[0]", "ReturnValue.Field[crate::collections::linked_list::LinkedList::alloc]", "value", "dfc-generated"]
-      - ["lang:alloc", "<crate::collections::linked_list::LinkedList>::split_off", "Argument[self]", "ReturnValue", "taint", "df-generated"]
-      - ["lang:alloc", "<crate::collections::vec_deque::VecDeque>::drain", "Argument[self]", "ReturnValue", "taint", "df-generated"]
+      - ["lang:alloc", "<crate::collections::linked_list::LinkedList>::split_off", "Argument[0]", "Argument[self].Field[crate::collections::linked_list::LinkedList::len]", "value", "dfc-generated"]
+      - ["lang:alloc", "<crate::collections::linked_list::LinkedList>::split_off", "Argument[self].Field[crate::collections::linked_list::LinkedList::alloc].Reference", "ReturnValue.Field[crate::collections::linked_list::LinkedList::alloc]", "value", "dfc-generated"]
+      - ["lang:alloc", "<crate::collections::linked_list::LinkedList>::split_off", "Argument[self].Field[crate::collections::linked_list::LinkedList::tail]", "ReturnValue.Field[crate::collections::linked_list::LinkedList::tail]", "value", "dfc-generated"]
+      - ["lang:alloc", "<crate::collections::vec_deque::VecDeque as crate::collections::vec_deque::spec_from_iter::SpecFromIter>::spec_from_iter", "Argument[0].Field[crate::collections::vec_deque::into_iter::IntoIter::inner]", "ReturnValue", "value", "dfc-generated"]
+      - ["lang:alloc", "<crate::collections::vec_deque::VecDeque>::drain", "Argument[self].Field[crate::ptr::unique::Unique::pointer]", "ReturnValue.Field[crate::collections::vec_deque::drain::Drain::deque]", "value", "dfc-generated"]
       - ["lang:alloc", "<crate::collections::vec_deque::VecDeque>::from_contiguous_raw_parts_in", "Argument[1].Field[crate::ops::range::Range::start]", "ReturnValue.Field[crate::collections::vec_deque::VecDeque::head]", "value", "dfc-generated"]
       - ["lang:alloc", "<crate::collections::vec_deque::VecDeque>::len", "Argument[self].Field[crate::collections::vec_deque::VecDeque::len]", "ReturnValue", "value", "dfc-generated"]
+      - ["lang:alloc", "<crate::collections::vec_deque::VecDeque>::resize", "Argument[0]", "Argument[self].Field[crate::collections::vec_deque::VecDeque::len]", "value", "dfc-generated"]
+      - ["lang:alloc", "<crate::collections::vec_deque::VecDeque>::resize_with", "Argument[0]", "Argument[self].Field[crate::collections::vec_deque::VecDeque::len]", "value", "dfc-generated"]
+      - ["lang:alloc", "<crate::collections::vec_deque::VecDeque>::retain", "Argument[self].Element", "Argument[0].Parameter[0].Reference", "value", "dfc-generated"]
       - ["lang:alloc", "<crate::collections::vec_deque::VecDeque>::retain_mut", "Argument[self].Element", "Argument[0].Parameter[0].Reference", "value", "dfc-generated"]
+      - ["lang:alloc", "<crate::collections::vec_deque::VecDeque>::shrink_to", "Argument[0]", "Argument[self]", "taint", "df-generated"]
       - ["lang:alloc", "<crate::collections::vec_deque::VecDeque>::split_off", "Argument[0]", "Argument[self].Field[crate::collections::vec_deque::VecDeque::len]", "value", "dfc-generated"]
       - ["lang:alloc", "<crate::collections::vec_deque::VecDeque>::truncate", "Argument[0]", "Argument[self].Field[crate::collections::vec_deque::VecDeque::len]", "value", "dfc-generated"]
       - ["lang:alloc", "<crate::collections::vec_deque::drain::Drain as crate::iter::traits::iterator::Iterator>::size_hint", "Argument[self].Field[crate::collections::vec_deque::drain::Drain::remaining]", "ReturnValue.Field[0]", "value", "dfc-generated"]
       - ["lang:alloc", "<crate::collections::vec_deque::drain::Drain as crate::iter::traits::iterator::Iterator>::size_hint", "Argument[self].Field[crate::collections::vec_deque::drain::Drain::remaining]", "ReturnValue.Field[1].Field[crate::option::Option::Some(0)]", "value", "dfc-generated"]
-      - ["lang:alloc", "<crate::collections::vec_deque::drain::Drain>::new", "Argument[1]", "Argument[0].Field[crate::collections::vec_deque::VecDeque::len]", "value", "dfc-generated"]
+      - ["lang:alloc", "<crate::collections::vec_deque::drain::Drain>::new", "Argument[0].Field[crate::ptr::unique::Unique::pointer]", "ReturnValue.Field[crate::collections::vec_deque::drain::Drain::deque]", "value", "dfc-generated"]
       - ["lang:alloc", "<crate::collections::vec_deque::drain::Drain>::new", "Argument[1]", "ReturnValue.Field[crate::collections::vec_deque::drain::Drain::idx]", "value", "dfc-generated"]
       - ["lang:alloc", "<crate::collections::vec_deque::drain::Drain>::new", "Argument[2]", "ReturnValue.Field[crate::collections::vec_deque::drain::Drain::drain_len]", "value", "dfc-generated"]
       - ["lang:alloc", "<crate::collections::vec_deque::drain::Drain>::new", "Argument[2]", "ReturnValue.Field[crate::collections::vec_deque::drain::Drain::remaining]", "value", "dfc-generated"]
+      - ["lang:alloc", "<crate::collections::vec_deque::into_iter::IntoIter as crate::iter::traits::double_ended::DoubleEndedIterator>::advance_back_by", "Argument[0]", "Argument[self]", "taint", "df-generated"]
       - ["lang:alloc", "<crate::collections::vec_deque::into_iter::IntoIter as crate::iter::traits::iterator::Iterator>::count", "Argument[self].Field[crate::collections::vec_deque::into_iter::IntoIter::inner].Field[crate::collections::vec_deque::VecDeque::len]", "ReturnValue", "value", "dfc-generated"]
-      - ["lang:alloc", "<crate::collections::vec_deque::into_iter::IntoIter as crate::iter::traits::iterator::Iterator>::fold", "Argument[0].Field[crate::result::Result::Ok(0)]", "ReturnValue", "value", "dfc-generated"]
+      - ["lang:alloc", "<crate::collections::vec_deque::into_iter::IntoIter as crate::iter::traits::iterator::Iterator>::size_hint", "Argument[self].Field[crate::collections::vec_deque::into_iter::IntoIter::inner].Field[crate::collections::vec_deque::VecDeque::len]", "ReturnValue.Field[0]", "value", "dfc-generated"]
+      - ["lang:alloc", "<crate::collections::vec_deque::into_iter::IntoIter as crate::iter::traits::iterator::Iterator>::size_hint", "Argument[self].Field[crate::collections::vec_deque::into_iter::IntoIter::inner].Field[crate::collections::vec_deque::VecDeque::len]", "ReturnValue.Field[1].Field[crate::option::Option::Some(0)]", "value", "dfc-generated"]
       - ["lang:alloc", "<crate::collections::vec_deque::into_iter::IntoIter>::into_vecdeque", "Argument[self].Field[crate::collections::vec_deque::into_iter::IntoIter::inner]", "ReturnValue", "value", "dfc-generated"]
       - ["lang:alloc", "<crate::collections::vec_deque::into_iter::IntoIter>::new", "Argument[0]", "ReturnValue.Field[crate::collections::vec_deque::into_iter::IntoIter::inner]", "value", "dfc-generated"]
       - ["lang:alloc", "<crate::collections::vec_deque::iter::Iter as crate::clone::Clone>::clone", "Argument[self]", "ReturnValue", "taint", "df-generated"]
@@ -347,8 +387,10 @@ extensions:
       - ["lang:alloc", "<crate::collections::vec_deque::iter_mut::IterMut as crate::iter::traits::iterator::Iterator>::try_fold", "Argument[0].Field[crate::result::Result::Ok(0)]", "ReturnValue", "value", "dfc-generated"]
       - ["lang:alloc", "<crate::collections::vec_deque::iter_mut::IterMut>::new", "Argument[0]", "ReturnValue.Field[crate::collections::vec_deque::iter_mut::IterMut::i1]", "value", "dfc-generated"]
       - ["lang:alloc", "<crate::collections::vec_deque::iter_mut::IterMut>::new", "Argument[1]", "ReturnValue.Field[crate::collections::vec_deque::iter_mut::IterMut::i2]", "value", "dfc-generated"]
+      - ["lang:alloc", "<crate::ffi::c_str::CStr>::into_c_string", "Argument[self].Field[crate::borrow::Cow::Owned(0)]", "ReturnValue", "value", "dfc-generated"]
       - ["lang:alloc", "<crate::ffi::c_str::CString as crate::borrow::Borrow>::borrow", "Argument[self]", "ReturnValue", "value", "dfc-generated"]
       - ["lang:alloc", "<crate::ffi::c_str::CString as crate::convert::AsRef>::as_ref", "Argument[self]", "ReturnValue", "value", "dfc-generated"]
+      - ["lang:alloc", "<crate::ffi::c_str::CString as crate::convert::From>::from", "Argument[0].Field[crate::borrow::Cow::Owned(0)]", "ReturnValue", "value", "dfc-generated"]
       - ["lang:alloc", "<crate::ffi::c_str::CString as crate::ops::index::Index>::index", "Argument[self]", "ReturnValue", "value", "dfc-generated"]
       - ["lang:alloc", "<crate::ffi::c_str::CString>::as_bytes_with_nul", "Argument[self].Field[crate::ffi::c_str::CString::inner]", "ReturnValue.Reference", "value", "dfc-generated"]
       - ["lang:alloc", "<crate::ffi::c_str::CString>::as_c_str", "Argument[self].Reference", "ReturnValue.Reference", "value", "dfc-generated"]
@@ -356,6 +398,7 @@ extensions:
       - ["lang:alloc", "<crate::ffi::c_str::FromVecWithNulError>::as_bytes", "Argument[self].Field[crate::ffi::c_str::FromVecWithNulError::bytes].Element", "ReturnValue.Reference", "value", "dfc-generated"]
       - ["lang:alloc", "<crate::ffi::c_str::FromVecWithNulError>::into_bytes", "Argument[self].Field[crate::ffi::c_str::FromVecWithNulError::bytes]", "ReturnValue", "value", "dfc-generated"]
       - ["lang:alloc", "<crate::ffi::c_str::IntoStringError as crate::error::Error>::source", "Argument[self].Field[crate::ffi::c_str::IntoStringError::error]", "ReturnValue.Field[crate::option::Option::Some(0)].Reference", "value", "dfc-generated"]
+      - ["lang:alloc", "<crate::ffi::c_str::IntoStringError as crate::fmt::Display>::fmt", "Argument[0]", "ReturnValue", "taint", "df-generated"]
       - ["lang:alloc", "<crate::ffi::c_str::IntoStringError>::into_cstring", "Argument[self].Field[crate::ffi::c_str::IntoStringError::inner]", "ReturnValue", "value", "dfc-generated"]
       - ["lang:alloc", "<crate::ffi::c_str::IntoStringError>::utf8_error", "Argument[self].Field[crate::ffi::c_str::IntoStringError::error]", "ReturnValue", "value", "dfc-generated"]
       - ["lang:alloc", "<crate::ffi::c_str::NulError>::into_vec", "Argument[self].Field[1]", "ReturnValue", "value", "dfc-generated"]
@@ -363,7 +406,10 @@ extensions:
       - ["lang:alloc", "<crate::ffi::c_str::NulError>::nul_position", "Argument[self].Field[0]", "ReturnValue", "value", "dfc-generated"]
       - ["lang:alloc", "<crate::ffi::c_str::NulError>::nul_position", "Argument[self].Field[crate::ffi::c_str::NulError(0)]", "ReturnValue", "value", "dfc-generated"]
       - ["lang:alloc", "<crate::fmt::Arguments as crate::string::SpecToString>::spec_to_string", "Argument[self]", "ReturnValue", "taint", "df-generated"]
+      - ["lang:alloc", "<crate::pin::Pin as crate::convert::From>::from", "Argument[0].Reference", "ReturnValue", "value", "dfc-generated"]
       - ["lang:alloc", "<crate::pin::Pin as crate::convert::From>::from", "Argument[0]", "ReturnValue.Field[crate::pin::Pin::__pointer]", "value", "dfc-generated"]
+      - ["lang:alloc", "<crate::pin::Pin as crate::convert::From>::from", "Argument[0]", "ReturnValue", "value", "dfc-generated"]
+      - ["lang:alloc", "<crate::raw_vec::RawVec>::allocator", "Argument[self].Field[crate::raw_vec::RawVec::inner].Field[crate::raw_vec::RawVecInner::alloc]", "ReturnValue.Reference", "value", "dfc-generated"]
       - ["lang:alloc", "<crate::raw_vec::RawVec>::from_nonnull_in", "Argument[2]", "ReturnValue.Field[crate::raw_vec::RawVec::inner].Field[crate::raw_vec::RawVecInner::alloc]", "value", "dfc-generated"]
       - ["lang:alloc", "<crate::raw_vec::RawVec>::from_raw_parts_in", "Argument[2]", "ReturnValue.Field[crate::raw_vec::RawVec::inner].Field[crate::raw_vec::RawVecInner::alloc]", "value", "dfc-generated"]
       - ["lang:alloc", "<crate::raw_vec::RawVec>::new_in", "Argument[0]", "ReturnValue.Field[crate::raw_vec::RawVec::inner].Field[crate::raw_vec::RawVecInner::alloc]", "value", "dfc-generated"]
@@ -375,7 +421,6 @@ extensions:
       - ["lang:alloc", "<crate::rc::Rc>::allocator", "Argument[0].Field[crate::rc::Rc::alloc]", "ReturnValue.Reference", "value", "dfc-generated"]
       - ["lang:alloc", "<crate::rc::Rc>::downcast", "Argument[self]", "ReturnValue.Field[crate::result::Result::Err(0)]", "value", "dfc-generated"]
       - ["lang:alloc", "<crate::rc::Rc>::downgrade", "Argument[0].Field[crate::rc::Rc::alloc].Reference", "ReturnValue.Field[crate::rc::Weak::alloc]", "value", "dfc-generated"]
-      - ["lang:alloc", "<crate::rc::Rc>::downgrade", "Argument[0].Field[crate::rc::Rc::alloc]", "ReturnValue.Field[crate::rc::Weak::alloc]", "value", "dfc-generated"]
       - ["lang:alloc", "<crate::rc::Rc>::downgrade", "Argument[0].Field[crate::rc::Rc::ptr]", "ReturnValue.Field[crate::rc::Weak::ptr]", "value", "dfc-generated"]
       - ["lang:alloc", "<crate::rc::Rc>::new_uninit_in", "Argument[0]", "ReturnValue.Field[crate::rc::Rc::alloc]", "value", "dfc-generated"]
       - ["lang:alloc", "<crate::rc::Rc>::new_uninit_slice_in", "Argument[1]", "ReturnValue.Field[crate::rc::Rc::alloc]", "value", "dfc-generated"]
@@ -385,23 +430,26 @@ extensions:
       - ["lang:alloc", "<crate::rc::Rc>::try_new_zeroed_in", "Argument[0]", "ReturnValue.Field[crate::result::Result::Ok(0)].Field[crate::rc::Rc::alloc]", "value", "dfc-generated"]
       - ["lang:alloc", "<crate::rc::Rc>::try_unwrap", "Argument[0]", "ReturnValue.Field[crate::result::Result::Err(0)]", "value", "dfc-generated"]
       - ["lang:alloc", "<crate::rc::Rc>::unwrap_or_clone", "Argument[0].Reference.Reference", "ReturnValue", "value", "dfc-generated"]
-      - ["lang:alloc", "<crate::rc::Rc>::unwrap_or_clone", "Argument[0].Reference", "ReturnValue", "value", "dfc-generated"]
       - ["lang:alloc", "<crate::rc::RcInner as crate::rc::RcInnerPtr>::strong_ref", "Argument[self].Field[crate::rc::RcInner::strong]", "ReturnValue.Reference", "value", "dfc-generated"]
       - ["lang:alloc", "<crate::rc::RcInner as crate::rc::RcInnerPtr>::weak_ref", "Argument[self].Field[crate::rc::RcInner::weak]", "ReturnValue.Reference", "value", "dfc-generated"]
       - ["lang:alloc", "<crate::rc::UniqueRc as crate::borrow::Borrow>::borrow", "Argument[self].Reference.Reference", "ReturnValue.Reference", "value", "dfc-generated"]
       - ["lang:alloc", "<crate::rc::UniqueRc as crate::borrow::BorrowMut>::borrow_mut", "Argument[self].Reference.Reference", "ReturnValue.Reference", "value", "dfc-generated"]
       - ["lang:alloc", "<crate::rc::UniqueRc as crate::convert::AsMut>::as_mut", "Argument[self].Reference.Reference", "ReturnValue.Reference", "value", "dfc-generated"]
       - ["lang:alloc", "<crate::rc::UniqueRc as crate::convert::AsRef>::as_ref", "Argument[self].Reference.Reference", "ReturnValue.Reference", "value", "dfc-generated"]
-      - ["lang:alloc", "<crate::rc::UniqueRc>::downgrade", "Argument[0]", "ReturnValue", "taint", "df-generated"]
-      - ["lang:alloc", "<crate::rc::Weak as crate::clone::Clone>::clone", "Argument[self]", "ReturnValue", "taint", "df-generated"]
+      - ["lang:alloc", "<crate::rc::UniqueRc>::downgrade", "Argument[0].Field[crate::rc::UniqueRc::alloc].Reference", "ReturnValue.Field[crate::rc::Weak::alloc]", "value", "dfc-generated"]
+      - ["lang:alloc", "<crate::rc::UniqueRc>::downgrade", "Argument[0].Field[crate::rc::UniqueRc::alloc]", "ReturnValue.Field[crate::rc::Weak::alloc]", "value", "dfc-generated"]
+      - ["lang:alloc", "<crate::rc::UniqueRc>::downgrade", "Argument[0].Field[crate::rc::UniqueRc::ptr]", "ReturnValue.Field[crate::rc::Weak::ptr]", "value", "dfc-generated"]
+      - ["lang:alloc", "<crate::rc::Weak as crate::clone::Clone>::clone", "Argument[self].Field[crate::rc::Weak::alloc].Reference", "ReturnValue.Field[crate::rc::Weak::alloc]", "value", "dfc-generated"]
+      - ["lang:alloc", "<crate::rc::Weak as crate::clone::Clone>::clone", "Argument[self].Field[crate::rc::Weak::alloc]", "ReturnValue.Field[crate::rc::Weak::alloc]", "value", "dfc-generated"]
+      - ["lang:alloc", "<crate::rc::Weak as crate::clone::Clone>::clone", "Argument[self].Field[crate::rc::Weak::ptr]", "ReturnValue.Field[crate::rc::Weak::ptr]", "value", "dfc-generated"]
       - ["lang:alloc", "<crate::rc::Weak>::allocator", "Argument[self].Field[crate::rc::Weak::alloc]", "ReturnValue.Reference", "value", "dfc-generated"]
       - ["lang:alloc", "<crate::rc::Weak>::from_raw_in", "Argument[1]", "ReturnValue.Field[crate::rc::Weak::alloc]", "value", "dfc-generated"]
       - ["lang:alloc", "<crate::rc::Weak>::new_in", "Argument[0]", "ReturnValue.Field[crate::rc::Weak::alloc]", "value", "dfc-generated"]
       - ["lang:alloc", "<crate::rc::Weak>::upgrade", "Argument[self].Field[crate::rc::Weak::alloc].Reference", "ReturnValue.Field[crate::option::Option::Some(0)].Field[crate::rc::Rc::alloc]", "value", "dfc-generated"]
-      - ["lang:alloc", "<crate::rc::Weak>::upgrade", "Argument[self].Field[crate::rc::Weak::alloc]", "ReturnValue.Field[crate::option::Option::Some(0)].Field[crate::rc::Rc::alloc]", "value", "dfc-generated"]
       - ["lang:alloc", "<crate::rc::Weak>::upgrade", "Argument[self].Field[crate::rc::Weak::ptr]", "ReturnValue.Field[crate::option::Option::Some(0)].Field[crate::rc::Rc::ptr]", "value", "dfc-generated"]
       - ["lang:alloc", "<crate::rc::WeakInner as crate::rc::RcInnerPtr>::strong_ref", "Argument[self].Field[crate::rc::WeakInner::strong]", "ReturnValue", "value", "dfc-generated"]
       - ["lang:alloc", "<crate::rc::WeakInner as crate::rc::RcInnerPtr>::weak_ref", "Argument[self].Field[crate::rc::WeakInner::weak]", "ReturnValue", "value", "dfc-generated"]
+      - ["lang:alloc", "<crate::string::FromUtf16Error as crate::fmt::Display>::fmt", "Argument[0]", "ReturnValue", "taint", "df-generated"]
       - ["lang:alloc", "<crate::string::FromUtf8Error>::as_bytes", "Argument[self].Field[crate::string::FromUtf8Error::bytes].Element", "ReturnValue.Reference", "value", "dfc-generated"]
       - ["lang:alloc", "<crate::string::FromUtf8Error>::into_bytes", "Argument[self].Field[crate::string::FromUtf8Error::bytes]", "ReturnValue", "value", "dfc-generated"]
       - ["lang:alloc", "<crate::string::FromUtf8Error>::utf8_error", "Argument[self].Field[crate::string::FromUtf8Error::error]", "ReturnValue", "value", "dfc-generated"]
@@ -412,6 +460,10 @@ extensions:
       - ["lang:alloc", "<crate::string::String as crate::clone::Clone>::clone", "Argument[self].Field[crate::string::String::vec]", "ReturnValue.Field[crate::string::String::vec]", "value", "dfc-generated"]
       - ["lang:alloc", "<crate::string::String as crate::convert::AsMut>::as_mut", "Argument[self]", "ReturnValue", "value", "dfc-generated"]
       - ["lang:alloc", "<crate::string::String as crate::convert::AsRef>::as_ref", "Argument[self]", "ReturnValue", "value", "dfc-generated"]
+      - ["lang:alloc", "<crate::string::String as crate::convert::From>::from", "Argument[0].Field[crate::borrow::Cow::Owned(0)]", "ReturnValue", "value", "dfc-generated"]
+      - ["lang:alloc", "<crate::string::String as crate::convert::From>::from", "Argument[0].Field[crate::string::String::vec].Reference", "ReturnValue.Field[crate::string::String::vec]", "value", "dfc-generated"]
+      - ["lang:alloc", "<crate::string::String as crate::convert::From>::from", "Argument[0].Field[crate::string::String::vec]", "ReturnValue.Field[crate::string::String::vec]", "value", "dfc-generated"]
+      - ["lang:alloc", "<crate::string::String as crate::convert::From>::from", "Argument[0].Reference", "ReturnValue", "value", "dfc-generated"]
       - ["lang:alloc", "<crate::string::String as crate::convert::From>::from", "Argument[0]", "ReturnValue", "taint", "df-generated"]
       - ["lang:alloc", "<crate::string::String as crate::convert::TryFrom>::try_from", "Argument[0]", "ReturnValue", "taint", "df-generated"]
       - ["lang:alloc", "<crate::string::String as crate::ops::arith::Add>::add", "Argument[self]", "ReturnValue", "value", "dfc-generated"]
@@ -424,13 +476,16 @@ extensions:
       - ["lang:alloc", "<crate::string::String>::from_utf8_lossy_owned", "Argument[0]", "ReturnValue.Field[crate::string::String::vec]", "value", "dfc-generated"]
       - ["lang:alloc", "<crate::string::String>::from_utf8_unchecked", "Argument[0]", "ReturnValue.Field[crate::string::String::vec]", "value", "dfc-generated"]
       - ["lang:alloc", "<crate::string::String>::into_bytes", "Argument[self].Field[crate::string::String::vec]", "ReturnValue", "value", "dfc-generated"]
+      - ["lang:alloc", "<crate::string::String>::len", "Argument[self].Field[crate::string::String::vec].Field[crate::vec::Vec::len]", "ReturnValue", "value", "dfc-generated"]
+      - ["lang:alloc", "<crate::string::String>::remove", "Argument[0]", "Argument[self]", "taint", "df-generated"]
+      - ["lang:alloc", "<crate::string::String>::split_off", "Argument[0]", "Argument[self].Field[crate::string::String::vec].Field[crate::vec::Vec::len]", "value", "dfc-generated"]
+      - ["lang:alloc", "<crate::string::String>::truncate", "Argument[0]", "Argument[self].Field[crate::string::String::vec].Field[crate::vec::Vec::len]", "value", "dfc-generated"]
       - ["lang:alloc", "<crate::sync::Arc as crate::borrow::Borrow>::borrow", "Argument[self].Reference.Reference", "ReturnValue.Reference", "value", "dfc-generated"]
       - ["lang:alloc", "<crate::sync::Arc as crate::convert::AsRef>::as_ref", "Argument[self].Reference.Reference", "ReturnValue.Reference", "value", "dfc-generated"]
       - ["lang:alloc", "<crate::sync::Arc as crate::convert::TryFrom>::try_from", "Argument[0]", "ReturnValue.Field[crate::result::Result::Err(0)]", "value", "dfc-generated"]
       - ["lang:alloc", "<crate::sync::Arc>::allocator", "Argument[0].Field[crate::sync::Arc::alloc]", "ReturnValue.Reference", "value", "dfc-generated"]
       - ["lang:alloc", "<crate::sync::Arc>::downcast", "Argument[self]", "ReturnValue.Field[crate::result::Result::Err(0)]", "value", "dfc-generated"]
       - ["lang:alloc", "<crate::sync::Arc>::downgrade", "Argument[0].Field[crate::sync::Arc::alloc].Reference", "ReturnValue.Field[crate::sync::Weak::alloc]", "value", "dfc-generated"]
-      - ["lang:alloc", "<crate::sync::Arc>::downgrade", "Argument[0].Field[crate::sync::Arc::alloc]", "ReturnValue.Field[crate::sync::Weak::alloc]", "value", "dfc-generated"]
       - ["lang:alloc", "<crate::sync::Arc>::downgrade", "Argument[0].Field[crate::sync::Arc::ptr]", "ReturnValue.Field[crate::sync::Weak::ptr]", "value", "dfc-generated"]
       - ["lang:alloc", "<crate::sync::Arc>::new_uninit_in", "Argument[0]", "ReturnValue.Field[crate::sync::Arc::alloc]", "value", "dfc-generated"]
       - ["lang:alloc", "<crate::sync::Arc>::new_uninit_slice_in", "Argument[1]", "ReturnValue.Field[crate::sync::Arc::alloc]", "value", "dfc-generated"]
@@ -440,33 +495,42 @@ extensions:
       - ["lang:alloc", "<crate::sync::Arc>::try_new_zeroed_in", "Argument[0]", "ReturnValue.Field[crate::result::Result::Ok(0)].Field[crate::sync::Arc::alloc]", "value", "dfc-generated"]
       - ["lang:alloc", "<crate::sync::Arc>::try_unwrap", "Argument[0]", "ReturnValue.Field[crate::result::Result::Err(0)]", "value", "dfc-generated"]
       - ["lang:alloc", "<crate::sync::Arc>::unwrap_or_clone", "Argument[0].Reference.Reference", "ReturnValue", "value", "dfc-generated"]
-      - ["lang:alloc", "<crate::sync::Arc>::unwrap_or_clone", "Argument[0].Reference", "ReturnValue", "value", "dfc-generated"]
-      - ["lang:alloc", "<crate::sync::Weak as crate::clone::Clone>::clone", "Argument[self]", "ReturnValue", "taint", "df-generated"]
+      - ["lang:alloc", "<crate::sync::Weak as crate::clone::Clone>::clone", "Argument[self].Field[crate::sync::Weak::alloc].Reference", "ReturnValue.Field[crate::sync::Weak::alloc]", "value", "dfc-generated"]
+      - ["lang:alloc", "<crate::sync::Weak as crate::clone::Clone>::clone", "Argument[self].Field[crate::sync::Weak::alloc]", "ReturnValue.Field[crate::sync::Weak::alloc]", "value", "dfc-generated"]
+      - ["lang:alloc", "<crate::sync::Weak as crate::clone::Clone>::clone", "Argument[self].Field[crate::sync::Weak::ptr]", "ReturnValue.Field[crate::sync::Weak::ptr]", "value", "dfc-generated"]
       - ["lang:alloc", "<crate::sync::Weak>::allocator", "Argument[self].Field[crate::sync::Weak::alloc]", "ReturnValue.Reference", "value", "dfc-generated"]
       - ["lang:alloc", "<crate::sync::Weak>::from_raw", "Argument[0]", "ReturnValue", "taint", "df-generated"]
       - ["lang:alloc", "<crate::sync::Weak>::from_raw_in", "Argument[1]", "ReturnValue.Field[crate::sync::Weak::alloc]", "value", "dfc-generated"]
       - ["lang:alloc", "<crate::sync::Weak>::new_in", "Argument[0]", "ReturnValue.Field[crate::sync::Weak::alloc]", "value", "dfc-generated"]
       - ["lang:alloc", "<crate::sync::Weak>::upgrade", "Argument[self].Field[crate::sync::Weak::alloc].Reference", "ReturnValue.Field[crate::option::Option::Some(0)].Field[crate::sync::Arc::alloc]", "value", "dfc-generated"]
-      - ["lang:alloc", "<crate::sync::Weak>::upgrade", "Argument[self].Field[crate::sync::Weak::alloc]", "ReturnValue.Field[crate::option::Option::Some(0)].Field[crate::sync::Arc::alloc]", "value", "dfc-generated"]
       - ["lang:alloc", "<crate::sync::Weak>::upgrade", "Argument[self].Field[crate::sync::Weak::ptr]", "ReturnValue.Field[crate::option::Option::Some(0)].Field[crate::sync::Arc::ptr]", "value", "dfc-generated"]
       - ["lang:alloc", "<crate::vec::Vec as crate::borrow::Borrow>::borrow", "Argument[self].Element", "ReturnValue.Reference", "value", "dfc-generated"]
       - ["lang:alloc", "<crate::vec::Vec as crate::borrow::BorrowMut>::borrow_mut", "Argument[self].Element", "ReturnValue.Reference", "value", "dfc-generated"]
       - ["lang:alloc", "<crate::vec::Vec as crate::convert::AsMut>::as_mut", "Argument[self]", "ReturnValue", "value", "dfc-generated"]
       - ["lang:alloc", "<crate::vec::Vec as crate::convert::AsRef>::as_ref", "Argument[self]", "ReturnValue", "value", "dfc-generated"]
       - ["lang:alloc", "<crate::vec::Vec as crate::convert::From>::from", "Argument[0].Field[0]", "ReturnValue", "value", "dfc-generated"]
+      - ["lang:alloc", "<crate::vec::Vec as crate::convert::From>::from", "Argument[0].Field[crate::borrow::Cow::Owned(0)]", "ReturnValue", "value", "dfc-generated"]
       - ["lang:alloc", "<crate::vec::Vec as crate::convert::From>::from", "Argument[0].Field[crate::bstr::ByteString(0)]", "ReturnValue", "value", "dfc-generated"]
       - ["lang:alloc", "<crate::vec::Vec as crate::convert::From>::from", "Argument[0].Field[crate::collections::binary_heap::BinaryHeap::data]", "ReturnValue", "value", "dfc-generated"]
       - ["lang:alloc", "<crate::vec::Vec as crate::convert::From>::from", "Argument[0].Field[crate::string::String::vec]", "ReturnValue", "value", "dfc-generated"]
+      - ["lang:alloc", "<crate::vec::Vec>::drain", "Argument[self].Field[crate::ptr::unique::Unique::pointer]", "ReturnValue.Field[crate::vec::drain::Drain::vec]", "value", "dfc-generated"]
       - ["lang:alloc", "<crate::vec::Vec>::extract_if", "Argument[1]", "ReturnValue.Field[crate::vec::extract_if::ExtractIf::pred]", "value", "dfc-generated"]
+      - ["lang:alloc", "<crate::vec::Vec>::extract_if", "Argument[self].Field[crate::vec::Vec::len]", "ReturnValue.Field[crate::vec::extract_if::ExtractIf::old_len]", "value", "dfc-generated"]
       - ["lang:alloc", "<crate::vec::Vec>::extract_if", "Argument[self]", "ReturnValue.Field[crate::vec::extract_if::ExtractIf::vec]", "value", "dfc-generated"]
       - ["lang:alloc", "<crate::vec::Vec>::from_parts_in", "Argument[1]", "ReturnValue.Field[crate::vec::Vec::len]", "value", "dfc-generated"]
       - ["lang:alloc", "<crate::vec::Vec>::from_raw_parts_in", "Argument[1]", "ReturnValue.Field[crate::vec::Vec::len]", "value", "dfc-generated"]
       - ["lang:alloc", "<crate::vec::Vec>::len", "Argument[self].Field[crate::vec::Vec::len]", "ReturnValue", "value", "dfc-generated"]
       - ["lang:alloc", "<crate::vec::Vec>::push_within_capacity", "Argument[0]", "ReturnValue.Field[crate::result::Result::Err(0)]", "value", "dfc-generated"]
+      - ["lang:alloc", "<crate::vec::Vec>::resize", "Argument[0]", "Argument[self].Field[crate::vec::Vec::len]", "value", "dfc-generated"]
+      - ["lang:alloc", "<crate::vec::Vec>::resize_with", "Argument[0]", "Argument[self].Field[crate::vec::Vec::len]", "value", "dfc-generated"]
       - ["lang:alloc", "<crate::vec::Vec>::set_len", "Argument[0]", "Argument[self].Field[crate::vec::Vec::len]", "value", "dfc-generated"]
+      - ["lang:alloc", "<crate::vec::Vec>::splice", "Argument[self].Field[crate::ptr::unique::Unique::pointer]", "ReturnValue.Field[crate::vec::splice::Splice::drain].Field[crate::vec::drain::Drain::vec]", "value", "dfc-generated"]
+      - ["lang:alloc", "<crate::vec::Vec>::split_off", "Argument[0]", "Argument[self].Field[crate::vec::Vec::len]", "value", "dfc-generated"]
       - ["lang:alloc", "<crate::vec::Vec>::truncate", "Argument[0]", "Argument[self].Field[crate::vec::Vec::len]", "value", "dfc-generated"]
+      - ["lang:alloc", "<crate::vec::Vec>::try_with_capacity_in", "Argument[1]", "ReturnValue.Field[crate::raw_vec::RawVec::inner].Field[crate::raw_vec::RawVecInner::alloc]", "value", "dfc-generated"]
       - ["lang:alloc", "<crate::vec::drain::Drain as crate::iter::traits::iterator::Iterator>::next", "Argument[self]", "ReturnValue", "taint", "df-generated"]
       - ["lang:alloc", "<crate::vec::extract_if::ExtractIf as crate::iter::traits::iterator::Iterator>::size_hint", "Argument[self]", "ReturnValue", "taint", "df-generated"]
+      - ["lang:alloc", "<crate::vec::extract_if::ExtractIf>::new", "Argument[0].Field[crate::vec::Vec::len]", "ReturnValue.Field[crate::vec::extract_if::ExtractIf::old_len]", "value", "dfc-generated"]
       - ["lang:alloc", "<crate::vec::extract_if::ExtractIf>::new", "Argument[0]", "ReturnValue.Field[crate::vec::extract_if::ExtractIf::vec]", "value", "dfc-generated"]
       - ["lang:alloc", "<crate::vec::extract_if::ExtractIf>::new", "Argument[1]", "ReturnValue.Field[crate::vec::extract_if::ExtractIf::pred]", "value", "dfc-generated"]
       - ["lang:alloc", "<crate::vec::into_iter::IntoIter as crate::iter::adapters::SourceIter>::as_inner", "Argument[self]", "ReturnValue", "value", "dfc-generated"]
@@ -484,10 +548,150 @@ extensions:
       - ["lang:alloc", "<crate::vec::set_len_on_drop::SetLenOnDrop>::new", "Argument[0]", "ReturnValue.Field[crate::vec::set_len_on_drop::SetLenOnDrop::len]", "value", "dfc-generated"]
       - ["lang:alloc", "<dyn crate::error::Error>::downcast", "Argument[self]", "ReturnValue.Field[crate::result::Result::Err(0)]", "value", "dfc-generated"]
       - ["lang:alloc", "<i8 as crate::vec::spec_from_elem::SpecFromElem>::from_elem", "Argument[1]", "ReturnValue.Field[crate::vec::Vec::len]", "value", "dfc-generated"]
-      - ["lang:alloc", "<str as crate::string::SpecToString>::spec_to_string", "Argument[self]", "ReturnValue", "taint", "df-generated"]
+      - ["lang:alloc", "<str as crate::string::SpecToString>::spec_to_string", "Argument[self]", "ReturnValue", "value", "df-generated"]
       - ["lang:alloc", "<u8 as crate::vec::spec_from_elem::SpecFromElem>::from_elem", "Argument[1]", "ReturnValue.Field[crate::vec::Vec::len]", "value", "dfc-generated"]
       - ["lang:alloc", "crate::collections::btree::mem::replace", "Argument[0].Reference", "Argument[1].Parameter[0]", "value", "dfc-generated"]
-      - ["lang:alloc", "crate::collections::btree::mem::replace", "Argument[1].ReturnValue", "Argument[0].Reference", "value", "dfc-generated"]
       - ["lang:alloc", "crate::collections::btree::mem::take_mut", "Argument[0].Reference", "Argument[1].Parameter[0]", "value", "dfc-generated"]
       - ["lang:alloc", "crate::collections::btree::mem::take_mut", "Argument[1].ReturnValue", "Argument[0].Reference", "value", "dfc-generated"]
       - ["lang:alloc", "crate::str::convert_while_ascii", "Argument[0]", "Argument[1]", "taint", "df-generated"]
+  - addsTo:
+      pack: codeql/rust-all
+      extensible: sinkModel
+    data:
+      - ["lang:alloc", "<[_]>::sort", "Argument[self]", "pointer-access", "df-generated"]
+      - ["lang:alloc", "<[_]>::sort_by", "Argument[self]", "pointer-access", "df-generated"]
+      - ["lang:alloc", "<[_]>::sort_by_key", "Argument[self]", "pointer-access", "df-generated"]
+      - ["lang:alloc", "<crate::alloc::Global as crate::alloc::Allocator>::allocate", "Argument[0]", "alloc-layout", "df-generated"]
+      - ["lang:alloc", "<crate::alloc::Global as crate::alloc::Allocator>::allocate_zeroed", "Argument[0]", "alloc-layout", "df-generated"]
+      - ["lang:alloc", "<crate::alloc::Global as crate::alloc::Allocator>::grow", "Argument[2]", "alloc-layout", "df-generated"]
+      - ["lang:alloc", "<crate::alloc::Global as crate::alloc::Allocator>::grow", "Argument[2]", "alloc-size", "df-generated"]
+      - ["lang:alloc", "<crate::alloc::Global as crate::alloc::Allocator>::grow_zeroed", "Argument[2]", "alloc-layout", "df-generated"]
+      - ["lang:alloc", "<crate::alloc::Global as crate::alloc::Allocator>::grow_zeroed", "Argument[2]", "alloc-size", "df-generated"]
+      - ["lang:alloc", "<crate::alloc::Global as crate::alloc::Allocator>::shrink", "Argument[2]", "alloc-layout", "df-generated"]
+      - ["lang:alloc", "<crate::alloc::Global as crate::alloc::Allocator>::shrink", "Argument[2]", "alloc-size", "df-generated"]
+      - ["lang:alloc", "<crate::boxed::Box>::try_new_uninit_slice", "Argument[0]", "alloc-layout", "df-generated"]
+      - ["lang:alloc", "<crate::boxed::Box>::try_new_zeroed_slice", "Argument[0]", "alloc-layout", "df-generated"]
+      - ["lang:alloc", "<crate::collections::binary_heap::Drain as crate::iter::traits::iterator::Iterator>::next", "Argument[self]", "pointer-access", "df-generated"]
+      - ["lang:alloc", "<crate::collections::binary_heap::IntoIter as crate::iter::traits::double_ended::DoubleEndedIterator>::next_back", "Argument[self]", "pointer-access", "df-generated"]
+      - ["lang:alloc", "<crate::collections::btree::map::BTreeMap as crate::ops::drop::Drop>::drop", "Argument[self]", "pointer-access", "df-generated"]
+      - ["lang:alloc", "<crate::collections::btree::map::IntoIter as crate::iter::traits::double_ended::DoubleEndedIterator>::next_back", "Argument[self]", "pointer-access", "df-generated"]
+      - ["lang:alloc", "<crate::collections::btree::map::IntoIter as crate::iter::traits::iterator::Iterator>::next", "Argument[self]", "pointer-access", "df-generated"]
+      - ["lang:alloc", "<crate::collections::btree::map::IntoIter as crate::ops::drop::Drop>::drop", "Argument[self]", "pointer-access", "df-generated"]
+      - ["lang:alloc", "<crate::collections::btree::map::IntoKeys as crate::iter::traits::double_ended::DoubleEndedIterator>::next_back", "Argument[self]", "pointer-access", "df-generated"]
+      - ["lang:alloc", "<crate::collections::btree::map::IntoKeys as crate::iter::traits::iterator::Iterator>::last", "Argument[self]", "pointer-access", "df-generated"]
+      - ["lang:alloc", "<crate::collections::btree::map::IntoKeys as crate::iter::traits::iterator::Iterator>::max", "Argument[self]", "pointer-access", "df-generated"]
+      - ["lang:alloc", "<crate::collections::btree::map::IntoKeys as crate::iter::traits::iterator::Iterator>::min", "Argument[self]", "pointer-access", "df-generated"]
+      - ["lang:alloc", "<crate::collections::btree::map::IntoKeys as crate::iter::traits::iterator::Iterator>::next", "Argument[self]", "pointer-access", "df-generated"]
+      - ["lang:alloc", "<crate::collections::btree::map::IntoValues as crate::iter::traits::double_ended::DoubleEndedIterator>::next_back", "Argument[self]", "pointer-access", "df-generated"]
+      - ["lang:alloc", "<crate::collections::btree::map::IntoValues as crate::iter::traits::iterator::Iterator>::last", "Argument[self]", "pointer-access", "df-generated"]
+      - ["lang:alloc", "<crate::collections::btree::map::IntoValues as crate::iter::traits::iterator::Iterator>::next", "Argument[self]", "pointer-access", "df-generated"]
+      - ["lang:alloc", "<crate::collections::btree::map::Iter as crate::iter::traits::double_ended::DoubleEndedIterator>::next_back", "Argument[self]", "pointer-access", "df-generated"]
+      - ["lang:alloc", "<crate::collections::btree::map::Iter as crate::iter::traits::iterator::Iterator>::last", "Argument[self]", "pointer-access", "df-generated"]
+      - ["lang:alloc", "<crate::collections::btree::map::Iter as crate::iter::traits::iterator::Iterator>::max", "Argument[self]", "pointer-access", "df-generated"]
+      - ["lang:alloc", "<crate::collections::btree::map::Iter as crate::iter::traits::iterator::Iterator>::min", "Argument[self]", "pointer-access", "df-generated"]
+      - ["lang:alloc", "<crate::collections::btree::map::Iter as crate::iter::traits::iterator::Iterator>::next", "Argument[self]", "pointer-access", "df-generated"]
+      - ["lang:alloc", "<crate::collections::btree::map::IterMut as crate::iter::traits::double_ended::DoubleEndedIterator>::next_back", "Argument[self]", "pointer-access", "df-generated"]
+      - ["lang:alloc", "<crate::collections::btree::map::IterMut as crate::iter::traits::iterator::Iterator>::last", "Argument[self]", "pointer-access", "df-generated"]
+      - ["lang:alloc", "<crate::collections::btree::map::IterMut as crate::iter::traits::iterator::Iterator>::max", "Argument[self]", "pointer-access", "df-generated"]
+      - ["lang:alloc", "<crate::collections::btree::map::IterMut as crate::iter::traits::iterator::Iterator>::min", "Argument[self]", "pointer-access", "df-generated"]
+      - ["lang:alloc", "<crate::collections::btree::map::IterMut as crate::iter::traits::iterator::Iterator>::next", "Argument[self]", "pointer-access", "df-generated"]
+      - ["lang:alloc", "<crate::collections::btree::map::Keys as crate::iter::traits::double_ended::DoubleEndedIterator>::next_back", "Argument[self]", "pointer-access", "df-generated"]
+      - ["lang:alloc", "<crate::collections::btree::map::Keys as crate::iter::traits::iterator::Iterator>::last", "Argument[self]", "pointer-access", "df-generated"]
+      - ["lang:alloc", "<crate::collections::btree::map::Keys as crate::iter::traits::iterator::Iterator>::max", "Argument[self]", "pointer-access", "df-generated"]
+      - ["lang:alloc", "<crate::collections::btree::map::Keys as crate::iter::traits::iterator::Iterator>::min", "Argument[self]", "pointer-access", "df-generated"]
+      - ["lang:alloc", "<crate::collections::btree::map::Keys as crate::iter::traits::iterator::Iterator>::next", "Argument[self]", "pointer-access", "df-generated"]
+      - ["lang:alloc", "<crate::collections::btree::map::Range as crate::iter::traits::double_ended::DoubleEndedIterator>::next_back", "Argument[self]", "pointer-access", "df-generated"]
+      - ["lang:alloc", "<crate::collections::btree::map::Range as crate::iter::traits::iterator::Iterator>::last", "Argument[self]", "pointer-access", "df-generated"]
+      - ["lang:alloc", "<crate::collections::btree::map::Range as crate::iter::traits::iterator::Iterator>::max", "Argument[self]", "pointer-access", "df-generated"]
+      - ["lang:alloc", "<crate::collections::btree::map::Range as crate::iter::traits::iterator::Iterator>::min", "Argument[self]", "pointer-access", "df-generated"]
+      - ["lang:alloc", "<crate::collections::btree::map::Range as crate::iter::traits::iterator::Iterator>::next", "Argument[self]", "pointer-access", "df-generated"]
+      - ["lang:alloc", "<crate::collections::btree::map::RangeMut as crate::iter::traits::double_ended::DoubleEndedIterator>::next_back", "Argument[self]", "pointer-access", "df-generated"]
+      - ["lang:alloc", "<crate::collections::btree::map::RangeMut as crate::iter::traits::iterator::Iterator>::last", "Argument[self]", "pointer-access", "df-generated"]
+      - ["lang:alloc", "<crate::collections::btree::map::RangeMut as crate::iter::traits::iterator::Iterator>::max", "Argument[self]", "pointer-access", "df-generated"]
+      - ["lang:alloc", "<crate::collections::btree::map::RangeMut as crate::iter::traits::iterator::Iterator>::min", "Argument[self]", "pointer-access", "df-generated"]
+      - ["lang:alloc", "<crate::collections::btree::map::RangeMut as crate::iter::traits::iterator::Iterator>::next", "Argument[self]", "pointer-access", "df-generated"]
+      - ["lang:alloc", "<crate::collections::btree::map::Values as crate::iter::traits::double_ended::DoubleEndedIterator>::next_back", "Argument[self]", "pointer-access", "df-generated"]
+      - ["lang:alloc", "<crate::collections::btree::map::Values as crate::iter::traits::iterator::Iterator>::last", "Argument[self]", "pointer-access", "df-generated"]
+      - ["lang:alloc", "<crate::collections::btree::map::Values as crate::iter::traits::iterator::Iterator>::next", "Argument[self]", "pointer-access", "df-generated"]
+      - ["lang:alloc", "<crate::collections::btree::map::ValuesMut as crate::iter::traits::double_ended::DoubleEndedIterator>::next_back", "Argument[self]", "pointer-access", "df-generated"]
+      - ["lang:alloc", "<crate::collections::btree::map::ValuesMut as crate::iter::traits::iterator::Iterator>::last", "Argument[self]", "pointer-access", "df-generated"]
+      - ["lang:alloc", "<crate::collections::btree::map::ValuesMut as crate::iter::traits::iterator::Iterator>::next", "Argument[self]", "pointer-access", "df-generated"]
+      - ["lang:alloc", "<crate::collections::btree::navigate::LazyLeafRange>::deallocating_next_back_unchecked", "Argument[self]", "pointer-access", "df-generated"]
+      - ["lang:alloc", "<crate::collections::btree::navigate::LazyLeafRange>::deallocating_next_unchecked", "Argument[self]", "pointer-access", "df-generated"]
+      - ["lang:alloc", "<crate::collections::btree::navigate::LazyLeafRange>::next_back_unchecked", "Argument[self]", "pointer-access", "df-generated"]
+      - ["lang:alloc", "<crate::collections::btree::navigate::LazyLeafRange>::next_unchecked", "Argument[self]", "pointer-access", "df-generated"]
+      - ["lang:alloc", "<crate::collections::btree::navigate::LeafRange>::next_back_checked", "Argument[self]", "pointer-access", "df-generated"]
+      - ["lang:alloc", "<crate::collections::btree::navigate::LeafRange>::next_checked", "Argument[self]", "pointer-access", "df-generated"]
+      - ["lang:alloc", "<crate::collections::btree::node::Handle>::consider_for_balancing", "Argument[self]", "pointer-access", "df-generated"]
+      - ["lang:alloc", "<crate::collections::btree::node::NodeRef>::append_from_sorted_iters", "Argument[self]", "pointer-access", "df-generated"]
+      - ["lang:alloc", "<crate::collections::btree::node::NodeRef>::bulk_push", "Argument[self]", "pointer-access", "df-generated"]
+      - ["lang:alloc", "<crate::collections::btree::node::NodeRef>::choose_parent_kv", "Argument[self]", "pointer-access", "df-generated"]
+      - ["lang:alloc", "<crate::collections::btree::node::NodeRef>::fix_node_and_affected_ancestors", "Argument[self]", "pointer-access", "df-generated"]
+      - ["lang:alloc", "<crate::collections::btree::node::NodeRef>::full_range", "Argument[self]", "pointer-access", "df-generated"]
+      - ["lang:alloc", "<crate::collections::btree::node::NodeRef>::push_internal_level", "Argument[self]", "pointer-access", "df-generated"]
+      - ["lang:alloc", "<crate::collections::btree::set::IntoIter as crate::iter::traits::double_ended::DoubleEndedIterator>::next_back", "Argument[self]", "pointer-access", "df-generated"]
+      - ["lang:alloc", "<crate::collections::btree::set::IntoIter as crate::iter::traits::iterator::Iterator>::next", "Argument[self]", "pointer-access", "df-generated"]
+      - ["lang:alloc", "<crate::collections::btree::set::Iter as crate::iter::traits::double_ended::DoubleEndedIterator>::next_back", "Argument[self]", "pointer-access", "df-generated"]
+      - ["lang:alloc", "<crate::collections::btree::set::Iter as crate::iter::traits::iterator::Iterator>::last", "Argument[self]", "pointer-access", "df-generated"]
+      - ["lang:alloc", "<crate::collections::btree::set::Iter as crate::iter::traits::iterator::Iterator>::max", "Argument[self]", "pointer-access", "df-generated"]
+      - ["lang:alloc", "<crate::collections::btree::set::Iter as crate::iter::traits::iterator::Iterator>::min", "Argument[self]", "pointer-access", "df-generated"]
+      - ["lang:alloc", "<crate::collections::btree::set::Iter as crate::iter::traits::iterator::Iterator>::next", "Argument[self]", "pointer-access", "df-generated"]
+      - ["lang:alloc", "<crate::collections::btree::set::Range as crate::iter::traits::double_ended::DoubleEndedIterator>::next_back", "Argument[self]", "pointer-access", "df-generated"]
+      - ["lang:alloc", "<crate::collections::btree::set::Range as crate::iter::traits::iterator::Iterator>::last", "Argument[self]", "pointer-access", "df-generated"]
+      - ["lang:alloc", "<crate::collections::btree::set::Range as crate::iter::traits::iterator::Iterator>::max", "Argument[self]", "pointer-access", "df-generated"]
+      - ["lang:alloc", "<crate::collections::btree::set::Range as crate::iter::traits::iterator::Iterator>::min", "Argument[self]", "pointer-access", "df-generated"]
+      - ["lang:alloc", "<crate::collections::btree::set::Range as crate::iter::traits::iterator::Iterator>::next", "Argument[self]", "pointer-access", "df-generated"]
+      - ["lang:alloc", "<crate::collections::vec_deque::VecDeque as crate::clone::Clone>::clone_from", "Argument[self]", "log-injection", "df-generated"]
+      - ["lang:alloc", "<crate::collections::vec_deque::VecDeque as crate::collections::vec_deque::spec_extend::SpecExtend>::spec_extend", "Argument[self]", "log-injection", "df-generated"]
+      - ["lang:alloc", "<crate::collections::vec_deque::VecDeque as crate::iter::traits::collect::Extend>::extend", "Argument[self]", "log-injection", "df-generated"]
+      - ["lang:alloc", "<crate::collections::vec_deque::VecDeque as crate::iter::traits::collect::Extend>::extend_one", "Argument[self]", "log-injection", "df-generated"]
+      - ["lang:alloc", "<crate::collections::vec_deque::VecDeque as crate::iter::traits::collect::Extend>::extend_reserve", "Argument[self]", "log-injection", "df-generated"]
+      - ["lang:alloc", "<crate::collections::vec_deque::VecDeque>::append", "Argument[self]", "log-injection", "df-generated"]
+      - ["lang:alloc", "<crate::collections::vec_deque::VecDeque>::insert", "Argument[0]", "log-injection", "df-generated"]
+      - ["lang:alloc", "<crate::collections::vec_deque::VecDeque>::insert", "Argument[self]", "log-injection", "df-generated"]
+      - ["lang:alloc", "<crate::collections::vec_deque::VecDeque>::make_contiguous", "Argument[self]", "log-injection", "df-generated"]
+      - ["lang:alloc", "<crate::collections::vec_deque::VecDeque>::push_back", "Argument[self]", "log-injection", "df-generated"]
+      - ["lang:alloc", "<crate::collections::vec_deque::VecDeque>::push_front", "Argument[self]", "log-injection", "df-generated"]
+      - ["lang:alloc", "<crate::collections::vec_deque::VecDeque>::remove", "Argument[0]", "log-injection", "df-generated"]
+      - ["lang:alloc", "<crate::collections::vec_deque::VecDeque>::remove", "Argument[self]", "log-injection", "df-generated"]
+      - ["lang:alloc", "<crate::collections::vec_deque::VecDeque>::reserve", "Argument[self]", "log-injection", "df-generated"]
+      - ["lang:alloc", "<crate::collections::vec_deque::VecDeque>::reserve_exact", "Argument[self]", "log-injection", "df-generated"]
+      - ["lang:alloc", "<crate::collections::vec_deque::VecDeque>::resize", "Argument[self]", "log-injection", "df-generated"]
+      - ["lang:alloc", "<crate::collections::vec_deque::VecDeque>::resize_with", "Argument[self]", "log-injection", "df-generated"]
+      - ["lang:alloc", "<crate::collections::vec_deque::VecDeque>::rotate_left", "Argument[0]", "log-injection", "df-generated"]
+      - ["lang:alloc", "<crate::collections::vec_deque::VecDeque>::rotate_left", "Argument[self]", "log-injection", "df-generated"]
+      - ["lang:alloc", "<crate::collections::vec_deque::VecDeque>::rotate_right", "Argument[0]", "log-injection", "df-generated"]
+      - ["lang:alloc", "<crate::collections::vec_deque::VecDeque>::rotate_right", "Argument[self]", "log-injection", "df-generated"]
+      - ["lang:alloc", "<crate::collections::vec_deque::VecDeque>::shrink_to", "Argument[0]", "log-injection", "df-generated"]
+      - ["lang:alloc", "<crate::collections::vec_deque::VecDeque>::shrink_to", "Argument[self]", "log-injection", "df-generated"]
+      - ["lang:alloc", "<crate::collections::vec_deque::VecDeque>::shrink_to_fit", "Argument[self]", "log-injection", "df-generated"]
+      - ["lang:alloc", "<crate::collections::vec_deque::VecDeque>::try_reserve", "Argument[self]", "log-injection", "df-generated"]
+      - ["lang:alloc", "<crate::collections::vec_deque::VecDeque>::try_reserve_exact", "Argument[self]", "log-injection", "df-generated"]
+      - ["lang:alloc", "<crate::rc::Rc>::make_mut", "Argument[0]", "pointer-access", "df-generated"]
+      - ["lang:alloc", "<crate::rc::Rc>::new_uninit_slice_in", "Argument[0]", "alloc-layout", "df-generated"]
+      - ["lang:alloc", "<crate::rc::Rc>::new_zeroed_slice", "Argument[0]", "alloc-layout", "df-generated"]
+      - ["lang:alloc", "<crate::rc::Rc>::new_zeroed_slice_in", "Argument[0]", "alloc-layout", "df-generated"]
+      - ["lang:alloc", "<crate::string::String>::split_off", "Argument[0]", "log-injection", "df-generated"]
+      - ["lang:alloc", "<crate::string::String>::split_off", "Argument[self]", "log-injection", "df-generated"]
+      - ["lang:alloc", "<crate::sync::Arc>::make_mut", "Argument[0]", "pointer-access", "df-generated"]
+      - ["lang:alloc", "<crate::sync::Arc>::new_zeroed_slice", "Argument[0]", "alloc-layout", "df-generated"]
+      - ["lang:alloc", "<crate::vec::Vec as crate::convert::From>::from", "Argument[0]", "log-injection", "df-generated"]
+      - ["lang:alloc", "<crate::vec::Vec>::insert", "Argument[0]", "log-injection", "df-generated"]
+      - ["lang:alloc", "<crate::vec::Vec>::insert", "Argument[self]", "log-injection", "df-generated"]
+      - ["lang:alloc", "<crate::vec::Vec>::remove", "Argument[0]", "log-injection", "df-generated"]
+      - ["lang:alloc", "<crate::vec::Vec>::remove", "Argument[self]", "log-injection", "df-generated"]
+      - ["lang:alloc", "<crate::vec::Vec>::split_off", "Argument[0]", "log-injection", "df-generated"]
+      - ["lang:alloc", "<crate::vec::Vec>::split_off", "Argument[self]", "log-injection", "df-generated"]
+      - ["lang:alloc", "<crate::vec::Vec>::swap_remove", "Argument[0]", "log-injection", "df-generated"]
+      - ["lang:alloc", "<crate::vec::Vec>::swap_remove", "Argument[self]", "log-injection", "df-generated"]
+      - ["lang:alloc", "<crate::vec::drain::Drain as crate::iter::traits::iterator::Iterator>::next", "Argument[self]", "pointer-access", "df-generated"]
+      - ["lang:alloc", "<crate::vec::into_iter::IntoIter as crate::iter::traits::double_ended::DoubleEndedIterator>::next_back", "Argument[self]", "pointer-access", "df-generated"]
+      - ["lang:alloc", "<crate::vec::splice::Splice as crate::iter::traits::iterator::Iterator>::next", "Argument[self]", "pointer-access", "df-generated"]
+      - ["lang:alloc", "crate::alloc::__alloc_error_handler::__rdl_oom", "Argument[0]", "log-injection", "df-generated"]
+      - ["lang:alloc", "crate::collections::btree::mem::replace", "Argument[0]", "pointer-access", "df-generated"]
+      - ["lang:alloc", "crate::collections::btree::mem::take_mut", "Argument[0]", "pointer-access", "df-generated"]
+  - addsTo:
+      pack: codeql/rust-all
+      extensible: sourceModel
+    data:
+      - ["lang:alloc", "<crate::rc::UniqueRc as crate::ops::drop::Drop>::drop", "Argument[self]", "pointer-invalidate", "df-generated"]
diff --git a/rust/ql/lib/ext/generated/rust/lang-core.model.yml b/rust/ql/lib/ext/generated/rust/lang-core.model.yml
index 734b13027cd..01235d61b5a 100644
--- a/rust/ql/lib/ext/generated/rust/lang-core.model.yml
+++ b/rust/ql/lib/ext/generated/rust/lang-core.model.yml
@@ -7,16 +7,199 @@ extensions:
       - ["lang:core", "<&_ as crate::borrow::Borrow>::borrow", "Argument[self].Reference.Reference", "ReturnValue.Reference", "value", "dfc-generated"]
       - ["lang:core", "<&_ as crate::clone::Clone>::clone", "Argument[self].Reference", "ReturnValue", "value", "dfc-generated"]
       - ["lang:core", "<&_ as crate::ops::deref::Deref>::deref", "Argument[self].Reference", "ReturnValue", "value", "dfc-generated"]
+      - ["lang:core", "<&bool as crate::ops::bit::BitAnd>::bitand", "Argument[0]", "ReturnValue", "taint", "df-generated"]
+      - ["lang:core", "<&bool as crate::ops::bit::BitAnd>::bitand", "Argument[self]", "ReturnValue", "taint", "df-generated"]
+      - ["lang:core", "<&bool as crate::ops::bit::BitOr>::bitor", "Argument[0]", "ReturnValue", "taint", "df-generated"]
+      - ["lang:core", "<&bool as crate::ops::bit::BitOr>::bitor", "Argument[self]", "ReturnValue", "taint", "df-generated"]
+      - ["lang:core", "<&bool as crate::ops::bit::BitXor>::bitxor", "Argument[0]", "ReturnValue", "taint", "df-generated"]
+      - ["lang:core", "<&bool as crate::ops::bit::BitXor>::bitxor", "Argument[self]", "ReturnValue", "taint", "df-generated"]
+      - ["lang:core", "<&bool as crate::ops::bit::Not>::not", "Argument[self]", "ReturnValue", "taint", "df-generated"]
       - ["lang:core", "<&crate::net::ip_addr::Ipv4Addr as crate::ops::bit::BitAnd>::bitand", "Argument[self].Reference", "ReturnValue", "value", "dfc-generated"]
       - ["lang:core", "<&crate::net::ip_addr::Ipv4Addr as crate::ops::bit::BitOr>::bitor", "Argument[self].Reference", "ReturnValue", "value", "dfc-generated"]
       - ["lang:core", "<&crate::net::ip_addr::Ipv4Addr as crate::ops::bit::Not>::not", "Argument[self]", "ReturnValue", "taint", "df-generated"]
       - ["lang:core", "<&crate::net::ip_addr::Ipv6Addr as crate::ops::bit::BitAnd>::bitand", "Argument[self].Reference", "ReturnValue", "value", "dfc-generated"]
       - ["lang:core", "<&crate::net::ip_addr::Ipv6Addr as crate::ops::bit::BitOr>::bitor", "Argument[self].Reference", "ReturnValue", "value", "dfc-generated"]
       - ["lang:core", "<&crate::net::ip_addr::Ipv6Addr as crate::ops::bit::Not>::not", "Argument[self]", "ReturnValue", "taint", "df-generated"]
+      - ["lang:core", "<&crate::num::saturating::Saturating as crate::ops::arith::Rem>::rem", "Argument[0]", "ReturnValue", "taint", "df-generated"]
+      - ["lang:core", "<&crate::num::saturating::Saturating as crate::ops::arith::Rem>::rem", "Argument[self]", "ReturnValue", "taint", "df-generated"]
+      - ["lang:core", "<&crate::num::saturating::Saturating as crate::ops::bit::BitAnd>::bitand", "Argument[0]", "ReturnValue", "taint", "df-generated"]
+      - ["lang:core", "<&crate::num::saturating::Saturating as crate::ops::bit::BitAnd>::bitand", "Argument[self]", "ReturnValue", "taint", "df-generated"]
+      - ["lang:core", "<&crate::num::saturating::Saturating as crate::ops::bit::BitOr>::bitor", "Argument[0]", "ReturnValue", "taint", "df-generated"]
+      - ["lang:core", "<&crate::num::saturating::Saturating as crate::ops::bit::BitOr>::bitor", "Argument[self]", "ReturnValue", "taint", "df-generated"]
+      - ["lang:core", "<&crate::num::saturating::Saturating as crate::ops::bit::BitXor>::bitxor", "Argument[0]", "ReturnValue", "taint", "df-generated"]
+      - ["lang:core", "<&crate::num::saturating::Saturating as crate::ops::bit::BitXor>::bitxor", "Argument[self]", "ReturnValue", "taint", "df-generated"]
+      - ["lang:core", "<&crate::num::saturating::Saturating as crate::ops::bit::Not>::not", "Argument[self]", "ReturnValue", "taint", "df-generated"]
+      - ["lang:core", "<&crate::num::wrapping::Wrapping as crate::ops::arith::Div>::div", "Argument[0]", "ReturnValue", "taint", "df-generated"]
+      - ["lang:core", "<&crate::num::wrapping::Wrapping as crate::ops::arith::Div>::div", "Argument[self]", "ReturnValue", "taint", "df-generated"]
+      - ["lang:core", "<&crate::num::wrapping::Wrapping as crate::ops::arith::Neg>::neg", "Argument[self]", "ReturnValue", "taint", "df-generated"]
+      - ["lang:core", "<&crate::num::wrapping::Wrapping as crate::ops::arith::Rem>::rem", "Argument[0]", "ReturnValue", "taint", "df-generated"]
+      - ["lang:core", "<&crate::num::wrapping::Wrapping as crate::ops::arith::Rem>::rem", "Argument[self]", "ReturnValue", "taint", "df-generated"]
+      - ["lang:core", "<&crate::num::wrapping::Wrapping as crate::ops::bit::BitAnd>::bitand", "Argument[0]", "ReturnValue", "taint", "df-generated"]
+      - ["lang:core", "<&crate::num::wrapping::Wrapping as crate::ops::bit::BitAnd>::bitand", "Argument[self]", "ReturnValue", "taint", "df-generated"]
+      - ["lang:core", "<&crate::num::wrapping::Wrapping as crate::ops::bit::BitOr>::bitor", "Argument[0]", "ReturnValue", "taint", "df-generated"]
+      - ["lang:core", "<&crate::num::wrapping::Wrapping as crate::ops::bit::BitOr>::bitor", "Argument[self]", "ReturnValue", "taint", "df-generated"]
+      - ["lang:core", "<&crate::num::wrapping::Wrapping as crate::ops::bit::BitXor>::bitxor", "Argument[0]", "ReturnValue", "taint", "df-generated"]
+      - ["lang:core", "<&crate::num::wrapping::Wrapping as crate::ops::bit::BitXor>::bitxor", "Argument[self]", "ReturnValue", "taint", "df-generated"]
+      - ["lang:core", "<&crate::num::wrapping::Wrapping as crate::ops::bit::Not>::not", "Argument[self]", "ReturnValue", "taint", "df-generated"]
       - ["lang:core", "<&crate::result::Result as crate::iter::traits::collect::IntoIterator>::into_iter", "Argument[self]", "ReturnValue", "taint", "df-generated"]
+      - ["lang:core", "<&f32 as crate::ops::arith::Add>::add", "Argument[0]", "ReturnValue", "taint", "df-generated"]
+      - ["lang:core", "<&f32 as crate::ops::arith::Add>::add", "Argument[self]", "ReturnValue", "taint", "df-generated"]
+      - ["lang:core", "<&f32 as crate::ops::arith::Div>::div", "Argument[0]", "ReturnValue", "taint", "df-generated"]
+      - ["lang:core", "<&f32 as crate::ops::arith::Div>::div", "Argument[self]", "ReturnValue", "taint", "df-generated"]
+      - ["lang:core", "<&f32 as crate::ops::arith::Mul>::mul", "Argument[0]", "ReturnValue", "taint", "df-generated"]
+      - ["lang:core", "<&f32 as crate::ops::arith::Mul>::mul", "Argument[self]", "ReturnValue", "taint", "df-generated"]
+      - ["lang:core", "<&f32 as crate::ops::arith::Neg>::neg", "Argument[self]", "ReturnValue", "taint", "df-generated"]
+      - ["lang:core", "<&f32 as crate::ops::arith::Rem>::rem", "Argument[0]", "ReturnValue", "taint", "df-generated"]
+      - ["lang:core", "<&f32 as crate::ops::arith::Rem>::rem", "Argument[self]", "ReturnValue", "taint", "df-generated"]
+      - ["lang:core", "<&f32 as crate::ops::arith::Sub>::sub", "Argument[0]", "ReturnValue", "taint", "df-generated"]
+      - ["lang:core", "<&f32 as crate::ops::arith::Sub>::sub", "Argument[self]", "ReturnValue", "taint", "df-generated"]
+      - ["lang:core", "<&f64 as crate::ops::arith::Add>::add", "Argument[0]", "ReturnValue", "taint", "df-generated"]
+      - ["lang:core", "<&f64 as crate::ops::arith::Add>::add", "Argument[self]", "ReturnValue", "taint", "df-generated"]
+      - ["lang:core", "<&f64 as crate::ops::arith::Div>::div", "Argument[0]", "ReturnValue", "taint", "df-generated"]
+      - ["lang:core", "<&f64 as crate::ops::arith::Div>::div", "Argument[self]", "ReturnValue", "taint", "df-generated"]
+      - ["lang:core", "<&f64 as crate::ops::arith::Mul>::mul", "Argument[0]", "ReturnValue", "taint", "df-generated"]
+      - ["lang:core", "<&f64 as crate::ops::arith::Mul>::mul", "Argument[self]", "ReturnValue", "taint", "df-generated"]
+      - ["lang:core", "<&f64 as crate::ops::arith::Neg>::neg", "Argument[self]", "ReturnValue", "taint", "df-generated"]
+      - ["lang:core", "<&f64 as crate::ops::arith::Rem>::rem", "Argument[0]", "ReturnValue", "taint", "df-generated"]
+      - ["lang:core", "<&f64 as crate::ops::arith::Rem>::rem", "Argument[self]", "ReturnValue", "taint", "df-generated"]
+      - ["lang:core", "<&f64 as crate::ops::arith::Sub>::sub", "Argument[0]", "ReturnValue", "taint", "df-generated"]
+      - ["lang:core", "<&f64 as crate::ops::arith::Sub>::sub", "Argument[self]", "ReturnValue", "taint", "df-generated"]
+      - ["lang:core", "<&i128 as crate::ops::arith::Add>::add", "Argument[0]", "ReturnValue", "taint", "df-generated"]
+      - ["lang:core", "<&i128 as crate::ops::arith::Add>::add", "Argument[self]", "ReturnValue", "taint", "df-generated"]
+      - ["lang:core", "<&i128 as crate::ops::arith::Div>::div", "Argument[0]", "ReturnValue", "taint", "df-generated"]
+      - ["lang:core", "<&i128 as crate::ops::arith::Div>::div", "Argument[self]", "ReturnValue", "taint", "df-generated"]
+      - ["lang:core", "<&i128 as crate::ops::arith::Mul>::mul", "Argument[0]", "ReturnValue", "taint", "df-generated"]
+      - ["lang:core", "<&i128 as crate::ops::arith::Mul>::mul", "Argument[self]", "ReturnValue", "taint", "df-generated"]
+      - ["lang:core", "<&i128 as crate::ops::arith::Neg>::neg", "Argument[self]", "ReturnValue", "taint", "df-generated"]
+      - ["lang:core", "<&i128 as crate::ops::arith::Rem>::rem", "Argument[0]", "ReturnValue", "taint", "df-generated"]
+      - ["lang:core", "<&i128 as crate::ops::arith::Rem>::rem", "Argument[self]", "ReturnValue", "taint", "df-generated"]
+      - ["lang:core", "<&i128 as crate::ops::arith::Sub>::sub", "Argument[0]", "ReturnValue", "taint", "df-generated"]
+      - ["lang:core", "<&i128 as crate::ops::arith::Sub>::sub", "Argument[self]", "ReturnValue", "taint", "df-generated"]
+      - ["lang:core", "<&i128 as crate::ops::bit::BitAnd>::bitand", "Argument[0]", "ReturnValue", "taint", "df-generated"]
+      - ["lang:core", "<&i128 as crate::ops::bit::BitAnd>::bitand", "Argument[self]", "ReturnValue", "taint", "df-generated"]
+      - ["lang:core", "<&i128 as crate::ops::bit::BitOr>::bitor", "Argument[0]", "ReturnValue", "taint", "df-generated"]
+      - ["lang:core", "<&i128 as crate::ops::bit::BitOr>::bitor", "Argument[self]", "ReturnValue", "taint", "df-generated"]
+      - ["lang:core", "<&i128 as crate::ops::bit::BitXor>::bitxor", "Argument[0]", "ReturnValue", "taint", "df-generated"]
+      - ["lang:core", "<&i128 as crate::ops::bit::BitXor>::bitxor", "Argument[self]", "ReturnValue", "taint", "df-generated"]
+      - ["lang:core", "<&i128 as crate::ops::bit::Not>::not", "Argument[self]", "ReturnValue", "taint", "df-generated"]
+      - ["lang:core", "<&i128 as crate::ops::bit::Shl>::shl", "Argument[0]", "ReturnValue", "taint", "df-generated"]
+      - ["lang:core", "<&i128 as crate::ops::bit::Shl>::shl", "Argument[self]", "ReturnValue", "taint", "df-generated"]
+      - ["lang:core", "<&i128 as crate::ops::bit::Shr>::shr", "Argument[0]", "ReturnValue", "taint", "df-generated"]
+      - ["lang:core", "<&i128 as crate::ops::bit::Shr>::shr", "Argument[self]", "ReturnValue", "taint", "df-generated"]
+      - ["lang:core", "<&i16 as crate::ops::arith::Add>::add", "Argument[0]", "ReturnValue", "taint", "df-generated"]
+      - ["lang:core", "<&i16 as crate::ops::arith::Add>::add", "Argument[self]", "ReturnValue", "taint", "df-generated"]
+      - ["lang:core", "<&i16 as crate::ops::arith::Div>::div", "Argument[0]", "ReturnValue", "taint", "df-generated"]
+      - ["lang:core", "<&i16 as crate::ops::arith::Div>::div", "Argument[self]", "ReturnValue", "taint", "df-generated"]
+      - ["lang:core", "<&i16 as crate::ops::arith::Mul>::mul", "Argument[0]", "ReturnValue", "taint", "df-generated"]
+      - ["lang:core", "<&i16 as crate::ops::arith::Mul>::mul", "Argument[self]", "ReturnValue", "taint", "df-generated"]
+      - ["lang:core", "<&i16 as crate::ops::arith::Neg>::neg", "Argument[self]", "ReturnValue", "taint", "df-generated"]
+      - ["lang:core", "<&i16 as crate::ops::arith::Rem>::rem", "Argument[0]", "ReturnValue", "taint", "df-generated"]
+      - ["lang:core", "<&i16 as crate::ops::arith::Rem>::rem", "Argument[self]", "ReturnValue", "taint", "df-generated"]
+      - ["lang:core", "<&i16 as crate::ops::arith::Sub>::sub", "Argument[0]", "ReturnValue", "taint", "df-generated"]
+      - ["lang:core", "<&i16 as crate::ops::arith::Sub>::sub", "Argument[self]", "ReturnValue", "taint", "df-generated"]
+      - ["lang:core", "<&i16 as crate::ops::bit::BitAnd>::bitand", "Argument[0]", "ReturnValue", "taint", "df-generated"]
+      - ["lang:core", "<&i16 as crate::ops::bit::BitAnd>::bitand", "Argument[self]", "ReturnValue", "taint", "df-generated"]
+      - ["lang:core", "<&i16 as crate::ops::bit::BitOr>::bitor", "Argument[0]", "ReturnValue", "taint", "df-generated"]
+      - ["lang:core", "<&i16 as crate::ops::bit::BitOr>::bitor", "Argument[self]", "ReturnValue", "taint", "df-generated"]
+      - ["lang:core", "<&i16 as crate::ops::bit::BitXor>::bitxor", "Argument[0]", "ReturnValue", "taint", "df-generated"]
+      - ["lang:core", "<&i16 as crate::ops::bit::BitXor>::bitxor", "Argument[self]", "ReturnValue", "taint", "df-generated"]
+      - ["lang:core", "<&i16 as crate::ops::bit::Not>::not", "Argument[self]", "ReturnValue", "taint", "df-generated"]
+      - ["lang:core", "<&i16 as crate::ops::bit::Shl>::shl", "Argument[0]", "ReturnValue", "taint", "df-generated"]
+      - ["lang:core", "<&i16 as crate::ops::bit::Shl>::shl", "Argument[self]", "ReturnValue", "taint", "df-generated"]
+      - ["lang:core", "<&i16 as crate::ops::bit::Shr>::shr", "Argument[0]", "ReturnValue", "taint", "df-generated"]
+      - ["lang:core", "<&i16 as crate::ops::bit::Shr>::shr", "Argument[self]", "ReturnValue", "taint", "df-generated"]
+      - ["lang:core", "<&i32 as crate::ops::arith::Add>::add", "Argument[0]", "ReturnValue", "taint", "df-generated"]
+      - ["lang:core", "<&i32 as crate::ops::arith::Add>::add", "Argument[self]", "ReturnValue", "taint", "df-generated"]
+      - ["lang:core", "<&i32 as crate::ops::arith::Div>::div", "Argument[0]", "ReturnValue", "taint", "df-generated"]
+      - ["lang:core", "<&i32 as crate::ops::arith::Div>::div", "Argument[self]", "ReturnValue", "taint", "df-generated"]
+      - ["lang:core", "<&i32 as crate::ops::arith::Mul>::mul", "Argument[0]", "ReturnValue", "taint", "df-generated"]
+      - ["lang:core", "<&i32 as crate::ops::arith::Mul>::mul", "Argument[self]", "ReturnValue", "taint", "df-generated"]
+      - ["lang:core", "<&i32 as crate::ops::arith::Neg>::neg", "Argument[self]", "ReturnValue", "taint", "df-generated"]
+      - ["lang:core", "<&i32 as crate::ops::arith::Rem>::rem", "Argument[0]", "ReturnValue", "taint", "df-generated"]
+      - ["lang:core", "<&i32 as crate::ops::arith::Rem>::rem", "Argument[self]", "ReturnValue", "taint", "df-generated"]
+      - ["lang:core", "<&i32 as crate::ops::arith::Sub>::sub", "Argument[0]", "ReturnValue", "taint", "df-generated"]
+      - ["lang:core", "<&i32 as crate::ops::arith::Sub>::sub", "Argument[self]", "ReturnValue", "taint", "df-generated"]
+      - ["lang:core", "<&i32 as crate::ops::bit::BitAnd>::bitand", "Argument[0]", "ReturnValue", "taint", "df-generated"]
+      - ["lang:core", "<&i32 as crate::ops::bit::BitAnd>::bitand", "Argument[self]", "ReturnValue", "taint", "df-generated"]
+      - ["lang:core", "<&i32 as crate::ops::bit::BitOr>::bitor", "Argument[0]", "ReturnValue", "taint", "df-generated"]
+      - ["lang:core", "<&i32 as crate::ops::bit::BitOr>::bitor", "Argument[self]", "ReturnValue", "taint", "df-generated"]
+      - ["lang:core", "<&i32 as crate::ops::bit::BitXor>::bitxor", "Argument[0]", "ReturnValue", "taint", "df-generated"]
+      - ["lang:core", "<&i32 as crate::ops::bit::BitXor>::bitxor", "Argument[self]", "ReturnValue", "taint", "df-generated"]
+      - ["lang:core", "<&i32 as crate::ops::bit::Not>::not", "Argument[self]", "ReturnValue", "taint", "df-generated"]
+      - ["lang:core", "<&i32 as crate::ops::bit::Shl>::shl", "Argument[0]", "ReturnValue", "taint", "df-generated"]
+      - ["lang:core", "<&i32 as crate::ops::bit::Shl>::shl", "Argument[self]", "ReturnValue", "taint", "df-generated"]
+      - ["lang:core", "<&i32 as crate::ops::bit::Shr>::shr", "Argument[0]", "ReturnValue", "taint", "df-generated"]
+      - ["lang:core", "<&i32 as crate::ops::bit::Shr>::shr", "Argument[self]", "ReturnValue", "taint", "df-generated"]
+      - ["lang:core", "<&i64 as crate::ops::arith::Add>::add", "Argument[0]", "ReturnValue", "taint", "df-generated"]
+      - ["lang:core", "<&i64 as crate::ops::arith::Add>::add", "Argument[self]", "ReturnValue", "taint", "df-generated"]
+      - ["lang:core", "<&i64 as crate::ops::arith::Div>::div", "Argument[0]", "ReturnValue", "taint", "df-generated"]
+      - ["lang:core", "<&i64 as crate::ops::arith::Div>::div", "Argument[self]", "ReturnValue", "taint", "df-generated"]
+      - ["lang:core", "<&i64 as crate::ops::arith::Mul>::mul", "Argument[0]", "ReturnValue", "taint", "df-generated"]
+      - ["lang:core", "<&i64 as crate::ops::arith::Mul>::mul", "Argument[self]", "ReturnValue", "taint", "df-generated"]
+      - ["lang:core", "<&i64 as crate::ops::arith::Neg>::neg", "Argument[self]", "ReturnValue", "taint", "df-generated"]
+      - ["lang:core", "<&i64 as crate::ops::arith::Rem>::rem", "Argument[0]", "ReturnValue", "taint", "df-generated"]
+      - ["lang:core", "<&i64 as crate::ops::arith::Rem>::rem", "Argument[self]", "ReturnValue", "taint", "df-generated"]
+      - ["lang:core", "<&i64 as crate::ops::arith::Sub>::sub", "Argument[0]", "ReturnValue", "taint", "df-generated"]
+      - ["lang:core", "<&i64 as crate::ops::arith::Sub>::sub", "Argument[self]", "ReturnValue", "taint", "df-generated"]
+      - ["lang:core", "<&i64 as crate::ops::bit::BitAnd>::bitand", "Argument[0]", "ReturnValue", "taint", "df-generated"]
+      - ["lang:core", "<&i64 as crate::ops::bit::BitAnd>::bitand", "Argument[self]", "ReturnValue", "taint", "df-generated"]
+      - ["lang:core", "<&i64 as crate::ops::bit::BitOr>::bitor", "Argument[0]", "ReturnValue", "taint", "df-generated"]
+      - ["lang:core", "<&i64 as crate::ops::bit::BitOr>::bitor", "Argument[self]", "ReturnValue", "taint", "df-generated"]
+      - ["lang:core", "<&i64 as crate::ops::bit::BitXor>::bitxor", "Argument[0]", "ReturnValue", "taint", "df-generated"]
+      - ["lang:core", "<&i64 as crate::ops::bit::BitXor>::bitxor", "Argument[self]", "ReturnValue", "taint", "df-generated"]
+      - ["lang:core", "<&i64 as crate::ops::bit::Not>::not", "Argument[self]", "ReturnValue", "taint", "df-generated"]
+      - ["lang:core", "<&i64 as crate::ops::bit::Shl>::shl", "Argument[0]", "ReturnValue", "taint", "df-generated"]
+      - ["lang:core", "<&i64 as crate::ops::bit::Shl>::shl", "Argument[self]", "ReturnValue", "taint", "df-generated"]
+      - ["lang:core", "<&i64 as crate::ops::bit::Shr>::shr", "Argument[0]", "ReturnValue", "taint", "df-generated"]
+      - ["lang:core", "<&i64 as crate::ops::bit::Shr>::shr", "Argument[self]", "ReturnValue", "taint", "df-generated"]
+      - ["lang:core", "<&i8 as crate::ops::arith::Add>::add", "Argument[0]", "ReturnValue", "taint", "df-generated"]
+      - ["lang:core", "<&i8 as crate::ops::arith::Add>::add", "Argument[self]", "ReturnValue", "taint", "df-generated"]
+      - ["lang:core", "<&i8 as crate::ops::arith::Div>::div", "Argument[0]", "ReturnValue", "taint", "df-generated"]
+      - ["lang:core", "<&i8 as crate::ops::arith::Div>::div", "Argument[self]", "ReturnValue", "taint", "df-generated"]
+      - ["lang:core", "<&i8 as crate::ops::arith::Mul>::mul", "Argument[0]", "ReturnValue", "taint", "df-generated"]
+      - ["lang:core", "<&i8 as crate::ops::arith::Mul>::mul", "Argument[self]", "ReturnValue", "taint", "df-generated"]
+      - ["lang:core", "<&i8 as crate::ops::arith::Neg>::neg", "Argument[self]", "ReturnValue", "taint", "df-generated"]
+      - ["lang:core", "<&i8 as crate::ops::arith::Rem>::rem", "Argument[0]", "ReturnValue", "taint", "df-generated"]
+      - ["lang:core", "<&i8 as crate::ops::arith::Rem>::rem", "Argument[self]", "ReturnValue", "taint", "df-generated"]
+      - ["lang:core", "<&i8 as crate::ops::arith::Sub>::sub", "Argument[0]", "ReturnValue", "taint", "df-generated"]
+      - ["lang:core", "<&i8 as crate::ops::arith::Sub>::sub", "Argument[self]", "ReturnValue", "taint", "df-generated"]
+      - ["lang:core", "<&i8 as crate::ops::bit::BitAnd>::bitand", "Argument[0]", "ReturnValue", "taint", "df-generated"]
+      - ["lang:core", "<&i8 as crate::ops::bit::BitAnd>::bitand", "Argument[self]", "ReturnValue", "taint", "df-generated"]
+      - ["lang:core", "<&i8 as crate::ops::bit::BitOr>::bitor", "Argument[0]", "ReturnValue", "taint", "df-generated"]
+      - ["lang:core", "<&i8 as crate::ops::bit::BitOr>::bitor", "Argument[self]", "ReturnValue", "taint", "df-generated"]
+      - ["lang:core", "<&i8 as crate::ops::bit::BitXor>::bitxor", "Argument[0]", "ReturnValue", "taint", "df-generated"]
+      - ["lang:core", "<&i8 as crate::ops::bit::BitXor>::bitxor", "Argument[self]", "ReturnValue", "taint", "df-generated"]
+      - ["lang:core", "<&i8 as crate::ops::bit::Not>::not", "Argument[self]", "ReturnValue", "taint", "df-generated"]
+      - ["lang:core", "<&i8 as crate::ops::bit::Shl>::shl", "Argument[0]", "ReturnValue", "taint", "df-generated"]
+      - ["lang:core", "<&i8 as crate::ops::bit::Shl>::shl", "Argument[self]", "ReturnValue", "taint", "df-generated"]
+      - ["lang:core", "<&i8 as crate::ops::bit::Shr>::shr", "Argument[0]", "ReturnValue", "taint", "df-generated"]
+      - ["lang:core", "<&i8 as crate::ops::bit::Shr>::shr", "Argument[self]", "ReturnValue", "taint", "df-generated"]
+      - ["lang:core", "<&isize as crate::ops::arith::Add>::add", "Argument[0]", "ReturnValue", "taint", "df-generated"]
+      - ["lang:core", "<&isize as crate::ops::arith::Add>::add", "Argument[self]", "ReturnValue", "taint", "df-generated"]
+      - ["lang:core", "<&isize as crate::ops::arith::Div>::div", "Argument[0]", "ReturnValue", "taint", "df-generated"]
+      - ["lang:core", "<&isize as crate::ops::arith::Div>::div", "Argument[self]", "ReturnValue", "taint", "df-generated"]
+      - ["lang:core", "<&isize as crate::ops::arith::Mul>::mul", "Argument[0]", "ReturnValue", "taint", "df-generated"]
+      - ["lang:core", "<&isize as crate::ops::arith::Mul>::mul", "Argument[self]", "ReturnValue", "taint", "df-generated"]
+      - ["lang:core", "<&isize as crate::ops::arith::Neg>::neg", "Argument[self]", "ReturnValue", "taint", "df-generated"]
+      - ["lang:core", "<&isize as crate::ops::arith::Rem>::rem", "Argument[0]", "ReturnValue", "taint", "df-generated"]
+      - ["lang:core", "<&isize as crate::ops::arith::Rem>::rem", "Argument[self]", "ReturnValue", "taint", "df-generated"]
+      - ["lang:core", "<&isize as crate::ops::arith::Sub>::sub", "Argument[0]", "ReturnValue", "taint", "df-generated"]
+      - ["lang:core", "<&isize as crate::ops::arith::Sub>::sub", "Argument[self]", "ReturnValue", "taint", "df-generated"]
+      - ["lang:core", "<&isize as crate::ops::bit::BitAnd>::bitand", "Argument[0]", "ReturnValue", "taint", "df-generated"]
+      - ["lang:core", "<&isize as crate::ops::bit::BitAnd>::bitand", "Argument[self]", "ReturnValue", "taint", "df-generated"]
+      - ["lang:core", "<&isize as crate::ops::bit::BitOr>::bitor", "Argument[0]", "ReturnValue", "taint", "df-generated"]
+      - ["lang:core", "<&isize as crate::ops::bit::BitOr>::bitor", "Argument[self]", "ReturnValue", "taint", "df-generated"]
+      - ["lang:core", "<&isize as crate::ops::bit::BitXor>::bitxor", "Argument[0]", "ReturnValue", "taint", "df-generated"]
+      - ["lang:core", "<&isize as crate::ops::bit::BitXor>::bitxor", "Argument[self]", "ReturnValue", "taint", "df-generated"]
+      - ["lang:core", "<&isize as crate::ops::bit::Not>::not", "Argument[self]", "ReturnValue", "taint", "df-generated"]
+      - ["lang:core", "<&isize as crate::ops::bit::Shl>::shl", "Argument[0]", "ReturnValue", "taint", "df-generated"]
+      - ["lang:core", "<&isize as crate::ops::bit::Shl>::shl", "Argument[self]", "ReturnValue", "taint", "df-generated"]
+      - ["lang:core", "<&isize as crate::ops::bit::Shr>::shr", "Argument[0]", "ReturnValue", "taint", "df-generated"]
+      - ["lang:core", "<&isize as crate::ops::bit::Shr>::shr", "Argument[self]", "ReturnValue", "taint", "df-generated"]
       - ["lang:core", "<&mut _ as crate::borrow::Borrow>::borrow", "Argument[self].Reference.Reference", "ReturnValue.Reference", "value", "dfc-generated"]
       - ["lang:core", "<&mut _ as crate::borrow::BorrowMut>::borrow_mut", "Argument[self].Reference.Reference", "ReturnValue.Reference", "value", "dfc-generated"]
       - ["lang:core", "<&mut _ as crate::iter::traits::double_ended::DoubleEndedIterator>::advance_back_by", "Argument[0]", "ReturnValue", "taint", "df-generated"]
+      - ["lang:core", "<&mut _ as crate::iter::traits::double_ended::DoubleEndedIterator>::try_rfold", "Argument[0]", "ReturnValue", "value", "dfc-generated"]
       - ["lang:core", "<&mut _ as crate::iter::traits::double_ended::DoubleEndedIteratorRefSpec>::spec_rfold", "Argument[0]", "ReturnValue", "value", "dfc-generated"]
       - ["lang:core", "<&mut _ as crate::iter::traits::double_ended::DoubleEndedIteratorRefSpec>::spec_rfold", "Argument[1].ReturnValue", "Argument[1].Parameter[0]", "value", "dfc-generated"]
       - ["lang:core", "<&mut _ as crate::iter::traits::double_ended::DoubleEndedIteratorRefSpec>::spec_rfold", "Argument[1].ReturnValue", "ReturnValue", "value", "dfc-generated"]
@@ -24,6 +207,7 @@ extensions:
       - ["lang:core", "<&mut _ as crate::iter::traits::iterator::Iterator>::advance_by", "Argument[0]", "ReturnValue", "taint", "df-generated"]
       - ["lang:core", "<&mut _ as crate::iter::traits::iterator::Iterator>::next", "Argument[self]", "ReturnValue", "taint", "df-generated"]
       - ["lang:core", "<&mut _ as crate::iter::traits::iterator::Iterator>::nth", "Argument[self]", "ReturnValue", "taint", "df-generated"]
+      - ["lang:core", "<&mut _ as crate::iter::traits::iterator::Iterator>::try_fold", "Argument[0]", "ReturnValue", "value", "dfc-generated"]
       - ["lang:core", "<&mut _ as crate::iter::traits::iterator::IteratorRefSpec>::spec_fold", "Argument[0]", "ReturnValue", "value", "dfc-generated"]
       - ["lang:core", "<&mut _ as crate::iter::traits::iterator::IteratorRefSpec>::spec_fold", "Argument[1].ReturnValue", "Argument[1].Parameter[0]", "value", "dfc-generated"]
       - ["lang:core", "<&mut _ as crate::iter::traits::iterator::IteratorRefSpec>::spec_fold", "Argument[1].ReturnValue", "ReturnValue", "value", "dfc-generated"]
@@ -34,6 +218,132 @@ extensions:
       - ["lang:core", "<&str as crate::str::pattern::Pattern>::as_utf8_pattern", "Argument[self]", "ReturnValue", "taint", "df-generated"]
       - ["lang:core", "<&str as crate::str::pattern::Pattern>::into_searcher", "Argument[0]", "ReturnValue.Field[crate::str::pattern::StrSearcher::haystack]", "value", "dfc-generated"]
       - ["lang:core", "<&str as crate::str::pattern::Pattern>::into_searcher", "Argument[self]", "ReturnValue.Field[crate::str::pattern::StrSearcher::needle]", "value", "dfc-generated"]
+      - ["lang:core", "<&u128 as crate::ops::arith::Add>::add", "Argument[0]", "ReturnValue", "taint", "df-generated"]
+      - ["lang:core", "<&u128 as crate::ops::arith::Add>::add", "Argument[self]", "ReturnValue", "taint", "df-generated"]
+      - ["lang:core", "<&u128 as crate::ops::arith::Div>::div", "Argument[0]", "ReturnValue", "taint", "df-generated"]
+      - ["lang:core", "<&u128 as crate::ops::arith::Div>::div", "Argument[self]", "ReturnValue", "taint", "df-generated"]
+      - ["lang:core", "<&u128 as crate::ops::arith::Mul>::mul", "Argument[0]", "ReturnValue", "taint", "df-generated"]
+      - ["lang:core", "<&u128 as crate::ops::arith::Mul>::mul", "Argument[self]", "ReturnValue", "taint", "df-generated"]
+      - ["lang:core", "<&u128 as crate::ops::arith::Rem>::rem", "Argument[0]", "ReturnValue", "taint", "df-generated"]
+      - ["lang:core", "<&u128 as crate::ops::arith::Rem>::rem", "Argument[self]", "ReturnValue", "taint", "df-generated"]
+      - ["lang:core", "<&u128 as crate::ops::arith::Sub>::sub", "Argument[0]", "ReturnValue", "taint", "df-generated"]
+      - ["lang:core", "<&u128 as crate::ops::arith::Sub>::sub", "Argument[self]", "ReturnValue", "taint", "df-generated"]
+      - ["lang:core", "<&u128 as crate::ops::bit::BitAnd>::bitand", "Argument[0]", "ReturnValue", "taint", "df-generated"]
+      - ["lang:core", "<&u128 as crate::ops::bit::BitAnd>::bitand", "Argument[self]", "ReturnValue", "taint", "df-generated"]
+      - ["lang:core", "<&u128 as crate::ops::bit::BitOr>::bitor", "Argument[0]", "ReturnValue", "taint", "df-generated"]
+      - ["lang:core", "<&u128 as crate::ops::bit::BitOr>::bitor", "Argument[self]", "ReturnValue", "taint", "df-generated"]
+      - ["lang:core", "<&u128 as crate::ops::bit::BitXor>::bitxor", "Argument[0]", "ReturnValue", "taint", "df-generated"]
+      - ["lang:core", "<&u128 as crate::ops::bit::BitXor>::bitxor", "Argument[self]", "ReturnValue", "taint", "df-generated"]
+      - ["lang:core", "<&u128 as crate::ops::bit::Not>::not", "Argument[self]", "ReturnValue", "taint", "df-generated"]
+      - ["lang:core", "<&u128 as crate::ops::bit::Shl>::shl", "Argument[0]", "ReturnValue", "taint", "df-generated"]
+      - ["lang:core", "<&u128 as crate::ops::bit::Shl>::shl", "Argument[self]", "ReturnValue", "taint", "df-generated"]
+      - ["lang:core", "<&u128 as crate::ops::bit::Shr>::shr", "Argument[0]", "ReturnValue", "taint", "df-generated"]
+      - ["lang:core", "<&u128 as crate::ops::bit::Shr>::shr", "Argument[self]", "ReturnValue", "taint", "df-generated"]
+      - ["lang:core", "<&u16 as crate::ops::arith::Add>::add", "Argument[0]", "ReturnValue", "taint", "df-generated"]
+      - ["lang:core", "<&u16 as crate::ops::arith::Add>::add", "Argument[self]", "ReturnValue", "taint", "df-generated"]
+      - ["lang:core", "<&u16 as crate::ops::arith::Div>::div", "Argument[0]", "ReturnValue", "taint", "df-generated"]
+      - ["lang:core", "<&u16 as crate::ops::arith::Div>::div", "Argument[self]", "ReturnValue", "taint", "df-generated"]
+      - ["lang:core", "<&u16 as crate::ops::arith::Mul>::mul", "Argument[0]", "ReturnValue", "taint", "df-generated"]
+      - ["lang:core", "<&u16 as crate::ops::arith::Mul>::mul", "Argument[self]", "ReturnValue", "taint", "df-generated"]
+      - ["lang:core", "<&u16 as crate::ops::arith::Rem>::rem", "Argument[0]", "ReturnValue", "taint", "df-generated"]
+      - ["lang:core", "<&u16 as crate::ops::arith::Rem>::rem", "Argument[self]", "ReturnValue", "taint", "df-generated"]
+      - ["lang:core", "<&u16 as crate::ops::arith::Sub>::sub", "Argument[0]", "ReturnValue", "taint", "df-generated"]
+      - ["lang:core", "<&u16 as crate::ops::arith::Sub>::sub", "Argument[self]", "ReturnValue", "taint", "df-generated"]
+      - ["lang:core", "<&u16 as crate::ops::bit::BitAnd>::bitand", "Argument[0]", "ReturnValue", "taint", "df-generated"]
+      - ["lang:core", "<&u16 as crate::ops::bit::BitAnd>::bitand", "Argument[self]", "ReturnValue", "taint", "df-generated"]
+      - ["lang:core", "<&u16 as crate::ops::bit::BitOr>::bitor", "Argument[0]", "ReturnValue", "taint", "df-generated"]
+      - ["lang:core", "<&u16 as crate::ops::bit::BitOr>::bitor", "Argument[self]", "ReturnValue", "taint", "df-generated"]
+      - ["lang:core", "<&u16 as crate::ops::bit::BitXor>::bitxor", "Argument[0]", "ReturnValue", "taint", "df-generated"]
+      - ["lang:core", "<&u16 as crate::ops::bit::BitXor>::bitxor", "Argument[self]", "ReturnValue", "taint", "df-generated"]
+      - ["lang:core", "<&u16 as crate::ops::bit::Not>::not", "Argument[self]", "ReturnValue", "taint", "df-generated"]
+      - ["lang:core", "<&u16 as crate::ops::bit::Shl>::shl", "Argument[0]", "ReturnValue", "taint", "df-generated"]
+      - ["lang:core", "<&u16 as crate::ops::bit::Shl>::shl", "Argument[self]", "ReturnValue", "taint", "df-generated"]
+      - ["lang:core", "<&u16 as crate::ops::bit::Shr>::shr", "Argument[0]", "ReturnValue", "taint", "df-generated"]
+      - ["lang:core", "<&u16 as crate::ops::bit::Shr>::shr", "Argument[self]", "ReturnValue", "taint", "df-generated"]
+      - ["lang:core", "<&u32 as crate::ops::arith::Add>::add", "Argument[0]", "ReturnValue", "taint", "df-generated"]
+      - ["lang:core", "<&u32 as crate::ops::arith::Add>::add", "Argument[self]", "ReturnValue", "taint", "df-generated"]
+      - ["lang:core", "<&u32 as crate::ops::arith::Div>::div", "Argument[0]", "ReturnValue", "taint", "df-generated"]
+      - ["lang:core", "<&u32 as crate::ops::arith::Div>::div", "Argument[self]", "ReturnValue", "taint", "df-generated"]
+      - ["lang:core", "<&u32 as crate::ops::arith::Mul>::mul", "Argument[0]", "ReturnValue", "taint", "df-generated"]
+      - ["lang:core", "<&u32 as crate::ops::arith::Mul>::mul", "Argument[self]", "ReturnValue", "taint", "df-generated"]
+      - ["lang:core", "<&u32 as crate::ops::arith::Rem>::rem", "Argument[0]", "ReturnValue", "taint", "df-generated"]
+      - ["lang:core", "<&u32 as crate::ops::arith::Rem>::rem", "Argument[self]", "ReturnValue", "taint", "df-generated"]
+      - ["lang:core", "<&u32 as crate::ops::arith::Sub>::sub", "Argument[0]", "ReturnValue", "taint", "df-generated"]
+      - ["lang:core", "<&u32 as crate::ops::arith::Sub>::sub", "Argument[self]", "ReturnValue", "taint", "df-generated"]
+      - ["lang:core", "<&u32 as crate::ops::bit::BitAnd>::bitand", "Argument[0]", "ReturnValue", "taint", "df-generated"]
+      - ["lang:core", "<&u32 as crate::ops::bit::BitAnd>::bitand", "Argument[self]", "ReturnValue", "taint", "df-generated"]
+      - ["lang:core", "<&u32 as crate::ops::bit::BitOr>::bitor", "Argument[0]", "ReturnValue", "taint", "df-generated"]
+      - ["lang:core", "<&u32 as crate::ops::bit::BitOr>::bitor", "Argument[self]", "ReturnValue", "taint", "df-generated"]
+      - ["lang:core", "<&u32 as crate::ops::bit::BitXor>::bitxor", "Argument[0]", "ReturnValue", "taint", "df-generated"]
+      - ["lang:core", "<&u32 as crate::ops::bit::BitXor>::bitxor", "Argument[self]", "ReturnValue", "taint", "df-generated"]
+      - ["lang:core", "<&u32 as crate::ops::bit::Not>::not", "Argument[self]", "ReturnValue", "taint", "df-generated"]
+      - ["lang:core", "<&u32 as crate::ops::bit::Shl>::shl", "Argument[0]", "ReturnValue", "taint", "df-generated"]
+      - ["lang:core", "<&u32 as crate::ops::bit::Shl>::shl", "Argument[self]", "ReturnValue", "taint", "df-generated"]
+      - ["lang:core", "<&u32 as crate::ops::bit::Shr>::shr", "Argument[0]", "ReturnValue", "taint", "df-generated"]
+      - ["lang:core", "<&u32 as crate::ops::bit::Shr>::shr", "Argument[self]", "ReturnValue", "taint", "df-generated"]
+      - ["lang:core", "<&u64 as crate::ops::arith::Add>::add", "Argument[0]", "ReturnValue", "taint", "df-generated"]
+      - ["lang:core", "<&u64 as crate::ops::arith::Add>::add", "Argument[self]", "ReturnValue", "taint", "df-generated"]
+      - ["lang:core", "<&u64 as crate::ops::arith::Div>::div", "Argument[0]", "ReturnValue", "taint", "df-generated"]
+      - ["lang:core", "<&u64 as crate::ops::arith::Div>::div", "Argument[self]", "ReturnValue", "taint", "df-generated"]
+      - ["lang:core", "<&u64 as crate::ops::arith::Mul>::mul", "Argument[0]", "ReturnValue", "taint", "df-generated"]
+      - ["lang:core", "<&u64 as crate::ops::arith::Mul>::mul", "Argument[self]", "ReturnValue", "taint", "df-generated"]
+      - ["lang:core", "<&u64 as crate::ops::arith::Rem>::rem", "Argument[0]", "ReturnValue", "taint", "df-generated"]
+      - ["lang:core", "<&u64 as crate::ops::arith::Rem>::rem", "Argument[self]", "ReturnValue", "taint", "df-generated"]
+      - ["lang:core", "<&u64 as crate::ops::arith::Sub>::sub", "Argument[0]", "ReturnValue", "taint", "df-generated"]
+      - ["lang:core", "<&u64 as crate::ops::arith::Sub>::sub", "Argument[self]", "ReturnValue", "taint", "df-generated"]
+      - ["lang:core", "<&u64 as crate::ops::bit::BitAnd>::bitand", "Argument[0]", "ReturnValue", "taint", "df-generated"]
+      - ["lang:core", "<&u64 as crate::ops::bit::BitAnd>::bitand", "Argument[self]", "ReturnValue", "taint", "df-generated"]
+      - ["lang:core", "<&u64 as crate::ops::bit::BitOr>::bitor", "Argument[0]", "ReturnValue", "taint", "df-generated"]
+      - ["lang:core", "<&u64 as crate::ops::bit::BitOr>::bitor", "Argument[self]", "ReturnValue", "taint", "df-generated"]
+      - ["lang:core", "<&u64 as crate::ops::bit::BitXor>::bitxor", "Argument[0]", "ReturnValue", "taint", "df-generated"]
+      - ["lang:core", "<&u64 as crate::ops::bit::BitXor>::bitxor", "Argument[self]", "ReturnValue", "taint", "df-generated"]
+      - ["lang:core", "<&u64 as crate::ops::bit::Not>::not", "Argument[self]", "ReturnValue", "taint", "df-generated"]
+      - ["lang:core", "<&u64 as crate::ops::bit::Shl>::shl", "Argument[0]", "ReturnValue", "taint", "df-generated"]
+      - ["lang:core", "<&u64 as crate::ops::bit::Shl>::shl", "Argument[self]", "ReturnValue", "taint", "df-generated"]
+      - ["lang:core", "<&u64 as crate::ops::bit::Shr>::shr", "Argument[0]", "ReturnValue", "taint", "df-generated"]
+      - ["lang:core", "<&u64 as crate::ops::bit::Shr>::shr", "Argument[self]", "ReturnValue", "taint", "df-generated"]
+      - ["lang:core", "<&u8 as crate::ops::arith::Add>::add", "Argument[0]", "ReturnValue", "taint", "df-generated"]
+      - ["lang:core", "<&u8 as crate::ops::arith::Add>::add", "Argument[self]", "ReturnValue", "taint", "df-generated"]
+      - ["lang:core", "<&u8 as crate::ops::arith::Div>::div", "Argument[0]", "ReturnValue", "taint", "df-generated"]
+      - ["lang:core", "<&u8 as crate::ops::arith::Div>::div", "Argument[self]", "ReturnValue", "taint", "df-generated"]
+      - ["lang:core", "<&u8 as crate::ops::arith::Mul>::mul", "Argument[0]", "ReturnValue", "taint", "df-generated"]
+      - ["lang:core", "<&u8 as crate::ops::arith::Mul>::mul", "Argument[self]", "ReturnValue", "taint", "df-generated"]
+      - ["lang:core", "<&u8 as crate::ops::arith::Rem>::rem", "Argument[0]", "ReturnValue", "taint", "df-generated"]
+      - ["lang:core", "<&u8 as crate::ops::arith::Rem>::rem", "Argument[self]", "ReturnValue", "taint", "df-generated"]
+      - ["lang:core", "<&u8 as crate::ops::arith::Sub>::sub", "Argument[0]", "ReturnValue", "taint", "df-generated"]
+      - ["lang:core", "<&u8 as crate::ops::arith::Sub>::sub", "Argument[self]", "ReturnValue", "taint", "df-generated"]
+      - ["lang:core", "<&u8 as crate::ops::bit::BitAnd>::bitand", "Argument[0]", "ReturnValue", "taint", "df-generated"]
+      - ["lang:core", "<&u8 as crate::ops::bit::BitAnd>::bitand", "Argument[self]", "ReturnValue", "taint", "df-generated"]
+      - ["lang:core", "<&u8 as crate::ops::bit::BitOr>::bitor", "Argument[0]", "ReturnValue", "taint", "df-generated"]
+      - ["lang:core", "<&u8 as crate::ops::bit::BitOr>::bitor", "Argument[self]", "ReturnValue", "taint", "df-generated"]
+      - ["lang:core", "<&u8 as crate::ops::bit::BitXor>::bitxor", "Argument[0]", "ReturnValue", "taint", "df-generated"]
+      - ["lang:core", "<&u8 as crate::ops::bit::BitXor>::bitxor", "Argument[self]", "ReturnValue", "taint", "df-generated"]
+      - ["lang:core", "<&u8 as crate::ops::bit::Not>::not", "Argument[self]", "ReturnValue", "taint", "df-generated"]
+      - ["lang:core", "<&u8 as crate::ops::bit::Shl>::shl", "Argument[0]", "ReturnValue", "taint", "df-generated"]
+      - ["lang:core", "<&u8 as crate::ops::bit::Shl>::shl", "Argument[self]", "ReturnValue", "taint", "df-generated"]
+      - ["lang:core", "<&u8 as crate::ops::bit::Shr>::shr", "Argument[0]", "ReturnValue", "taint", "df-generated"]
+      - ["lang:core", "<&u8 as crate::ops::bit::Shr>::shr", "Argument[self]", "ReturnValue", "taint", "df-generated"]
+      - ["lang:core", "<&usize as crate::ops::arith::Add>::add", "Argument[0]", "ReturnValue", "taint", "df-generated"]
+      - ["lang:core", "<&usize as crate::ops::arith::Add>::add", "Argument[self]", "ReturnValue", "taint", "df-generated"]
+      - ["lang:core", "<&usize as crate::ops::arith::Div>::div", "Argument[0]", "ReturnValue", "taint", "df-generated"]
+      - ["lang:core", "<&usize as crate::ops::arith::Div>::div", "Argument[self]", "ReturnValue", "taint", "df-generated"]
+      - ["lang:core", "<&usize as crate::ops::arith::Mul>::mul", "Argument[0]", "ReturnValue", "taint", "df-generated"]
+      - ["lang:core", "<&usize as crate::ops::arith::Mul>::mul", "Argument[self]", "ReturnValue", "taint", "df-generated"]
+      - ["lang:core", "<&usize as crate::ops::arith::Rem>::rem", "Argument[0]", "ReturnValue", "taint", "df-generated"]
+      - ["lang:core", "<&usize as crate::ops::arith::Rem>::rem", "Argument[self]", "ReturnValue", "taint", "df-generated"]
+      - ["lang:core", "<&usize as crate::ops::arith::Sub>::sub", "Argument[0]", "ReturnValue", "taint", "df-generated"]
+      - ["lang:core", "<&usize as crate::ops::arith::Sub>::sub", "Argument[self]", "ReturnValue", "taint", "df-generated"]
+      - ["lang:core", "<&usize as crate::ops::bit::BitAnd>::bitand", "Argument[0]", "ReturnValue", "taint", "df-generated"]
+      - ["lang:core", "<&usize as crate::ops::bit::BitAnd>::bitand", "Argument[self]", "ReturnValue", "taint", "df-generated"]
+      - ["lang:core", "<&usize as crate::ops::bit::BitOr>::bitor", "Argument[0]", "ReturnValue", "taint", "df-generated"]
+      - ["lang:core", "<&usize as crate::ops::bit::BitOr>::bitor", "Argument[self]", "ReturnValue", "taint", "df-generated"]
+      - ["lang:core", "<&usize as crate::ops::bit::BitXor>::bitxor", "Argument[0]", "ReturnValue", "taint", "df-generated"]
+      - ["lang:core", "<&usize as crate::ops::bit::BitXor>::bitxor", "Argument[self]", "ReturnValue", "taint", "df-generated"]
+      - ["lang:core", "<&usize as crate::ops::bit::Not>::not", "Argument[self]", "ReturnValue", "taint", "df-generated"]
+      - ["lang:core", "<&usize as crate::ops::bit::Shl>::shl", "Argument[0]", "ReturnValue", "taint", "df-generated"]
+      - ["lang:core", "<&usize as crate::ops::bit::Shl>::shl", "Argument[self]", "ReturnValue", "taint", "df-generated"]
+      - ["lang:core", "<&usize as crate::ops::bit::Shr>::shr", "Argument[0]", "ReturnValue", "taint", "df-generated"]
+      - ["lang:core", "<&usize as crate::ops::bit::Shr>::shr", "Argument[self]", "ReturnValue", "taint", "df-generated"]
       - ["lang:core", "<[_] as crate::convert::AsMut>::as_mut", "Argument[self]", "ReturnValue", "value", "dfc-generated"]
       - ["lang:core", "<[_] as crate::convert::AsRef>::as_ref", "Argument[self]", "ReturnValue", "value", "dfc-generated"]
       - ["lang:core", "<[_] as crate::slice::SlicePattern>::as_slice", "Argument[self]", "ReturnValue", "value", "dfc-generated"]
@@ -90,7 +400,6 @@ extensions:
       - ["lang:core", "<_ as crate::borrow::Borrow>::borrow", "Argument[self]", "ReturnValue", "value", "dfc-generated"]
       - ["lang:core", "<_ as crate::borrow::BorrowMut>::borrow_mut", "Argument[self]", "ReturnValue", "value", "dfc-generated"]
       - ["lang:core", "<_ as crate::clone::uninit::CopySpec>::clone_one", "Argument[0].Reference", "Argument[1].Reference", "value", "dfc-generated"]
-      - ["lang:core", "<_ as crate::clone::uninit::CopySpec>::clone_one", "Argument[0]", "Argument[1].Reference", "value", "dfc-generated"]
       - ["lang:core", "<_ as crate::convert::From>::from", "Argument[0]", "ReturnValue", "value", "dfc-generated"]
       - ["lang:core", "<_ as crate::future::into_future::IntoFuture>::into_future", "Argument[self]", "ReturnValue", "value", "dfc-generated"]
       - ["lang:core", "<_ as crate::iter::adapters::step_by::SpecRangeSetup>::setup", "Argument[0]", "ReturnValue", "value", "dfc-generated"]
@@ -99,10 +408,14 @@ extensions:
       - ["lang:core", "<_ as crate::str::pattern::MultiCharEq>::matches", "Argument[0]", "Argument[self].Reference.Parameter[0]", "value", "dfc-generated"]
       - ["lang:core", "<_ as crate::str::pattern::MultiCharEq>::matches", "Argument[self].Reference.ReturnValue", "ReturnValue", "value", "dfc-generated"]
       - ["lang:core", "<bool as crate::clone::Clone>::clone", "Argument[self].Reference", "ReturnValue", "value", "dfc-generated"]
+      - ["lang:core", "<bool as crate::cmp::Ord>::clamp", "Argument[0]", "ReturnValue", "taint", "df-generated"]
+      - ["lang:core", "<bool as crate::cmp::Ord>::clamp", "Argument[1]", "ReturnValue", "taint", "df-generated"]
+      - ["lang:core", "<bool as crate::cmp::Ord>::clamp", "Argument[self]", "ReturnValue", "taint", "df-generated"]
       - ["lang:core", "<bool as crate::cmp::Ord>::max", "Argument[0]", "ReturnValue", "taint", "df-generated"]
       - ["lang:core", "<bool as crate::cmp::Ord>::max", "Argument[self]", "ReturnValue", "taint", "df-generated"]
       - ["lang:core", "<bool as crate::cmp::Ord>::min", "Argument[0]", "ReturnValue", "taint", "df-generated"]
       - ["lang:core", "<bool as crate::cmp::Ord>::min", "Argument[self]", "ReturnValue", "taint", "df-generated"]
+      - ["lang:core", "<bool as crate::fmt::Display>::fmt", "Argument[0]", "ReturnValue", "taint", "df-generated"]
       - ["lang:core", "<bool as crate::intrinsics::fallback::DisjointBitOr>::disjoint_bitor", "Argument[0]", "ReturnValue", "taint", "df-generated"]
       - ["lang:core", "<bool as crate::intrinsics::fallback::DisjointBitOr>::disjoint_bitor", "Argument[self]", "ReturnValue", "taint", "df-generated"]
       - ["lang:core", "<bool as crate::ops::bit::BitAnd>::bitand", "Argument[0]", "ReturnValue", "taint", "df-generated"]
@@ -118,6 +431,7 @@ extensions:
       - ["lang:core", "<bool>::then_some", "Argument[0]", "ReturnValue.Field[crate::option::Option::Some(0)]", "value", "dfc-generated"]
       - ["lang:core", "<char as crate::clone::Clone>::clone", "Argument[self].Reference", "ReturnValue", "value", "dfc-generated"]
       - ["lang:core", "<char as crate::convert::From>::from", "Argument[0]", "ReturnValue", "taint", "df-generated"]
+      - ["lang:core", "<char as crate::fmt::Display>::fmt", "Argument[0]", "ReturnValue", "taint", "df-generated"]
       - ["lang:core", "<char as crate::str::pattern::Pattern>::as_utf8_pattern", "Argument[self].Reference", "ReturnValue.Field[crate::option::Option::Some(0)].Field[crate::str::pattern::Utf8Pattern::CharPattern(0)]", "value", "dfc-generated"]
       - ["lang:core", "<char as crate::str::pattern::Pattern>::into_searcher", "Argument[0]", "ReturnValue.Field[crate::str::pattern::CharSearcher::haystack]", "value", "dfc-generated"]
       - ["lang:core", "<char as crate::str::pattern::Pattern>::into_searcher", "Argument[self]", "ReturnValue.Field[crate::str::pattern::CharSearcher::needle]", "value", "dfc-generated"]
@@ -133,8 +447,9 @@ extensions:
       - ["lang:core", "<crate::alloc::layout::Layout>::repeat", "Argument[self]", "ReturnValue", "taint", "df-generated"]
       - ["lang:core", "<crate::alloc::layout::Layout>::repeat_packed", "Argument[self].Field[crate::alloc::layout::Layout::align]", "ReturnValue.Field[crate::result::Result::Ok(0)].Field[crate::alloc::layout::Layout::align]", "value", "dfc-generated"]
       - ["lang:core", "<crate::alloc::layout::Layout>::size", "Argument[self].Field[crate::alloc::layout::Layout::size]", "ReturnValue", "value", "dfc-generated"]
-      - ["lang:core", "<crate::array::iter::IntoIter as crate::iter::traits::iterator::Iterator>::fold", "Argument[0]", "ReturnValue", "value", "dfc-generated"]
-      - ["lang:core", "<crate::array::iter::IntoIter as crate::iter::traits::iterator::Iterator>::fold", "Argument[1].ReturnValue", "ReturnValue", "value", "dfc-generated"]
+      - ["lang:core", "<crate::array::TryFromSliceError as crate::fmt::Display>::fmt", "Argument[0]", "ReturnValue", "taint", "df-generated"]
+      - ["lang:core", "<crate::array::iter::IntoIter as crate::iter::traits::double_ended::DoubleEndedIterator>::rfold", "Argument[0].Field[0]", "ReturnValue", "value", "dfc-generated"]
+      - ["lang:core", "<crate::array::iter::IntoIter as crate::iter::traits::iterator::Iterator>::fold", "Argument[0].Field[0]", "ReturnValue", "value", "dfc-generated"]
       - ["lang:core", "<crate::array::iter::IntoIter>::new_unchecked", "Argument[0]", "ReturnValue.Field[crate::array::iter::IntoIter::data]", "value", "dfc-generated"]
       - ["lang:core", "<crate::array::iter::IntoIter>::new_unchecked", "Argument[1].Field[crate::ops::range::Range::end]", "ReturnValue.Field[crate::array::iter::IntoIter::alive].Field[crate::ops::index_range::IndexRange::end]", "value", "dfc-generated"]
       - ["lang:core", "<crate::array::iter::IntoIter>::new_unchecked", "Argument[1].Field[crate::ops::range::Range::start]", "ReturnValue.Field[crate::array::iter::IntoIter::alive].Field[crate::ops::index_range::IndexRange::start]", "value", "dfc-generated"]
@@ -165,11 +480,17 @@ extensions:
       - ["lang:core", "<crate::bstr::ByteStr>::as_bytes", "Argument[self].Field[crate::bstr::ByteStr(0)]", "ReturnValue.Reference", "value", "dfc-generated"]
       - ["lang:core", "<crate::bstr::ByteStr>::from_bytes", "Argument[0]", "ReturnValue", "taint", "df-generated"]
       - ["lang:core", "<crate::bstr::ByteStr>::from_bytes_mut", "Argument[0]", "ReturnValue", "taint", "df-generated"]
+      - ["lang:core", "<crate::cell::BorrowError as crate::fmt::Display>::fmt", "Argument[0]", "ReturnValue", "taint", "df-generated"]
+      - ["lang:core", "<crate::cell::BorrowMutError as crate::fmt::Display>::fmt", "Argument[0]", "ReturnValue", "taint", "df-generated"]
       - ["lang:core", "<crate::cell::BorrowRef as crate::clone::Clone>::clone", "Argument[self].Field[crate::cell::BorrowRef::borrow]", "ReturnValue.Field[crate::cell::BorrowRef::borrow]", "value", "dfc-generated"]
+      - ["lang:core", "<crate::cell::Cell as crate::clone::Clone>::clone", "Argument[self]", "ReturnValue", "taint", "df-generated"]
       - ["lang:core", "<crate::cell::Cell as crate::convert::From>::from", "Argument[0]", "ReturnValue.Field[crate::cell::Cell::value].Field[crate::cell::UnsafeCell::value]", "value", "dfc-generated"]
       - ["lang:core", "<crate::cell::Cell>::as_array_of_cells", "Argument[self]", "ReturnValue", "taint", "df-generated"]
+      - ["lang:core", "<crate::cell::Cell>::as_ptr", "Argument[self]", "ReturnValue", "taint", "df-generated"]
       - ["lang:core", "<crate::cell::Cell>::as_slice_of_cells", "Argument[self]", "ReturnValue", "taint", "df-generated"]
       - ["lang:core", "<crate::cell::Cell>::from_mut", "Argument[0]", "ReturnValue", "taint", "df-generated"]
+      - ["lang:core", "<crate::cell::Cell>::get", "Argument[self]", "ReturnValue", "taint", "df-generated"]
+      - ["lang:core", "<crate::cell::Cell>::get_mut", "Argument[self].Field[crate::cell::Cell::value].Field[crate::cell::UnsafeCell::value]", "ReturnValue.Reference", "value", "dfc-generated"]
       - ["lang:core", "<crate::cell::Cell>::into_inner", "Argument[self].Field[crate::cell::Cell::value].Field[crate::cell::UnsafeCell::value]", "ReturnValue", "value", "dfc-generated"]
       - ["lang:core", "<crate::cell::Cell>::new", "Argument[0]", "ReturnValue.Field[crate::cell::Cell::value].Field[crate::cell::UnsafeCell::value]", "value", "dfc-generated"]
       - ["lang:core", "<crate::cell::Cell>::update", "Argument[0].ReturnValue", "ReturnValue", "value", "dfc-generated"]
@@ -182,8 +503,14 @@ extensions:
       - ["lang:core", "<crate::cell::Ref>::map_split", "Argument[0]", "Argument[1]", "taint", "df-generated"]
       - ["lang:core", "<crate::cell::Ref>::map_split", "Argument[0]", "ReturnValue", "taint", "df-generated"]
       - ["lang:core", "<crate::cell::RefCell as crate::convert::From>::from", "Argument[0]", "ReturnValue.Field[crate::cell::RefCell::value].Field[crate::cell::UnsafeCell::value]", "value", "dfc-generated"]
+      - ["lang:core", "<crate::cell::RefCell>::as_ptr", "Argument[self]", "ReturnValue", "taint", "df-generated"]
+      - ["lang:core", "<crate::cell::RefCell>::borrow", "Argument[self]", "ReturnValue", "taint", "df-generated"]
+      - ["lang:core", "<crate::cell::RefCell>::borrow_mut", "Argument[self]", "ReturnValue", "taint", "df-generated"]
+      - ["lang:core", "<crate::cell::RefCell>::get_mut", "Argument[self].Field[crate::cell::RefCell::value].Field[crate::cell::UnsafeCell::value]", "ReturnValue.Reference", "value", "dfc-generated"]
       - ["lang:core", "<crate::cell::RefCell>::into_inner", "Argument[self].Field[crate::cell::RefCell::value].Field[crate::cell::UnsafeCell::value]", "ReturnValue", "value", "dfc-generated"]
       - ["lang:core", "<crate::cell::RefCell>::new", "Argument[0]", "ReturnValue.Field[crate::cell::RefCell::value].Field[crate::cell::UnsafeCell::value]", "value", "dfc-generated"]
+      - ["lang:core", "<crate::cell::RefCell>::try_borrow_unguarded", "Argument[self]", "ReturnValue", "taint", "df-generated"]
+      - ["lang:core", "<crate::cell::RefCell>::undo_leak", "Argument[self].Field[crate::cell::RefCell::value].Field[crate::cell::UnsafeCell::value]", "ReturnValue.Reference", "value", "dfc-generated"]
       - ["lang:core", "<crate::cell::RefMut>::filter_map", "Argument[0].Field[crate::cell::RefMut::borrow]", "ReturnValue.Field[crate::result::Result::Ok(0)].Field[crate::cell::RefMut::borrow]", "value", "dfc-generated"]
       - ["lang:core", "<crate::cell::RefMut>::filter_map", "Argument[0].Reference", "Argument[1].Parameter[0].Reference", "value", "dfc-generated"]
       - ["lang:core", "<crate::cell::RefMut>::filter_map", "Argument[0]", "ReturnValue.Field[crate::result::Result::Err(0)]", "value", "dfc-generated"]
@@ -192,6 +519,8 @@ extensions:
       - ["lang:core", "<crate::cell::RefMut>::map_split", "Argument[0]", "Argument[1]", "taint", "df-generated"]
       - ["lang:core", "<crate::cell::RefMut>::map_split", "Argument[0]", "ReturnValue", "taint", "df-generated"]
       - ["lang:core", "<crate::cell::SyncUnsafeCell as crate::convert::From>::from", "Argument[0]", "ReturnValue.Field[crate::cell::SyncUnsafeCell::value].Field[crate::cell::UnsafeCell::value]", "value", "dfc-generated"]
+      - ["lang:core", "<crate::cell::SyncUnsafeCell>::get", "Argument[self]", "ReturnValue", "taint", "df-generated"]
+      - ["lang:core", "<crate::cell::SyncUnsafeCell>::get_mut", "Argument[self].Field[crate::cell::SyncUnsafeCell::value].Field[crate::cell::UnsafeCell::value]", "ReturnValue.Reference", "value", "dfc-generated"]
       - ["lang:core", "<crate::cell::SyncUnsafeCell>::into_inner", "Argument[self].Field[crate::cell::SyncUnsafeCell::value].Field[crate::cell::UnsafeCell::value]", "ReturnValue", "value", "dfc-generated"]
       - ["lang:core", "<crate::cell::SyncUnsafeCell>::new", "Argument[0]", "ReturnValue.Field[crate::cell::SyncUnsafeCell::value].Field[crate::cell::UnsafeCell::value]", "value", "dfc-generated"]
       - ["lang:core", "<crate::cell::SyncUnsafeCell>::raw_get", "Argument[0]", "ReturnValue", "taint", "df-generated"]
@@ -202,21 +531,22 @@ extensions:
       - ["lang:core", "<crate::cell::UnsafeCell>::into_inner", "Argument[self].Field[crate::cell::UnsafeCell::value]", "ReturnValue", "value", "dfc-generated"]
       - ["lang:core", "<crate::cell::UnsafeCell>::new", "Argument[0]", "ReturnValue.Field[crate::cell::UnsafeCell::value]", "value", "dfc-generated"]
       - ["lang:core", "<crate::cell::UnsafeCell>::raw_get", "Argument[0]", "ReturnValue", "taint", "df-generated"]
-      - ["lang:core", "<crate::cell::once::OnceCell>::get_or_try_init", "Argument[0]", "ReturnValue", "taint", "df-generated"]
+      - ["lang:core", "<crate::cell::once::OnceCell>::get_or_init", "Argument[0]", "ReturnValue", "taint", "df-generated"]
+      - ["lang:core", "<crate::cell::once::OnceCell>::get_or_try_init", "Argument[0].ReturnValue", "ReturnValue", "value", "dfc-generated"]
       - ["lang:core", "<crate::cell::once::OnceCell>::into_inner", "Argument[self].Field[crate::cell::once::OnceCell::inner].Field[crate::cell::UnsafeCell::value]", "ReturnValue", "value", "dfc-generated"]
       - ["lang:core", "<crate::cell::once::OnceCell>::set", "Argument[0]", "ReturnValue.Field[crate::result::Result::Err(0)]", "value", "dfc-generated"]
       - ["lang:core", "<crate::cell::once::OnceCell>::try_insert", "Argument[0]", "ReturnValue.Field[crate::result::Result::Err(0)].Field[1]", "value", "dfc-generated"]
-      - ["lang:core", "<crate::char::CaseMappingIter as crate::iter::traits::iterator::Iterator>::advance_by", "Argument[0]", "ReturnValue", "taint", "df-generated"]
-      - ["lang:core", "<crate::char::CaseMappingIter as crate::iter::traits::iterator::Iterator>::fold", "Argument[0]", "ReturnValue", "value", "dfc-generated"]
-      - ["lang:core", "<crate::char::CaseMappingIter as crate::iter::traits::iterator::Iterator>::fold", "Argument[1].ReturnValue", "ReturnValue", "value", "dfc-generated"]
+      - ["lang:core", "<crate::char::CaseMappingIter as crate::iter::traits::double_ended::DoubleEndedIterator>::rfold", "Argument[0].Field[0]", "ReturnValue", "value", "dfc-generated"]
+      - ["lang:core", "<crate::char::CaseMappingIter as crate::iter::traits::iterator::Iterator>::fold", "Argument[0].Field[0]", "ReturnValue", "value", "dfc-generated"]
       - ["lang:core", "<crate::char::EscapeDebug as crate::iter::traits::iterator::Iterator>::next", "Argument[self].Field[0].Field[crate::char::EscapeDebugInner::Char(0)]", "ReturnValue.Field[crate::option::Option::Some(0)]", "value", "dfc-generated"]
       - ["lang:core", "<crate::char::EscapeDebug as crate::iter::traits::iterator::Iterator>::next", "Argument[self].Field[crate::char::EscapeDebug(0)].Field[crate::char::EscapeDebugInner::Char(0)]", "ReturnValue.Field[crate::option::Option::Some(0)]", "value", "dfc-generated"]
-      - ["lang:core", "<crate::char::ToLowercase as crate::iter::traits::iterator::Iterator>::advance_by", "Argument[0]", "ReturnValue", "taint", "df-generated"]
-      - ["lang:core", "<crate::char::ToLowercase as crate::iter::traits::iterator::Iterator>::fold", "Argument[0]", "ReturnValue", "value", "dfc-generated"]
-      - ["lang:core", "<crate::char::ToLowercase as crate::iter::traits::iterator::Iterator>::fold", "Argument[1].ReturnValue", "ReturnValue", "value", "dfc-generated"]
-      - ["lang:core", "<crate::char::ToUppercase as crate::iter::traits::iterator::Iterator>::advance_by", "Argument[0]", "ReturnValue", "taint", "df-generated"]
-      - ["lang:core", "<crate::char::ToUppercase as crate::iter::traits::iterator::Iterator>::fold", "Argument[0]", "ReturnValue", "value", "dfc-generated"]
-      - ["lang:core", "<crate::char::ToUppercase as crate::iter::traits::iterator::Iterator>::fold", "Argument[1].ReturnValue", "ReturnValue", "value", "dfc-generated"]
+      - ["lang:core", "<crate::char::ToLowercase as crate::iter::traits::double_ended::DoubleEndedIterator>::rfold", "Argument[0].Field[0]", "ReturnValue", "value", "dfc-generated"]
+      - ["lang:core", "<crate::char::ToLowercase as crate::iter::traits::iterator::Iterator>::fold", "Argument[0].Field[0]", "ReturnValue", "value", "dfc-generated"]
+      - ["lang:core", "<crate::char::ToUppercase as crate::iter::traits::double_ended::DoubleEndedIterator>::rfold", "Argument[0].Field[0]", "ReturnValue", "value", "dfc-generated"]
+      - ["lang:core", "<crate::char::ToUppercase as crate::iter::traits::iterator::Iterator>::fold", "Argument[0].Field[0]", "ReturnValue", "value", "dfc-generated"]
+      - ["lang:core", "<crate::char::TryFromCharError as crate::fmt::Display>::fmt", "Argument[0]", "ReturnValue", "taint", "df-generated"]
+      - ["lang:core", "<crate::char::convert::CharTryFromError as crate::fmt::Display>::fmt", "Argument[0]", "ReturnValue", "taint", "df-generated"]
+      - ["lang:core", "<crate::char::convert::ParseCharError as crate::fmt::Display>::fmt", "Argument[0]", "ReturnValue", "taint", "df-generated"]
       - ["lang:core", "<crate::char::decode::DecodeUtf16 as crate::iter::traits::iterator::Iterator>::next", "Argument[self].Field[crate::char::decode::DecodeUtf16::iter].Element", "Argument[self].Field[crate::char::decode::DecodeUtf16::buf].Field[crate::option::Option::Some(0)]", "value", "dfc-generated"]
       - ["lang:core", "<crate::char::decode::DecodeUtf16 as crate::iter::traits::iterator::Iterator>::next", "Argument[self].Field[crate::char::decode::DecodeUtf16::iter].Element", "ReturnValue", "value", "dfc-generated"]
       - ["lang:core", "<crate::char::decode::DecodeUtf16Error>::unpaired_surrogate", "Argument[self].Field[crate::char::decode::DecodeUtf16Error::code]", "ReturnValue", "value", "dfc-generated"]
@@ -233,12 +563,16 @@ extensions:
       - ["lang:core", "<crate::error::Request>::provide_value_with", "Argument[self]", "ReturnValue", "value", "dfc-generated"]
       - ["lang:core", "<crate::error::Source as crate::iter::traits::iterator::Iterator>::next", "Argument[self].Field[crate::error::Source::current]", "ReturnValue", "value", "dfc-generated"]
       - ["lang:core", "<crate::error::Tagged>::as_request", "Argument[self]", "ReturnValue", "taint", "df-generated"]
-      - ["lang:core", "<crate::escape::EscapeIterInner>::advance_by", "Argument[0]", "ReturnValue", "taint", "df-generated"]
       - ["lang:core", "<crate::escape::EscapeIterInner>::backslash", "Argument[0]", "ReturnValue.Field[crate::escape::EscapeIterInner::data].Element", "value", "dfc-generated"]
+      - ["lang:core", "<crate::escape::EscapeIterInner>::len", "Argument[self]", "ReturnValue", "taint", "df-generated"]
+      - ["lang:core", "<crate::escape::EscapeIterInner>::next", "Argument[self].Field[crate::escape::EscapeIterInner::alive].Field[crate::ops::range::Range::start]", "ReturnValue", "value", "dfc-generated"]
+      - ["lang:core", "<crate::escape::EscapeIterInner>::next_back", "Argument[self].Field[crate::escape::EscapeIterInner::alive].Field[crate::ops::range::Range::end]", "ReturnValue", "value", "dfc-generated"]
       - ["lang:core", "<crate::ffi::c_str::CStr as crate::convert::AsRef>::as_ref", "Argument[self]", "ReturnValue", "value", "dfc-generated"]
       - ["lang:core", "<crate::ffi::va_list::VaList as crate::ops::deref::Deref>::deref", "Argument[self].Field[crate::ffi::va_list::VaList::inner]", "ReturnValue.Reference", "value", "dfc-generated"]
       - ["lang:core", "<crate::ffi::va_list::VaList as crate::ops::deref::DerefMut>::deref_mut", "Argument[self].Field[crate::ffi::va_list::VaList::inner]", "ReturnValue.Reference", "value", "dfc-generated"]
+      - ["lang:core", "<crate::ffi::va_list::VaListImpl>::as_va_list", "Argument[self]", "ReturnValue.Field[crate::ffi::va_list::VaList::inner]", "value", "dfc-generated"]
       - ["lang:core", "<crate::ffi::va_list::VaListImpl>::with_copy", "Argument[0].ReturnValue", "ReturnValue", "value", "dfc-generated"]
+      - ["lang:core", "<crate::fmt::Arguments>::as_statically_known_str", "Argument[self].Field[crate::fmt::Arguments::pieces].Element", "ReturnValue.Field[crate::option::Option::Some(0)]", "value", "dfc-generated"]
       - ["lang:core", "<crate::fmt::Arguments>::as_str", "Argument[self].Field[crate::fmt::Arguments::pieces].Element", "ReturnValue.Field[crate::option::Option::Some(0)]", "value", "dfc-generated"]
       - ["lang:core", "<crate::fmt::Arguments>::new_const", "Argument[0]", "ReturnValue.Field[crate::fmt::Arguments::pieces]", "value", "dfc-generated"]
       - ["lang:core", "<crate::fmt::Arguments>::new_v1", "Argument[0]", "ReturnValue.Field[crate::fmt::Arguments::pieces]", "value", "dfc-generated"]
@@ -246,46 +580,34 @@ extensions:
       - ["lang:core", "<crate::fmt::Arguments>::new_v1_formatted", "Argument[0]", "ReturnValue.Field[crate::fmt::Arguments::pieces]", "value", "dfc-generated"]
       - ["lang:core", "<crate::fmt::Arguments>::new_v1_formatted", "Argument[1]", "ReturnValue.Field[crate::fmt::Arguments::args]", "value", "dfc-generated"]
       - ["lang:core", "<crate::fmt::Arguments>::new_v1_formatted", "Argument[2]", "ReturnValue.Field[crate::fmt::Arguments::fmt].Field[crate::option::Option::Some(0)]", "value", "dfc-generated"]
-      - ["lang:core", "<crate::fmt::Formatter>::align", "Argument[self].Field[crate::fmt::Formatter::options].Field[crate::fmt::FormattingOptions::align]", "ReturnValue", "value", "dfc-generated"]
+      - ["lang:core", "<crate::fmt::Error as crate::fmt::Display>::fmt", "Argument[0]", "ReturnValue", "taint", "df-generated"]
       - ["lang:core", "<crate::fmt::Formatter>::debug_list", "Argument[self]", "ReturnValue.Field[crate::fmt::builders::DebugList::inner].Field[crate::fmt::builders::DebugInner::fmt]", "value", "dfc-generated"]
       - ["lang:core", "<crate::fmt::Formatter>::debug_map", "Argument[self]", "ReturnValue.Field[crate::fmt::builders::DebugMap::fmt]", "value", "dfc-generated"]
       - ["lang:core", "<crate::fmt::Formatter>::debug_set", "Argument[self]", "ReturnValue.Field[crate::fmt::builders::DebugSet::inner].Field[crate::fmt::builders::DebugInner::fmt]", "value", "dfc-generated"]
       - ["lang:core", "<crate::fmt::Formatter>::debug_struct", "Argument[self]", "ReturnValue.Field[crate::fmt::builders::DebugStruct::fmt]", "value", "dfc-generated"]
       - ["lang:core", "<crate::fmt::Formatter>::debug_tuple", "Argument[self]", "ReturnValue.Field[crate::fmt::builders::DebugTuple::fmt]", "value", "dfc-generated"]
-      - ["lang:core", "<crate::fmt::Formatter>::fill", "Argument[self].Field[crate::fmt::Formatter::options].Field[crate::fmt::FormattingOptions::fill]", "ReturnValue", "value", "dfc-generated"]
-      - ["lang:core", "<crate::fmt::Formatter>::flags", "Argument[self].Field[crate::fmt::Formatter::options].Field[crate::fmt::FormattingOptions::flags]", "ReturnValue", "value", "dfc-generated"]
+      - ["lang:core", "<crate::fmt::Formatter>::flags", "Argument[self]", "ReturnValue", "taint", "df-generated"]
       - ["lang:core", "<crate::fmt::Formatter>::new", "Argument[0]", "ReturnValue.Field[crate::fmt::Formatter::buf]", "value", "dfc-generated"]
       - ["lang:core", "<crate::fmt::Formatter>::new", "Argument[1]", "ReturnValue.Field[crate::fmt::Formatter::options]", "value", "dfc-generated"]
       - ["lang:core", "<crate::fmt::Formatter>::options", "Argument[self].Field[crate::fmt::Formatter::options]", "ReturnValue", "value", "dfc-generated"]
-      - ["lang:core", "<crate::fmt::Formatter>::padding", "Argument[0]", "ReturnValue.Field[crate::result::Result::Ok(0)].Field[crate::fmt::PostPadding::padding]", "value", "dfc-generated"]
-      - ["lang:core", "<crate::fmt::Formatter>::padding", "Argument[self].Field[crate::fmt::Formatter::options].Field[crate::fmt::FormattingOptions::fill]", "ReturnValue.Field[crate::result::Result::Ok(0)].Field[crate::fmt::PostPadding::fill]", "value", "dfc-generated"]
-      - ["lang:core", "<crate::fmt::Formatter>::precision", "Argument[self].Field[crate::fmt::Formatter::options].Field[crate::fmt::FormattingOptions::precision]", "ReturnValue", "value", "dfc-generated"]
-      - ["lang:core", "<crate::fmt::Formatter>::width", "Argument[self].Field[crate::fmt::Formatter::options].Field[crate::fmt::FormattingOptions::width]", "ReturnValue", "value", "dfc-generated"]
+      - ["lang:core", "<crate::fmt::Formatter>::pad", "Argument[self]", "ReturnValue", "taint", "df-generated"]
+      - ["lang:core", "<crate::fmt::Formatter>::pad_integral", "Argument[self]", "ReturnValue", "taint", "df-generated"]
+      - ["lang:core", "<crate::fmt::Formatter>::padding", "Argument[0]", "ReturnValue", "taint", "df-generated"]
+      - ["lang:core", "<crate::fmt::Formatter>::precision", "Argument[self]", "ReturnValue", "taint", "df-generated"]
+      - ["lang:core", "<crate::fmt::Formatter>::width", "Argument[self]", "ReturnValue", "taint", "df-generated"]
       - ["lang:core", "<crate::fmt::Formatter>::with_options", "Argument[0]", "ReturnValue.Field[crate::fmt::Formatter::options]", "value", "dfc-generated"]
       - ["lang:core", "<crate::fmt::Formatter>::with_options", "Argument[self].Field[crate::fmt::Formatter::buf]", "ReturnValue.Field[crate::fmt::Formatter::buf]", "value", "dfc-generated"]
-      - ["lang:core", "<crate::fmt::FormattingOptions>::align", "Argument[0]", "Argument[self].Field[crate::fmt::FormattingOptions::align]", "value", "dfc-generated"]
-      - ["lang:core", "<crate::fmt::FormattingOptions>::align", "Argument[0]", "ReturnValue.Field[crate::fmt::FormattingOptions::align]", "value", "dfc-generated"]
       - ["lang:core", "<crate::fmt::FormattingOptions>::align", "Argument[self]", "ReturnValue", "value", "dfc-generated"]
       - ["lang:core", "<crate::fmt::FormattingOptions>::alternate", "Argument[self]", "ReturnValue", "value", "dfc-generated"]
       - ["lang:core", "<crate::fmt::FormattingOptions>::create_formatter", "Argument[0]", "ReturnValue.Field[crate::fmt::Formatter::buf]", "value", "dfc-generated"]
       - ["lang:core", "<crate::fmt::FormattingOptions>::create_formatter", "Argument[self]", "ReturnValue.Field[crate::fmt::Formatter::options]", "value", "dfc-generated"]
       - ["lang:core", "<crate::fmt::FormattingOptions>::debug_as_hex", "Argument[self]", "ReturnValue", "value", "dfc-generated"]
-      - ["lang:core", "<crate::fmt::FormattingOptions>::fill", "Argument[0]", "Argument[self].Field[crate::fmt::FormattingOptions::fill]", "value", "dfc-generated"]
-      - ["lang:core", "<crate::fmt::FormattingOptions>::fill", "Argument[0]", "ReturnValue.Field[crate::fmt::FormattingOptions::fill]", "value", "dfc-generated"]
       - ["lang:core", "<crate::fmt::FormattingOptions>::fill", "Argument[self]", "ReturnValue", "value", "dfc-generated"]
-      - ["lang:core", "<crate::fmt::FormattingOptions>::flags", "Argument[0]", "Argument[self].Field[crate::fmt::FormattingOptions::flags]", "value", "dfc-generated"]
-      - ["lang:core", "<crate::fmt::FormattingOptions>::get_align", "Argument[self].Field[crate::fmt::FormattingOptions::align]", "ReturnValue", "value", "dfc-generated"]
-      - ["lang:core", "<crate::fmt::FormattingOptions>::get_fill", "Argument[self].Field[crate::fmt::FormattingOptions::fill]", "ReturnValue", "value", "dfc-generated"]
-      - ["lang:core", "<crate::fmt::FormattingOptions>::get_flags", "Argument[self].Field[crate::fmt::FormattingOptions::flags]", "ReturnValue", "value", "dfc-generated"]
-      - ["lang:core", "<crate::fmt::FormattingOptions>::get_precision", "Argument[self].Field[crate::fmt::FormattingOptions::precision]", "ReturnValue", "value", "dfc-generated"]
-      - ["lang:core", "<crate::fmt::FormattingOptions>::get_width", "Argument[self].Field[crate::fmt::FormattingOptions::width]", "ReturnValue", "value", "dfc-generated"]
-      - ["lang:core", "<crate::fmt::FormattingOptions>::precision", "Argument[0]", "Argument[self].Field[crate::fmt::FormattingOptions::precision]", "value", "dfc-generated"]
-      - ["lang:core", "<crate::fmt::FormattingOptions>::precision", "Argument[0]", "ReturnValue.Field[crate::fmt::FormattingOptions::precision]", "value", "dfc-generated"]
+      - ["lang:core", "<crate::fmt::FormattingOptions>::get_precision", "Argument[self].Field[crate::fmt::FormattingOptions::precision]", "ReturnValue.Field[crate::option::Option::Some(0)]", "value", "dfc-generated"]
+      - ["lang:core", "<crate::fmt::FormattingOptions>::get_width", "Argument[self].Field[crate::fmt::FormattingOptions::width]", "ReturnValue.Field[crate::option::Option::Some(0)]", "value", "dfc-generated"]
       - ["lang:core", "<crate::fmt::FormattingOptions>::precision", "Argument[self]", "ReturnValue", "value", "dfc-generated"]
       - ["lang:core", "<crate::fmt::FormattingOptions>::sign", "Argument[self]", "ReturnValue", "value", "dfc-generated"]
       - ["lang:core", "<crate::fmt::FormattingOptions>::sign_aware_zero_pad", "Argument[self]", "ReturnValue", "value", "dfc-generated"]
-      - ["lang:core", "<crate::fmt::FormattingOptions>::width", "Argument[0]", "Argument[self].Field[crate::fmt::FormattingOptions::width]", "value", "dfc-generated"]
-      - ["lang:core", "<crate::fmt::FormattingOptions>::width", "Argument[0]", "ReturnValue.Field[crate::fmt::FormattingOptions::width]", "value", "dfc-generated"]
       - ["lang:core", "<crate::fmt::FormattingOptions>::width", "Argument[self]", "ReturnValue", "value", "dfc-generated"]
       - ["lang:core", "<crate::fmt::builders::DebugList>::entries", "Argument[self]", "ReturnValue", "value", "dfc-generated"]
       - ["lang:core", "<crate::fmt::builders::DebugList>::entry", "Argument[self]", "ReturnValue", "value", "dfc-generated"]
@@ -335,15 +657,14 @@ extensions:
       - ["lang:core", "<crate::fmt::num::LowerHex as crate::fmt::num::GenericRadix>::digit", "Argument[0]", "ReturnValue", "taint", "df-generated"]
       - ["lang:core", "<crate::fmt::num::Octal as crate::fmt::num::GenericRadix>::digit", "Argument[0]", "ReturnValue", "taint", "df-generated"]
       - ["lang:core", "<crate::fmt::num::UpperHex as crate::fmt::num::GenericRadix>::digit", "Argument[0]", "ReturnValue", "taint", "df-generated"]
-      - ["lang:core", "<crate::fmt::rt::Argument>::as_usize", "Argument[self].Field[crate::fmt::rt::Argument::ty].Field[crate::fmt::rt::ArgumentType::Count(0)]", "ReturnValue.Field[crate::option::Option::Some(0)]", "value", "dfc-generated"]
-      - ["lang:core", "<crate::fmt::rt::Argument>::from_usize", "Argument[0].Reference", "ReturnValue.Field[crate::fmt::rt::Argument::ty].Field[crate::fmt::rt::ArgumentType::Count(0)]", "value", "dfc-generated"]
+      - ["lang:core", "<crate::fmt::rt::Argument>::as_u16", "Argument[self].Field[crate::fmt::rt::Argument::ty].Field[crate::fmt::rt::ArgumentType::Count(0)]", "ReturnValue.Field[crate::option::Option::Some(0)]", "value", "dfc-generated"]
+      - ["lang:core", "<crate::fmt::rt::Argument>::from_usize", "Argument[0]", "ReturnValue", "taint", "df-generated"]
       - ["lang:core", "<crate::fmt::rt::Placeholder>::new", "Argument[0]", "ReturnValue.Field[crate::fmt::rt::Placeholder::position]", "value", "dfc-generated"]
       - ["lang:core", "<crate::fmt::rt::Placeholder>::new", "Argument[1]", "ReturnValue.Field[crate::fmt::rt::Placeholder::fill]", "value", "dfc-generated"]
       - ["lang:core", "<crate::fmt::rt::Placeholder>::new", "Argument[2]", "ReturnValue.Field[crate::fmt::rt::Placeholder::align]", "value", "dfc-generated"]
       - ["lang:core", "<crate::fmt::rt::Placeholder>::new", "Argument[3]", "ReturnValue.Field[crate::fmt::rt::Placeholder::flags]", "value", "dfc-generated"]
       - ["lang:core", "<crate::fmt::rt::Placeholder>::new", "Argument[4]", "ReturnValue.Field[crate::fmt::rt::Placeholder::precision]", "value", "dfc-generated"]
       - ["lang:core", "<crate::fmt::rt::Placeholder>::new", "Argument[5]", "ReturnValue.Field[crate::fmt::rt::Placeholder::width]", "value", "dfc-generated"]
-      - ["lang:core", "<crate::future::join::MaybeDone>::take_output", "Argument[self].Reference.Field[crate::future::join::MaybeDone::Done(0)]", "ReturnValue.Field[crate::option::Option::Some(0)]", "value", "dfc-generated"]
       - ["lang:core", "<crate::future::ready::Ready>::into_inner", "Argument[self].Field[0].Field[crate::option::Option::Some(0)]", "ReturnValue", "value", "dfc-generated"]
       - ["lang:core", "<crate::future::ready::Ready>::into_inner", "Argument[self].Field[crate::future::ready::Ready(0)].Field[crate::option::Option::Some(0)]", "ReturnValue", "value", "dfc-generated"]
       - ["lang:core", "<crate::hash::sip::Hasher as crate::clone::Clone>::clone", "Argument[self]", "ReturnValue", "taint", "df-generated"]
@@ -360,7 +681,7 @@ extensions:
       - ["lang:core", "<crate::io::borrowed_buf::BorrowedBuf>::set_init", "Argument[self]", "ReturnValue", "value", "dfc-generated"]
       - ["lang:core", "<crate::io::borrowed_buf::BorrowedBuf>::unfilled", "Argument[self].Field[crate::io::borrowed_buf::BorrowedBuf::filled]", "ReturnValue.Field[crate::io::borrowed_buf::BorrowedCursor::start]", "value", "dfc-generated"]
       - ["lang:core", "<crate::io::borrowed_buf::BorrowedCursor>::advance", "Argument[self]", "ReturnValue", "value", "dfc-generated"]
-      - ["lang:core", "<crate::io::borrowed_buf::BorrowedCursor>::advance_unchecked", "Argument[self]", "ReturnValue", "taint", "df-generated"]
+      - ["lang:core", "<crate::io::borrowed_buf::BorrowedCursor>::advance_unchecked", "Argument[self]", "ReturnValue", "value", "df-generated"]
       - ["lang:core", "<crate::io::borrowed_buf::BorrowedCursor>::capacity", "Argument[self]", "ReturnValue", "taint", "df-generated"]
       - ["lang:core", "<crate::io::borrowed_buf::BorrowedCursor>::ensure_init", "Argument[self]", "ReturnValue", "value", "dfc-generated"]
       - ["lang:core", "<crate::io::borrowed_buf::BorrowedCursor>::reborrow", "Argument[self].Field[crate::io::borrowed_buf::BorrowedCursor::start]", "ReturnValue.Field[crate::io::borrowed_buf::BorrowedCursor::start]", "value", "dfc-generated"]
@@ -375,17 +696,39 @@ extensions:
       - ["lang:core", "<crate::iter::adapters::array_chunks::ArrayChunks as crate::iter::traits::iterator::Iterator>::try_fold", "Argument[0]", "ReturnValue", "value", "dfc-generated"]
       - ["lang:core", "<crate::iter::adapters::array_chunks::ArrayChunks>::into_remainder", "Argument[self].Field[crate::iter::adapters::array_chunks::ArrayChunks::remainder]", "ReturnValue", "value", "dfc-generated"]
       - ["lang:core", "<crate::iter::adapters::array_chunks::ArrayChunks>::new", "Argument[0]", "ReturnValue.Field[crate::iter::adapters::array_chunks::ArrayChunks::iter]", "value", "dfc-generated"]
+      - ["lang:core", "<crate::iter::adapters::by_ref_sized::ByRefSized as crate::iter::traits::double_ended::DoubleEndedIterator>::advance_back_by", "Argument[0]", "ReturnValue", "taint", "df-generated"]
+      - ["lang:core", "<crate::iter::adapters::by_ref_sized::ByRefSized as crate::iter::traits::double_ended::DoubleEndedIterator>::rfold", "Argument[0].Field[0]", "ReturnValue", "value", "dfc-generated"]
+      - ["lang:core", "<crate::iter::adapters::by_ref_sized::ByRefSized as crate::iter::traits::double_ended::DoubleEndedIterator>::try_rfold", "Argument[0]", "ReturnValue", "value", "dfc-generated"]
+      - ["lang:core", "<crate::iter::adapters::by_ref_sized::ByRefSized as crate::iter::traits::iterator::Iterator>::advance_by", "Argument[0]", "ReturnValue", "taint", "df-generated"]
+      - ["lang:core", "<crate::iter::adapters::by_ref_sized::ByRefSized as crate::iter::traits::iterator::Iterator>::fold", "Argument[0].Field[0]", "ReturnValue", "value", "dfc-generated"]
+      - ["lang:core", "<crate::iter::adapters::by_ref_sized::ByRefSized as crate::iter::traits::iterator::Iterator>::next", "Argument[self].Field[0].Element", "ReturnValue.Field[crate::option::Option::Some(0)]", "value", "dfc-generated"]
+      - ["lang:core", "<crate::iter::adapters::by_ref_sized::ByRefSized as crate::iter::traits::iterator::Iterator>::next", "Argument[self].Field[crate::iter::adapters::by_ref_sized::ByRefSized(0)].Element", "ReturnValue.Field[crate::option::Option::Some(0)]", "value", "dfc-generated"]
+      - ["lang:core", "<crate::iter::adapters::by_ref_sized::ByRefSized as crate::iter::traits::iterator::Iterator>::nth", "Argument[self].Field[0].Element", "ReturnValue.Field[crate::option::Option::Some(0)]", "value", "dfc-generated"]
+      - ["lang:core", "<crate::iter::adapters::by_ref_sized::ByRefSized as crate::iter::traits::iterator::Iterator>::nth", "Argument[self].Field[crate::iter::adapters::by_ref_sized::ByRefSized(0)].Element", "ReturnValue.Field[crate::option::Option::Some(0)]", "value", "dfc-generated"]
+      - ["lang:core", "<crate::iter::adapters::by_ref_sized::ByRefSized as crate::iter::traits::iterator::Iterator>::try_fold", "Argument[0]", "ReturnValue", "value", "dfc-generated"]
+      - ["lang:core", "<crate::iter::adapters::chain::Chain as crate::iter::traits::double_ended::DoubleEndedIterator>::next_back", "Argument[self].Field[crate::iter::adapters::chain::Chain::a].Field[crate::option::Option::Some(0)]", "ReturnValue.Reference", "value", "dfc-generated"]
+      - ["lang:core", "<crate::iter::adapters::chain::Chain as crate::iter::traits::double_ended::DoubleEndedIterator>::next_back", "Argument[self].Field[crate::iter::adapters::chain::Chain::b].Field[crate::option::Option::Some(0)]", "ReturnValue.Reference", "value", "dfc-generated"]
+      - ["lang:core", "<crate::iter::adapters::chain::Chain as crate::iter::traits::double_ended::DoubleEndedIterator>::nth_back", "Argument[self].Field[crate::iter::adapters::chain::Chain::a].Field[crate::option::Option::Some(0)]", "ReturnValue.Reference", "value", "dfc-generated"]
+      - ["lang:core", "<crate::iter::adapters::chain::Chain as crate::iter::traits::double_ended::DoubleEndedIterator>::rfind", "Argument[self].Field[crate::iter::adapters::chain::Chain::a].Field[crate::option::Option::Some(0)]", "ReturnValue.Reference", "value", "dfc-generated"]
+      - ["lang:core", "<crate::iter::adapters::chain::Chain as crate::iter::traits::double_ended::DoubleEndedIterator>::rfind", "Argument[self].Field[crate::iter::adapters::chain::Chain::b].Field[crate::option::Option::Some(0)]", "ReturnValue.Reference", "value", "dfc-generated"]
       - ["lang:core", "<crate::iter::adapters::chain::Chain as crate::iter::traits::double_ended::DoubleEndedIterator>::rfold", "Argument[0]", "ReturnValue", "value", "dfc-generated"]
       - ["lang:core", "<crate::iter::adapters::chain::Chain as crate::iter::traits::double_ended::DoubleEndedIterator>::try_rfold", "Argument[0]", "ReturnValue", "value", "dfc-generated"]
+      - ["lang:core", "<crate::iter::adapters::chain::Chain as crate::iter::traits::iterator::Iterator>::find", "Argument[self].Field[crate::iter::adapters::chain::Chain::a].Field[crate::option::Option::Some(0)]", "ReturnValue.Reference", "value", "dfc-generated"]
+      - ["lang:core", "<crate::iter::adapters::chain::Chain as crate::iter::traits::iterator::Iterator>::find", "Argument[self].Field[crate::iter::adapters::chain::Chain::b].Field[crate::option::Option::Some(0)]", "ReturnValue.Reference", "value", "dfc-generated"]
       - ["lang:core", "<crate::iter::adapters::chain::Chain as crate::iter::traits::iterator::Iterator>::fold", "Argument[0]", "ReturnValue", "value", "dfc-generated"]
+      - ["lang:core", "<crate::iter::adapters::chain::Chain as crate::iter::traits::iterator::Iterator>::next", "Argument[self].Field[crate::iter::adapters::chain::Chain::a].Field[crate::option::Option::Some(0)]", "ReturnValue.Reference", "value", "dfc-generated"]
+      - ["lang:core", "<crate::iter::adapters::chain::Chain as crate::iter::traits::iterator::Iterator>::next", "Argument[self].Field[crate::iter::adapters::chain::Chain::b].Field[crate::option::Option::Some(0)]", "ReturnValue.Reference", "value", "dfc-generated"]
+      - ["lang:core", "<crate::iter::adapters::chain::Chain as crate::iter::traits::iterator::Iterator>::nth", "Argument[self].Field[crate::iter::adapters::chain::Chain::b].Field[crate::option::Option::Some(0)]", "ReturnValue.Reference", "value", "dfc-generated"]
       - ["lang:core", "<crate::iter::adapters::chain::Chain as crate::iter::traits::iterator::Iterator>::try_fold", "Argument[0]", "ReturnValue", "value", "dfc-generated"]
       - ["lang:core", "<crate::iter::adapters::chain::Chain>::new", "Argument[0]", "ReturnValue.Field[crate::iter::adapters::chain::Chain::a].Field[crate::option::Option::Some(0)]", "value", "dfc-generated"]
       - ["lang:core", "<crate::iter::adapters::chain::Chain>::new", "Argument[1]", "ReturnValue.Field[crate::iter::adapters::chain::Chain::b].Field[crate::option::Option::Some(0)]", "value", "dfc-generated"]
+      - ["lang:core", "<crate::iter::adapters::cloned::Cloned as crate::iter::traits::double_ended::DoubleEndedIterator>::rfold", "Argument[0]", "ReturnValue", "value", "dfc-generated"]
+      - ["lang:core", "<crate::iter::adapters::cloned::Cloned as crate::iter::traits::double_ended::DoubleEndedIterator>::rfold", "Argument[1].ReturnValue", "ReturnValue", "value", "dfc-generated"]
       - ["lang:core", "<crate::iter::adapters::cloned::Cloned as crate::iter::traits::double_ended::DoubleEndedIterator>::try_rfold", "Argument[0]", "ReturnValue", "value", "dfc-generated"]
       - ["lang:core", "<crate::iter::adapters::cloned::Cloned as crate::iter::traits::iterator::Iterator>::fold", "Argument[0]", "ReturnValue", "value", "dfc-generated"]
       - ["lang:core", "<crate::iter::adapters::cloned::Cloned as crate::iter::traits::iterator::Iterator>::fold", "Argument[1].ReturnValue", "ReturnValue", "value", "dfc-generated"]
       - ["lang:core", "<crate::iter::adapters::cloned::Cloned as crate::iter::traits::iterator::Iterator>::try_fold", "Argument[0]", "ReturnValue", "value", "dfc-generated"]
-      - ["lang:core", "<crate::iter::adapters::cloned::Cloned as crate::iter::traits::unchecked_iterator::UncheckedIterator>::next_unchecked", "Argument[self].Field[crate::iter::adapters::cloned::Cloned::it].Element", "ReturnValue", "value", "dfc-generated"]
+      - ["lang:core", "<crate::iter::adapters::cloned::Cloned as crate::iter::traits::unchecked_iterator::UncheckedIterator>::next_unchecked", "Argument[self]", "ReturnValue", "taint", "df-generated"]
       - ["lang:core", "<crate::iter::adapters::cloned::Cloned>::new", "Argument[0]", "ReturnValue.Field[crate::iter::adapters::cloned::Cloned::it]", "value", "dfc-generated"]
       - ["lang:core", "<crate::iter::adapters::copied::Copied as crate::iter::traits::double_ended::DoubleEndedIterator>::advance_back_by", "Argument[0]", "ReturnValue", "taint", "df-generated"]
       - ["lang:core", "<crate::iter::adapters::copied::Copied as crate::iter::traits::double_ended::DoubleEndedIterator>::rfold", "Argument[0]", "ReturnValue", "value", "dfc-generated"]
@@ -397,13 +740,13 @@ extensions:
       - ["lang:core", "<crate::iter::adapters::copied::Copied as crate::iter::traits::iterator::Iterator>::try_fold", "Argument[0]", "ReturnValue", "value", "dfc-generated"]
       - ["lang:core", "<crate::iter::adapters::copied::Copied>::new", "Argument[0]", "ReturnValue.Field[crate::iter::adapters::copied::Copied::it]", "value", "dfc-generated"]
       - ["lang:core", "<crate::iter::adapters::cycle::Cycle as crate::iter::traits::iterator::Iterator>::advance_by", "Argument[self].Field[crate::iter::adapters::cycle::Cycle::orig].Reference", "Argument[self].Field[crate::iter::adapters::cycle::Cycle::iter]", "value", "dfc-generated"]
-      - ["lang:core", "<crate::iter::adapters::cycle::Cycle as crate::iter::traits::iterator::Iterator>::advance_by", "Argument[self].Field[crate::iter::adapters::cycle::Cycle::orig]", "Argument[self].Field[crate::iter::adapters::cycle::Cycle::iter].Reference", "value", "dfc-generated"]
       - ["lang:core", "<crate::iter::adapters::cycle::Cycle as crate::iter::traits::iterator::Iterator>::advance_by", "Argument[self].Field[crate::iter::adapters::cycle::Cycle::orig]", "Argument[self].Field[crate::iter::adapters::cycle::Cycle::iter]", "value", "dfc-generated"]
       - ["lang:core", "<crate::iter::adapters::cycle::Cycle as crate::iter::traits::iterator::Iterator>::next", "Argument[self]", "ReturnValue", "taint", "df-generated"]
       - ["lang:core", "<crate::iter::adapters::cycle::Cycle as crate::iter::traits::iterator::Iterator>::try_fold", "Argument[self].Field[crate::iter::adapters::cycle::Cycle::orig].Reference", "Argument[self].Field[crate::iter::adapters::cycle::Cycle::iter]", "value", "dfc-generated"]
-      - ["lang:core", "<crate::iter::adapters::cycle::Cycle as crate::iter::traits::iterator::Iterator>::try_fold", "Argument[self].Field[crate::iter::adapters::cycle::Cycle::orig]", "Argument[self].Field[crate::iter::adapters::cycle::Cycle::iter].Reference", "value", "dfc-generated"]
       - ["lang:core", "<crate::iter::adapters::cycle::Cycle as crate::iter::traits::iterator::Iterator>::try_fold", "Argument[self].Field[crate::iter::adapters::cycle::Cycle::orig]", "Argument[self].Field[crate::iter::adapters::cycle::Cycle::iter]", "value", "dfc-generated"]
-      - ["lang:core", "<crate::iter::adapters::cycle::Cycle>::new", "Argument[0]", "ReturnValue", "taint", "df-generated"]
+      - ["lang:core", "<crate::iter::adapters::cycle::Cycle>::new", "Argument[0].Reference", "ReturnValue.Field[crate::iter::adapters::cycle::Cycle::orig]", "value", "dfc-generated"]
+      - ["lang:core", "<crate::iter::adapters::cycle::Cycle>::new", "Argument[0]", "ReturnValue.Field[crate::iter::adapters::cycle::Cycle::iter]", "value", "dfc-generated"]
+      - ["lang:core", "<crate::iter::adapters::cycle::Cycle>::new", "Argument[0]", "ReturnValue.Field[crate::iter::adapters::cycle::Cycle::orig]", "value", "dfc-generated"]
       - ["lang:core", "<crate::iter::adapters::enumerate::Enumerate as crate::iter::traits::double_ended::DoubleEndedIterator>::advance_back_by", "Argument[0]", "ReturnValue", "taint", "df-generated"]
       - ["lang:core", "<crate::iter::adapters::enumerate::Enumerate as crate::iter::traits::double_ended::DoubleEndedIterator>::next_back", "Argument[self]", "ReturnValue", "taint", "df-generated"]
       - ["lang:core", "<crate::iter::adapters::enumerate::Enumerate as crate::iter::traits::double_ended::DoubleEndedIterator>::nth_back", "Argument[self]", "ReturnValue", "taint", "df-generated"]
@@ -439,22 +782,29 @@ extensions:
       - ["lang:core", "<crate::iter::adapters::filter_map::FilterMap>::new", "Argument[0]", "ReturnValue.Field[crate::iter::adapters::filter_map::FilterMap::iter]", "value", "dfc-generated"]
       - ["lang:core", "<crate::iter::adapters::filter_map::FilterMap>::new", "Argument[1]", "ReturnValue.Field[crate::iter::adapters::filter_map::FilterMap::f]", "value", "dfc-generated"]
       - ["lang:core", "<crate::iter::adapters::flatten::FlatMap as crate::clone::Clone>::clone", "Argument[self].Field[crate::iter::adapters::flatten::FlatMap::inner].Reference", "ReturnValue.Field[crate::iter::adapters::flatten::FlatMap::inner]", "value", "dfc-generated"]
-      - ["lang:core", "<crate::iter::adapters::flatten::FlatMap as crate::clone::Clone>::clone", "Argument[self].Field[crate::iter::adapters::flatten::FlatMap::inner]", "ReturnValue.Field[crate::iter::adapters::flatten::FlatMap::inner]", "value", "dfc-generated"]
-      - ["lang:core", "<crate::iter::adapters::flatten::FlatMap as crate::iter::traits::iterator::Iterator>::advance_by", "Argument[0]", "ReturnValue", "taint", "df-generated"]
+      - ["lang:core", "<crate::iter::adapters::flatten::FlatMap as crate::iter::traits::double_ended::DoubleEndedIterator>::rfold", "Argument[0]", "ReturnValue", "value", "dfc-generated"]
+      - ["lang:core", "<crate::iter::adapters::flatten::FlatMap as crate::iter::traits::double_ended::DoubleEndedIterator>::try_rfold", "Argument[0]", "ReturnValue", "value", "dfc-generated"]
       - ["lang:core", "<crate::iter::adapters::flatten::FlatMap as crate::iter::traits::iterator::Iterator>::fold", "Argument[0]", "ReturnValue", "value", "dfc-generated"]
-      - ["lang:core", "<crate::iter::adapters::flatten::FlatMap as crate::iter::traits::iterator::Iterator>::fold", "Argument[1].ReturnValue", "ReturnValue", "value", "dfc-generated"]
       - ["lang:core", "<crate::iter::adapters::flatten::FlatMap as crate::iter::traits::iterator::Iterator>::try_fold", "Argument[0]", "ReturnValue", "value", "dfc-generated"]
       - ["lang:core", "<crate::iter::adapters::flatten::FlatMap>::into_parts", "Argument[self].Field[crate::iter::adapters::flatten::FlatMap::inner].Field[crate::iter::adapters::flatten::FlattenCompat::backiter]", "ReturnValue.Field[2]", "value", "dfc-generated"]
       - ["lang:core", "<crate::iter::adapters::flatten::FlatMap>::into_parts", "Argument[self].Field[crate::iter::adapters::flatten::FlatMap::inner].Field[crate::iter::adapters::flatten::FlattenCompat::frontiter]", "ReturnValue.Field[0]", "value", "dfc-generated"]
       - ["lang:core", "<crate::iter::adapters::flatten::Flatten as crate::clone::Clone>::clone", "Argument[self].Field[crate::iter::adapters::flatten::Flatten::inner].Reference", "ReturnValue.Field[crate::iter::adapters::flatten::Flatten::inner]", "value", "dfc-generated"]
-      - ["lang:core", "<crate::iter::adapters::flatten::Flatten as crate::clone::Clone>::clone", "Argument[self].Field[crate::iter::adapters::flatten::Flatten::inner]", "ReturnValue.Field[crate::iter::adapters::flatten::Flatten::inner]", "value", "dfc-generated"]
-      - ["lang:core", "<crate::iter::adapters::flatten::Flatten as crate::iter::traits::iterator::Iterator>::advance_by", "Argument[0]", "ReturnValue", "taint", "df-generated"]
+      - ["lang:core", "<crate::iter::adapters::flatten::Flatten as crate::iter::traits::double_ended::DoubleEndedIterator>::rfold", "Argument[0]", "ReturnValue", "value", "dfc-generated"]
+      - ["lang:core", "<crate::iter::adapters::flatten::Flatten as crate::iter::traits::double_ended::DoubleEndedIterator>::try_rfold", "Argument[0]", "ReturnValue", "value", "dfc-generated"]
       - ["lang:core", "<crate::iter::adapters::flatten::Flatten as crate::iter::traits::iterator::Iterator>::fold", "Argument[0]", "ReturnValue", "value", "dfc-generated"]
-      - ["lang:core", "<crate::iter::adapters::flatten::Flatten as crate::iter::traits::iterator::Iterator>::fold", "Argument[1].ReturnValue", "ReturnValue", "value", "dfc-generated"]
       - ["lang:core", "<crate::iter::adapters::flatten::Flatten as crate::iter::traits::iterator::Iterator>::try_fold", "Argument[0]", "ReturnValue", "value", "dfc-generated"]
+      - ["lang:core", "<crate::iter::adapters::flatten::FlattenCompat as crate::iter::traits::double_ended::DoubleEndedIterator>::next_back", "Argument[self].Field[crate::iter::adapters::flatten::FlattenCompat::frontiter].Field[crate::option::Option::Some(0)]", "ReturnValue.Reference", "value", "dfc-generated"]
+      - ["lang:core", "<crate::iter::adapters::flatten::FlattenCompat as crate::iter::traits::double_ended::DoubleEndedIterator>::rfold", "Argument[0]", "ReturnValue", "value", "dfc-generated"]
+      - ["lang:core", "<crate::iter::adapters::flatten::FlattenCompat as crate::iter::traits::double_ended::DoubleEndedIterator>::try_rfold", "Argument[0]", "ReturnValue", "value", "dfc-generated"]
       - ["lang:core", "<crate::iter::adapters::flatten::FlattenCompat as crate::iter::traits::iterator::Iterator>::fold", "Argument[0]", "ReturnValue", "value", "dfc-generated"]
-      - ["lang:core", "<crate::iter::adapters::flatten::FlattenCompat as crate::iter::traits::iterator::Iterator>::fold", "Argument[1].ReturnValue", "ReturnValue", "value", "dfc-generated"]
+      - ["lang:core", "<crate::iter::adapters::flatten::FlattenCompat as crate::iter::traits::iterator::Iterator>::next", "Argument[self].Field[crate::iter::adapters::flatten::FlattenCompat::backiter].Field[crate::option::Option::Some(0)]", "ReturnValue.Reference", "value", "dfc-generated"]
       - ["lang:core", "<crate::iter::adapters::flatten::FlattenCompat as crate::iter::traits::iterator::Iterator>::try_fold", "Argument[0]", "ReturnValue", "value", "dfc-generated"]
+      - ["lang:core", "<crate::iter::adapters::fuse::Fuse as crate::iter::adapters::fuse::FuseImpl>::find", "Argument[self].Field[crate::iter::adapters::fuse::Fuse::iter].Field[crate::option::Option::Some(0)]", "ReturnValue.Reference", "value", "dfc-generated"]
+      - ["lang:core", "<crate::iter::adapters::fuse::Fuse as crate::iter::adapters::fuse::FuseImpl>::next", "Argument[self].Field[crate::iter::adapters::fuse::Fuse::iter].Field[crate::option::Option::Some(0)]", "ReturnValue.Reference", "value", "dfc-generated"]
+      - ["lang:core", "<crate::iter::adapters::fuse::Fuse as crate::iter::adapters::fuse::FuseImpl>::next_back", "Argument[self].Field[crate::iter::adapters::fuse::Fuse::iter].Field[crate::option::Option::Some(0)]", "ReturnValue.Reference", "value", "dfc-generated"]
+      - ["lang:core", "<crate::iter::adapters::fuse::Fuse as crate::iter::adapters::fuse::FuseImpl>::nth", "Argument[self].Field[crate::iter::adapters::fuse::Fuse::iter].Field[crate::option::Option::Some(0)]", "ReturnValue.Reference", "value", "dfc-generated"]
+      - ["lang:core", "<crate::iter::adapters::fuse::Fuse as crate::iter::adapters::fuse::FuseImpl>::nth_back", "Argument[self].Field[crate::iter::adapters::fuse::Fuse::iter].Field[crate::option::Option::Some(0)]", "ReturnValue.Reference", "value", "dfc-generated"]
+      - ["lang:core", "<crate::iter::adapters::fuse::Fuse as crate::iter::adapters::fuse::FuseImpl>::rfind", "Argument[self].Field[crate::iter::adapters::fuse::Fuse::iter].Field[crate::option::Option::Some(0)]", "ReturnValue.Reference", "value", "dfc-generated"]
       - ["lang:core", "<crate::iter::adapters::fuse::Fuse as crate::iter::adapters::fuse::FuseImpl>::try_fold", "Argument[0]", "ReturnValue", "value", "dfc-generated"]
       - ["lang:core", "<crate::iter::adapters::fuse::Fuse as crate::iter::adapters::fuse::FuseImpl>::try_rfold", "Argument[0]", "ReturnValue", "value", "dfc-generated"]
       - ["lang:core", "<crate::iter::adapters::fuse::Fuse as crate::iter::traits::double_ended::DoubleEndedIterator>::rfold", "Argument[0]", "ReturnValue", "value", "dfc-generated"]
@@ -466,13 +816,13 @@ extensions:
       - ["lang:core", "<crate::iter::adapters::inspect::Inspect as crate::iter::traits::double_ended::DoubleEndedIterator>::try_rfold", "Argument[0]", "ReturnValue", "value", "dfc-generated"]
       - ["lang:core", "<crate::iter::adapters::inspect::Inspect as crate::iter::traits::iterator::Iterator>::fold", "Argument[0]", "ReturnValue", "value", "dfc-generated"]
       - ["lang:core", "<crate::iter::adapters::inspect::Inspect as crate::iter::traits::iterator::Iterator>::fold", "Argument[1].ReturnValue", "ReturnValue", "value", "dfc-generated"]
+      - ["lang:core", "<crate::iter::adapters::inspect::Inspect as crate::iter::traits::iterator::Iterator>::next", "Argument[self].Field[crate::iter::adapters::inspect::Inspect::iter].Element", "ReturnValue.Field[crate::option::Option::Some(0)]", "value", "dfc-generated"]
       - ["lang:core", "<crate::iter::adapters::inspect::Inspect as crate::iter::traits::iterator::Iterator>::try_fold", "Argument[0]", "ReturnValue", "value", "dfc-generated"]
       - ["lang:core", "<crate::iter::adapters::inspect::Inspect>::new", "Argument[0]", "ReturnValue.Field[crate::iter::adapters::inspect::Inspect::iter]", "value", "dfc-generated"]
       - ["lang:core", "<crate::iter::adapters::inspect::Inspect>::new", "Argument[1]", "ReturnValue.Field[crate::iter::adapters::inspect::Inspect::f]", "value", "dfc-generated"]
       - ["lang:core", "<crate::iter::adapters::intersperse::Intersperse as crate::iter::traits::iterator::Iterator>::fold", "Argument[0]", "ReturnValue", "value", "dfc-generated"]
       - ["lang:core", "<crate::iter::adapters::intersperse::Intersperse as crate::iter::traits::iterator::Iterator>::fold", "Argument[1].ReturnValue", "ReturnValue", "value", "dfc-generated"]
       - ["lang:core", "<crate::iter::adapters::intersperse::Intersperse as crate::iter::traits::iterator::Iterator>::next", "Argument[self].Field[crate::iter::adapters::intersperse::Intersperse::separator].Reference", "ReturnValue.Field[crate::option::Option::Some(0)]", "value", "dfc-generated"]
-      - ["lang:core", "<crate::iter::adapters::intersperse::Intersperse as crate::iter::traits::iterator::Iterator>::next", "Argument[self].Field[crate::iter::adapters::intersperse::Intersperse::separator]", "ReturnValue.Field[crate::option::Option::Some(0)]", "value", "dfc-generated"]
       - ["lang:core", "<crate::iter::adapters::intersperse::Intersperse>::new", "Argument[1]", "ReturnValue.Field[crate::iter::adapters::intersperse::Intersperse::separator]", "value", "dfc-generated"]
       - ["lang:core", "<crate::iter::adapters::intersperse::IntersperseWith as crate::clone::Clone>::clone", "Argument[self]", "ReturnValue", "taint", "df-generated"]
       - ["lang:core", "<crate::iter::adapters::intersperse::IntersperseWith as crate::iter::traits::iterator::Iterator>::fold", "Argument[0]", "ReturnValue", "value", "dfc-generated"]
@@ -508,14 +858,14 @@ extensions:
       - ["lang:core", "<crate::iter::adapters::peekable::Peekable as crate::iter::traits::iterator::Iterator>::fold", "Argument[0]", "Argument[1].Parameter[0]", "value", "dfc-generated"]
       - ["lang:core", "<crate::iter::adapters::peekable::Peekable as crate::iter::traits::iterator::Iterator>::fold", "Argument[0]", "ReturnValue", "value", "dfc-generated"]
       - ["lang:core", "<crate::iter::adapters::peekable::Peekable as crate::iter::traits::iterator::Iterator>::fold", "Argument[1].ReturnValue", "ReturnValue", "value", "dfc-generated"]
-      - ["lang:core", "<crate::iter::adapters::peekable::Peekable as crate::iter::traits::iterator::Iterator>::last", "Argument[self].Field[crate::iter::adapters::peekable::Peekable::peeked].Field[crate::option::Option::Some(0)]", "ReturnValue", "value", "dfc-generated"]
       - ["lang:core", "<crate::iter::adapters::peekable::Peekable as crate::iter::traits::iterator::Iterator>::next", "Argument[self].Field[crate::iter::adapters::peekable::Peekable::iter].Element", "ReturnValue.Field[crate::option::Option::Some(0)]", "value", "dfc-generated"]
-      - ["lang:core", "<crate::iter::adapters::peekable::Peekable as crate::iter::traits::iterator::Iterator>::next", "Argument[self].Field[crate::iter::adapters::peekable::Peekable::peeked].Field[crate::option::Option::Some(0)]", "ReturnValue", "value", "dfc-generated"]
       - ["lang:core", "<crate::iter::adapters::peekable::Peekable as crate::iter::traits::iterator::Iterator>::nth", "Argument[self].Field[crate::iter::adapters::peekable::Peekable::iter].Element", "ReturnValue.Field[crate::option::Option::Some(0)]", "value", "dfc-generated"]
-      - ["lang:core", "<crate::iter::adapters::peekable::Peekable as crate::iter::traits::iterator::Iterator>::nth", "Argument[self].Field[crate::iter::adapters::peekable::Peekable::peeked].Field[crate::option::Option::Some(0)]", "ReturnValue", "value", "dfc-generated"]
       - ["lang:core", "<crate::iter::adapters::peekable::Peekable as crate::iter::traits::iterator::Iterator>::try_fold", "Argument[0]", "Argument[1].Parameter[0]", "value", "dfc-generated"]
       - ["lang:core", "<crate::iter::adapters::peekable::Peekable as crate::iter::traits::iterator::Iterator>::try_fold", "Argument[0]", "ReturnValue", "value", "dfc-generated"]
       - ["lang:core", "<crate::iter::adapters::peekable::Peekable>::new", "Argument[0]", "ReturnValue.Field[crate::iter::adapters::peekable::Peekable::iter]", "value", "dfc-generated"]
+      - ["lang:core", "<crate::iter::adapters::peekable::Peekable>::next_if", "Argument[self].Field[crate::iter::adapters::peekable::Peekable::iter].Element", "Argument[0].Parameter[0].Reference", "value", "dfc-generated"]
+      - ["lang:core", "<crate::iter::adapters::peekable::Peekable>::next_if", "Argument[self].Field[crate::iter::adapters::peekable::Peekable::iter].Element", "ReturnValue.Field[crate::option::Option::Some(0)]", "value", "dfc-generated"]
+      - ["lang:core", "<crate::iter::adapters::peekable::Peekable>::next_if_eq", "Argument[self].Field[crate::iter::adapters::peekable::Peekable::iter].Element", "ReturnValue.Field[crate::option::Option::Some(0)]", "value", "dfc-generated"]
       - ["lang:core", "<crate::iter::adapters::peekable::Peekable>::peek", "Argument[self]", "ReturnValue", "taint", "df-generated"]
       - ["lang:core", "<crate::iter::adapters::peekable::Peekable>::peek_mut", "Argument[self]", "ReturnValue", "taint", "df-generated"]
       - ["lang:core", "<crate::iter::adapters::rev::Rev as crate::iter::traits::double_ended::DoubleEndedIterator>::advance_back_by", "Argument[0]", "ReturnValue", "taint", "df-generated"]
@@ -567,13 +917,25 @@ extensions:
       - ["lang:core", "<crate::iter::adapters::step_by::StepBy as crate::iter::adapters::step_by::StepByImpl>::spec_size_hint", "Argument[self]", "ReturnValue", "taint", "df-generated"]
       - ["lang:core", "<crate::iter::adapters::step_by::StepBy as crate::iter::adapters::step_by::StepByImpl>::spec_try_fold", "Argument[0]", "ReturnValue", "value", "dfc-generated"]
       - ["lang:core", "<crate::iter::adapters::step_by::StepBy as crate::iter::adapters::step_by::StepByImpl>::spec_try_fold", "Argument[self].Field[crate::iter::adapters::step_by::StepBy::iter].Element", "Argument[1].Parameter[1]", "value", "dfc-generated"]
+      - ["lang:core", "<crate::iter::adapters::step_by::StepBy as crate::iter::traits::double_ended::DoubleEndedIterator>::rfold", "Argument[0]", "Argument[1].Parameter[0]", "value", "dfc-generated"]
+      - ["lang:core", "<crate::iter::adapters::step_by::StepBy as crate::iter::traits::double_ended::DoubleEndedIterator>::rfold", "Argument[0]", "ReturnValue", "value", "dfc-generated"]
+      - ["lang:core", "<crate::iter::adapters::step_by::StepBy as crate::iter::traits::double_ended::DoubleEndedIterator>::rfold", "Argument[1].ReturnValue", "ReturnValue", "value", "dfc-generated"]
+      - ["lang:core", "<crate::iter::adapters::step_by::StepBy as crate::iter::traits::double_ended::DoubleEndedIterator>::try_rfold", "Argument[0]", "Argument[1].Parameter[0]", "value", "dfc-generated"]
+      - ["lang:core", "<crate::iter::adapters::step_by::StepBy as crate::iter::traits::double_ended::DoubleEndedIterator>::try_rfold", "Argument[0]", "ReturnValue", "value", "dfc-generated"]
+      - ["lang:core", "<crate::iter::adapters::step_by::StepBy as crate::iter::traits::iterator::Iterator>::fold", "Argument[0]", "ReturnValue", "value", "dfc-generated"]
+      - ["lang:core", "<crate::iter::adapters::step_by::StepBy as crate::iter::traits::iterator::Iterator>::fold", "Argument[1].ReturnValue", "ReturnValue", "value", "dfc-generated"]
+      - ["lang:core", "<crate::iter::adapters::step_by::StepBy as crate::iter::traits::iterator::Iterator>::fold", "Argument[self].Field[crate::iter::adapters::step_by::StepBy::iter].Element", "Argument[1].Parameter[1]", "value", "dfc-generated"]
+      - ["lang:core", "<crate::iter::adapters::step_by::StepBy as crate::iter::traits::iterator::Iterator>::next", "Argument[self].Field[crate::iter::adapters::step_by::StepBy::iter].Element", "ReturnValue.Field[crate::option::Option::Some(0)]", "value", "dfc-generated"]
+      - ["lang:core", "<crate::iter::adapters::step_by::StepBy as crate::iter::traits::iterator::Iterator>::nth", "Argument[self].Field[crate::iter::adapters::step_by::StepBy::iter].Element", "ReturnValue.Field[crate::option::Option::Some(0)]", "value", "dfc-generated"]
+      - ["lang:core", "<crate::iter::adapters::step_by::StepBy as crate::iter::traits::iterator::Iterator>::try_fold", "Argument[0]", "ReturnValue", "value", "dfc-generated"]
+      - ["lang:core", "<crate::iter::adapters::step_by::StepBy as crate::iter::traits::iterator::Iterator>::try_fold", "Argument[self].Field[crate::iter::adapters::step_by::StepBy::iter].Element", "Argument[1].Parameter[1]", "value", "dfc-generated"]
       - ["lang:core", "<crate::iter::adapters::step_by::StepBy>::new", "Argument[1]", "ReturnValue", "taint", "df-generated"]
       - ["lang:core", "<crate::iter::adapters::take::Take as crate::iter::adapters::take::SpecTake>::spec_fold", "Argument[0].Field[0]", "ReturnValue", "value", "dfc-generated"]
       - ["lang:core", "<crate::iter::adapters::take::Take as crate::iter::adapters::take::SpecTake>::spec_fold", "Argument[0]", "ReturnValue", "value", "dfc-generated"]
       - ["lang:core", "<crate::iter::adapters::take::Take as crate::iter::adapters::take::SpecTake>::spec_fold", "Argument[1].ReturnValue", "Argument[1].Parameter[0]", "value", "dfc-generated"]
       - ["lang:core", "<crate::iter::adapters::take::Take as crate::iter::adapters::take::SpecTake>::spec_fold", "Argument[1].ReturnValue", "ReturnValue", "value", "dfc-generated"]
-      - ["lang:core", "<crate::iter::adapters::take::Take as crate::iter::traits::double_ended::DoubleEndedIterator>::advance_back_by", "Argument[0]", "ReturnValue", "taint", "df-generated"]
-      - ["lang:core", "<crate::iter::adapters::take::Take as crate::iter::traits::double_ended::DoubleEndedIterator>::nth_back", "Argument[self].Element", "ReturnValue.Field[crate::option::Option::Some(0)]", "value", "dfc-generated"]
+      - ["lang:core", "<crate::iter::adapters::take::Take as crate::iter::traits::double_ended::DoubleEndedIterator>::next_back", "Argument[self].Field[crate::iter::adapters::take::Take::iter].Element", "ReturnValue.Field[crate::option::Option::Some(0)]", "value", "dfc-generated"]
+      - ["lang:core", "<crate::iter::adapters::take::Take as crate::iter::traits::double_ended::DoubleEndedIterator>::nth_back", "Argument[self].Field[crate::iter::adapters::take::Take::iter].Element", "ReturnValue.Field[crate::option::Option::Some(0)]", "value", "dfc-generated"]
       - ["lang:core", "<crate::iter::adapters::take::Take as crate::iter::traits::double_ended::DoubleEndedIterator>::rfold", "Argument[0]", "ReturnValue", "value", "dfc-generated"]
       - ["lang:core", "<crate::iter::adapters::take::Take as crate::iter::traits::double_ended::DoubleEndedIterator>::rfold", "Argument[1].ReturnValue", "ReturnValue", "value", "dfc-generated"]
       - ["lang:core", "<crate::iter::adapters::take::Take as crate::iter::traits::double_ended::DoubleEndedIterator>::try_rfold", "Argument[0]", "ReturnValue", "value", "dfc-generated"]
@@ -599,32 +961,39 @@ extensions:
       - ["lang:core", "<crate::iter::adapters::zip::Zip as crate::iter::adapters::zip::ZipImpl>::new", "Argument[0]", "ReturnValue.Field[crate::iter::adapters::zip::Zip::a]", "value", "dfc-generated"]
       - ["lang:core", "<crate::iter::adapters::zip::Zip as crate::iter::adapters::zip::ZipImpl>::new", "Argument[1]", "ReturnValue.Field[crate::iter::adapters::zip::Zip::b]", "value", "dfc-generated"]
       - ["lang:core", "<crate::iter::adapters::zip::Zip as crate::iter::adapters::zip::ZipImpl>::size_hint", "Argument[self]", "ReturnValue", "taint", "df-generated"]
+      - ["lang:core", "<crate::iter::adapters::zip::Zip as crate::iter::traits::iterator::Iterator>::fold", "Argument[0]", "ReturnValue", "value", "dfc-generated"]
+      - ["lang:core", "<crate::iter::adapters::zip::Zip as crate::iter::traits::iterator::Iterator>::fold", "Argument[1].ReturnValue", "ReturnValue", "value", "dfc-generated"]
       - ["lang:core", "<crate::iter::sources::from_fn::FromFn as crate::iter::traits::iterator::Iterator>::next", "Argument[self]", "ReturnValue", "taint", "df-generated"]
-      - ["lang:core", "<crate::iter::sources::once_with::OnceWith as crate::iter::traits::iterator::Iterator>::next", "Argument[self].Field[crate::iter::sources::once_with::OnceWith::make].Field[crate::option::Option::Some(0)]", "ReturnValue", "value", "dfc-generated"]
-      - ["lang:core", "<crate::iter::sources::once_with::OnceWith as crate::iter::traits::iterator::Iterator>::next", "Argument[self].Field[crate::iter::sources::once_with::OnceWith::make].Field[crate::result::Result::Ok(0)]", "ReturnValue", "value", "dfc-generated"]
       - ["lang:core", "<crate::iter::sources::repeat::Repeat as crate::iter::traits::double_ended::DoubleEndedIterator>::next_back", "Argument[self].Field[crate::iter::sources::repeat::Repeat::element].Reference", "ReturnValue.Field[crate::option::Option::Some(0)]", "value", "dfc-generated"]
-      - ["lang:core", "<crate::iter::sources::repeat::Repeat as crate::iter::traits::double_ended::DoubleEndedIterator>::next_back", "Argument[self].Field[crate::iter::sources::repeat::Repeat::element]", "ReturnValue.Field[crate::option::Option::Some(0)].Reference", "value", "dfc-generated"]
       - ["lang:core", "<crate::iter::sources::repeat::Repeat as crate::iter::traits::double_ended::DoubleEndedIterator>::next_back", "Argument[self].Field[crate::iter::sources::repeat::Repeat::element]", "ReturnValue.Field[crate::option::Option::Some(0)]", "value", "dfc-generated"]
       - ["lang:core", "<crate::iter::sources::repeat::Repeat as crate::iter::traits::double_ended::DoubleEndedIterator>::nth_back", "Argument[self].Field[crate::iter::sources::repeat::Repeat::element].Reference", "ReturnValue.Field[crate::option::Option::Some(0)]", "value", "dfc-generated"]
-      - ["lang:core", "<crate::iter::sources::repeat::Repeat as crate::iter::traits::double_ended::DoubleEndedIterator>::nth_back", "Argument[self].Field[crate::iter::sources::repeat::Repeat::element]", "ReturnValue.Field[crate::option::Option::Some(0)].Reference", "value", "dfc-generated"]
       - ["lang:core", "<crate::iter::sources::repeat::Repeat as crate::iter::traits::double_ended::DoubleEndedIterator>::nth_back", "Argument[self].Field[crate::iter::sources::repeat::Repeat::element]", "ReturnValue.Field[crate::option::Option::Some(0)]", "value", "dfc-generated"]
       - ["lang:core", "<crate::iter::sources::repeat::Repeat as crate::iter::traits::iterator::Iterator>::next", "Argument[self].Field[crate::iter::sources::repeat::Repeat::element].Reference", "ReturnValue.Field[crate::option::Option::Some(0)]", "value", "dfc-generated"]
-      - ["lang:core", "<crate::iter::sources::repeat::Repeat as crate::iter::traits::iterator::Iterator>::next", "Argument[self].Field[crate::iter::sources::repeat::Repeat::element]", "ReturnValue.Field[crate::option::Option::Some(0)].Reference", "value", "dfc-generated"]
       - ["lang:core", "<crate::iter::sources::repeat::Repeat as crate::iter::traits::iterator::Iterator>::next", "Argument[self].Field[crate::iter::sources::repeat::Repeat::element]", "ReturnValue.Field[crate::option::Option::Some(0)]", "value", "dfc-generated"]
       - ["lang:core", "<crate::iter::sources::repeat::Repeat as crate::iter::traits::iterator::Iterator>::nth", "Argument[self].Field[crate::iter::sources::repeat::Repeat::element].Reference", "ReturnValue.Field[crate::option::Option::Some(0)]", "value", "dfc-generated"]
-      - ["lang:core", "<crate::iter::sources::repeat::Repeat as crate::iter::traits::iterator::Iterator>::nth", "Argument[self].Field[crate::iter::sources::repeat::Repeat::element]", "ReturnValue.Field[crate::option::Option::Some(0)].Reference", "value", "dfc-generated"]
       - ["lang:core", "<crate::iter::sources::repeat::Repeat as crate::iter::traits::iterator::Iterator>::nth", "Argument[self].Field[crate::iter::sources::repeat::Repeat::element]", "ReturnValue.Field[crate::option::Option::Some(0)]", "value", "dfc-generated"]
       - ["lang:core", "<crate::iter::sources::repeat_n::RepeatN as crate::clone::Clone>::clone", "Argument[self].Field[crate::iter::sources::repeat_n::RepeatN::count]", "ReturnValue.Field[crate::iter::sources::repeat_n::RepeatN::count]", "value", "dfc-generated"]
+      - ["lang:core", "<crate::iter::sources::repeat_n::RepeatN as crate::iter::traits::double_ended::DoubleEndedIterator>::advance_back_by", "Argument[0]", "Argument[self]", "taint", "df-generated"]
       - ["lang:core", "<crate::iter::sources::repeat_n::RepeatN as crate::iter::traits::double_ended::DoubleEndedIterator>::advance_back_by", "Argument[0]", "ReturnValue", "taint", "df-generated"]
+      - ["lang:core", "<crate::iter::sources::repeat_n::RepeatN as crate::iter::traits::double_ended::DoubleEndedIterator>::advance_back_by", "Argument[self]", "ReturnValue", "taint", "df-generated"]
       - ["lang:core", "<crate::iter::sources::repeat_n::RepeatN as crate::iter::traits::double_ended::DoubleEndedIterator>::nth_back", "Argument[self].Element", "ReturnValue.Field[crate::option::Option::Some(0)]", "value", "dfc-generated"]
+      - ["lang:core", "<crate::iter::sources::repeat_n::RepeatN as crate::iter::traits::double_ended::DoubleEndedIterator>::rfold", "Argument[0].Field[0]", "ReturnValue", "value", "dfc-generated"]
+      - ["lang:core", "<crate::iter::sources::repeat_n::RepeatN as crate::iter::traits::double_ended::DoubleEndedIterator>::try_rfold", "Argument[0]", "Argument[1].Parameter[0]", "value", "dfc-generated"]
+      - ["lang:core", "<crate::iter::sources::repeat_n::RepeatN as crate::iter::traits::double_ended::DoubleEndedIterator>::try_rfold", "Argument[0]", "ReturnValue", "value", "dfc-generated"]
+      - ["lang:core", "<crate::iter::sources::repeat_n::RepeatN as crate::iter::traits::double_ended::DoubleEndedIterator>::try_rfold", "Argument[1].ReturnValue", "ReturnValue", "value", "dfc-generated"]
       - ["lang:core", "<crate::iter::sources::repeat_n::RepeatN as crate::iter::traits::exact_size::ExactSizeIterator>::len", "Argument[self].Field[crate::iter::sources::repeat_n::RepeatN::count]", "ReturnValue", "value", "dfc-generated"]
       - ["lang:core", "<crate::iter::sources::repeat_n::RepeatN as crate::iter::traits::iterator::Iterator>::advance_by", "Argument[0]", "Argument[self]", "taint", "df-generated"]
       - ["lang:core", "<crate::iter::sources::repeat_n::RepeatN as crate::iter::traits::iterator::Iterator>::advance_by", "Argument[0]", "ReturnValue", "taint", "df-generated"]
       - ["lang:core", "<crate::iter::sources::repeat_n::RepeatN as crate::iter::traits::iterator::Iterator>::advance_by", "Argument[self]", "ReturnValue", "taint", "df-generated"]
+      - ["lang:core", "<crate::iter::sources::repeat_n::RepeatN as crate::iter::traits::iterator::Iterator>::count", "Argument[self].Field[crate::iter::sources::repeat_n::RepeatN::count]", "ReturnValue", "value", "dfc-generated"]
+      - ["lang:core", "<crate::iter::sources::repeat_n::RepeatN as crate::iter::traits::iterator::Iterator>::fold", "Argument[0].Field[0]", "ReturnValue", "value", "dfc-generated"]
+      - ["lang:core", "<crate::iter::sources::repeat_n::RepeatN as crate::iter::traits::iterator::Iterator>::size_hint", "Argument[self].Field[crate::iter::sources::repeat_n::RepeatN::count]", "ReturnValue.Field[0]", "value", "dfc-generated"]
+      - ["lang:core", "<crate::iter::sources::repeat_n::RepeatN as crate::iter::traits::iterator::Iterator>::size_hint", "Argument[self].Field[crate::iter::sources::repeat_n::RepeatN::count]", "ReturnValue.Field[1].Field[crate::option::Option::Some(0)]", "value", "dfc-generated"]
+      - ["lang:core", "<crate::iter::sources::repeat_n::RepeatN as crate::iter::traits::iterator::Iterator>::try_fold", "Argument[0]", "Argument[1].Parameter[0]", "value", "dfc-generated"]
+      - ["lang:core", "<crate::iter::sources::repeat_n::RepeatN as crate::iter::traits::iterator::Iterator>::try_fold", "Argument[0]", "ReturnValue", "value", "dfc-generated"]
       - ["lang:core", "<crate::iter::sources::repeat_with::RepeatWith as crate::iter::traits::iterator::Iterator>::next", "Argument[self]", "ReturnValue", "taint", "df-generated"]
       - ["lang:core", "<crate::iter::sources::repeat_with::RepeatWith as crate::iter::traits::iterator::Iterator>::try_fold", "Argument[1]", "ReturnValue", "taint", "df-generated"]
       - ["lang:core", "<crate::iter::sources::repeat_with::RepeatWith as crate::iter::traits::iterator::Iterator>::try_fold", "Argument[self]", "Argument[1]", "taint", "df-generated"]
-      - ["lang:core", "<crate::iter::sources::successors::Successors as crate::iter::traits::iterator::Iterator>::next", "Argument[self]", "ReturnValue", "taint", "df-generated"]
       - ["lang:core", "<crate::marker::variance::PhantomContravariant as crate::clone::Clone>::clone", "Argument[self].Reference", "ReturnValue", "value", "dfc-generated"]
       - ["lang:core", "<crate::marker::variance::PhantomCovariant as crate::clone::Clone>::clone", "Argument[self].Reference", "ReturnValue", "value", "dfc-generated"]
       - ["lang:core", "<crate::marker::variance::PhantomInvariant as crate::clone::Clone>::clone", "Argument[self].Reference", "ReturnValue", "value", "dfc-generated"]
@@ -635,6 +1004,7 @@ extensions:
       - ["lang:core", "<crate::mem::manually_drop::ManuallyDrop>::new", "Argument[0]", "ReturnValue.Field[crate::mem::manually_drop::ManuallyDrop::value]", "value", "dfc-generated"]
       - ["lang:core", "<crate::mem::manually_drop::ManuallyDrop>::take", "Argument[0].Field[crate::mem::manually_drop::ManuallyDrop::value]", "ReturnValue", "value", "dfc-generated"]
       - ["lang:core", "<crate::mem::maybe_uninit::MaybeUninit as crate::clone::Clone>::clone", "Argument[self].Reference", "ReturnValue", "value", "dfc-generated"]
+      - ["lang:core", "<crate::mem::maybe_uninit::MaybeUninit as crate::fmt::Debug>::fmt", "Argument[0]", "ReturnValue", "taint", "df-generated"]
       - ["lang:core", "<crate::mem::maybe_uninit::MaybeUninit>::as_mut_ptr", "Argument[self]", "ReturnValue", "taint", "df-generated"]
       - ["lang:core", "<crate::mem::maybe_uninit::MaybeUninit>::as_ptr", "Argument[self]", "ReturnValue", "taint", "df-generated"]
       - ["lang:core", "<crate::net::ip_addr::IpAddr as crate::convert::From>::from", "Argument[0]", "ReturnValue.Field[crate::net::ip_addr::IpAddr::V4(0)].Field[crate::net::ip_addr::Ipv4Addr::octets]", "value", "dfc-generated"]
@@ -643,6 +1013,7 @@ extensions:
       - ["lang:core", "<crate::net::ip_addr::IpAddr as crate::convert::From>::from", "Argument[0]", "ReturnValue.Field[crate::net::ip_addr::IpAddr::V6(0)]", "value", "dfc-generated"]
       - ["lang:core", "<crate::net::ip_addr::IpAddr>::to_canonical", "Argument[self].Reference", "ReturnValue", "value", "dfc-generated"]
       - ["lang:core", "<crate::net::ip_addr::Ipv4Addr as crate::convert::From>::from", "Argument[0]", "ReturnValue.Field[crate::net::ip_addr::Ipv4Addr::octets]", "value", "dfc-generated"]
+      - ["lang:core", "<crate::net::ip_addr::Ipv4Addr as crate::fmt::Display>::fmt", "Argument[0]", "ReturnValue", "taint", "df-generated"]
       - ["lang:core", "<crate::net::ip_addr::Ipv4Addr as crate::ops::bit::BitAnd>::bitand", "Argument[self]", "ReturnValue", "value", "dfc-generated"]
       - ["lang:core", "<crate::net::ip_addr::Ipv4Addr as crate::ops::bit::BitOr>::bitor", "Argument[self]", "ReturnValue", "value", "dfc-generated"]
       - ["lang:core", "<crate::net::ip_addr::Ipv4Addr as crate::ops::bit::Not>::not", "Argument[self]", "ReturnValue", "value", "dfc-generated"]
@@ -656,6 +1027,7 @@ extensions:
       - ["lang:core", "<crate::net::ip_addr::Ipv4Addr>::to_ipv6_compatible", "Argument[self].Field[crate::net::ip_addr::Ipv4Addr::octets].Element", "ReturnValue.Field[crate::net::ip_addr::Ipv6Addr::octets].Element", "value", "dfc-generated"]
       - ["lang:core", "<crate::net::ip_addr::Ipv4Addr>::to_ipv6_mapped", "Argument[self].Field[crate::net::ip_addr::Ipv4Addr::octets].Element", "ReturnValue.Field[crate::net::ip_addr::Ipv6Addr::octets].Element", "value", "dfc-generated"]
       - ["lang:core", "<crate::net::ip_addr::Ipv6Addr as crate::convert::From>::from", "Argument[0]", "ReturnValue.Field[crate::net::ip_addr::Ipv6Addr::octets]", "value", "dfc-generated"]
+      - ["lang:core", "<crate::net::ip_addr::Ipv6Addr as crate::fmt::Display>::fmt", "Argument[0]", "ReturnValue", "taint", "df-generated"]
       - ["lang:core", "<crate::net::ip_addr::Ipv6Addr as crate::ops::bit::BitAnd>::bitand", "Argument[self]", "ReturnValue", "value", "dfc-generated"]
       - ["lang:core", "<crate::net::ip_addr::Ipv6Addr as crate::ops::bit::BitOr>::bitor", "Argument[self]", "ReturnValue", "value", "dfc-generated"]
       - ["lang:core", "<crate::net::ip_addr::Ipv6Addr as crate::ops::bit::Not>::not", "Argument[self]", "ReturnValue", "value", "dfc-generated"]
@@ -672,12 +1044,14 @@ extensions:
       - ["lang:core", "<crate::net::socket_addr::SocketAddr>::new", "Argument[0].Field[crate::net::ip_addr::IpAddr::V6(0)]", "ReturnValue.Field[crate::net::socket_addr::SocketAddr::V6(0)].Field[crate::net::socket_addr::SocketAddrV6::ip]", "value", "dfc-generated"]
       - ["lang:core", "<crate::net::socket_addr::SocketAddr>::new", "Argument[1]", "ReturnValue.Field[crate::net::socket_addr::SocketAddr::V4(0)].Field[crate::net::socket_addr::SocketAddrV4::port]", "value", "dfc-generated"]
       - ["lang:core", "<crate::net::socket_addr::SocketAddr>::new", "Argument[1]", "ReturnValue.Field[crate::net::socket_addr::SocketAddr::V6(0)].Field[crate::net::socket_addr::SocketAddrV6::port]", "value", "dfc-generated"]
+      - ["lang:core", "<crate::net::socket_addr::SocketAddrV4 as crate::fmt::Display>::fmt", "Argument[0]", "ReturnValue", "taint", "df-generated"]
       - ["lang:core", "<crate::net::socket_addr::SocketAddrV4>::ip", "Argument[self].Field[crate::net::socket_addr::SocketAddrV4::ip]", "ReturnValue.Reference", "value", "dfc-generated"]
       - ["lang:core", "<crate::net::socket_addr::SocketAddrV4>::new", "Argument[0]", "ReturnValue.Field[crate::net::socket_addr::SocketAddrV4::ip]", "value", "dfc-generated"]
       - ["lang:core", "<crate::net::socket_addr::SocketAddrV4>::new", "Argument[1]", "ReturnValue.Field[crate::net::socket_addr::SocketAddrV4::port]", "value", "dfc-generated"]
       - ["lang:core", "<crate::net::socket_addr::SocketAddrV4>::port", "Argument[self].Field[crate::net::socket_addr::SocketAddrV4::port]", "ReturnValue", "value", "dfc-generated"]
       - ["lang:core", "<crate::net::socket_addr::SocketAddrV4>::set_ip", "Argument[0]", "Argument[self].Field[crate::net::socket_addr::SocketAddrV4::ip]", "value", "dfc-generated"]
       - ["lang:core", "<crate::net::socket_addr::SocketAddrV4>::set_port", "Argument[0]", "Argument[self].Field[crate::net::socket_addr::SocketAddrV4::port]", "value", "dfc-generated"]
+      - ["lang:core", "<crate::net::socket_addr::SocketAddrV6 as crate::fmt::Display>::fmt", "Argument[0]", "ReturnValue", "taint", "df-generated"]
       - ["lang:core", "<crate::net::socket_addr::SocketAddrV6>::flowinfo", "Argument[self].Field[crate::net::socket_addr::SocketAddrV6::flowinfo]", "ReturnValue", "value", "dfc-generated"]
       - ["lang:core", "<crate::net::socket_addr::SocketAddrV6>::ip", "Argument[self].Field[crate::net::socket_addr::SocketAddrV6::ip]", "ReturnValue.Reference", "value", "dfc-generated"]
       - ["lang:core", "<crate::net::socket_addr::SocketAddrV6>::new", "Argument[0]", "ReturnValue.Field[crate::net::socket_addr::SocketAddrV6::ip]", "value", "dfc-generated"]
@@ -738,15 +1112,18 @@ extensions:
       - ["lang:core", "<crate::num::bignum::tests::Big8x3>::sub", "Argument[0].Field[crate::num::bignum::tests::Big8x3::size]", "ReturnValue.Field[crate::num::bignum::tests::Big8x3::size]", "value", "dfc-generated"]
       - ["lang:core", "<crate::num::bignum::tests::Big8x3>::sub", "Argument[self].Field[crate::num::bignum::tests::Big8x3::size]", "ReturnValue.Field[crate::num::bignum::tests::Big8x3::size]", "value", "dfc-generated"]
       - ["lang:core", "<crate::num::bignum::tests::Big8x3>::sub", "Argument[self]", "ReturnValue", "value", "dfc-generated"]
-      - ["lang:core", "<crate::num::dec2flt::common::BiasedFp>::zero_pow2", "Argument[0]", "ReturnValue.Field[crate::num::dec2flt::common::BiasedFp::e]", "value", "dfc-generated"]
-      - ["lang:core", "<crate::num::dec2flt::decimal::Decimal>::right_shift", "Argument[0]", "Argument[self]", "taint", "df-generated"]
-      - ["lang:core", "<crate::num::dec2flt::decimal::Decimal>::try_add_digit", "Argument[0]", "Argument[self].Field[crate::num::dec2flt::decimal::Decimal::digits].Element", "value", "dfc-generated"]
+      - ["lang:core", "<crate::num::dec2flt::ParseFloatError as crate::fmt::Display>::fmt", "Argument[0]", "ReturnValue", "taint", "df-generated"]
+      - ["lang:core", "<crate::num::dec2flt::common::BiasedFp>::zero_pow2", "Argument[0]", "ReturnValue.Field[crate::num::dec2flt::common::BiasedFp::p_biased]", "value", "dfc-generated"]
+      - ["lang:core", "<crate::num::dec2flt::decimal_seq::DecimalSeq>::right_shift", "Argument[0]", "Argument[self]", "taint", "df-generated"]
+      - ["lang:core", "<crate::num::dec2flt::decimal_seq::DecimalSeq>::try_add_digit", "Argument[0]", "Argument[self].Field[crate::num::dec2flt::decimal_seq::DecimalSeq::digits].Element", "value", "dfc-generated"]
       - ["lang:core", "<crate::num::diy_float::Fp>::mul", "Argument[0]", "ReturnValue", "taint", "df-generated"]
       - ["lang:core", "<crate::num::diy_float::Fp>::mul", "Argument[self]", "ReturnValue", "taint", "df-generated"]
       - ["lang:core", "<crate::num::diy_float::Fp>::normalize", "Argument[self].Field[crate::num::diy_float::Fp::e]", "ReturnValue.Field[crate::num::diy_float::Fp::e]", "value", "dfc-generated"]
       - ["lang:core", "<crate::num::diy_float::Fp>::normalize", "Argument[self].Field[crate::num::diy_float::Fp::f]", "ReturnValue.Field[crate::num::diy_float::Fp::f]", "value", "dfc-generated"]
       - ["lang:core", "<crate::num::diy_float::Fp>::normalize_to", "Argument[0]", "ReturnValue.Field[crate::num::diy_float::Fp::e]", "value", "dfc-generated"]
+      - ["lang:core", "<crate::num::error::ParseIntError as crate::fmt::Display>::fmt", "Argument[0]", "ReturnValue", "taint", "df-generated"]
       - ["lang:core", "<crate::num::error::ParseIntError>::kind", "Argument[self].Field[crate::num::error::ParseIntError::kind]", "ReturnValue.Reference", "value", "dfc-generated"]
+      - ["lang:core", "<crate::num::error::TryFromIntError as crate::fmt::Display>::fmt", "Argument[0]", "ReturnValue", "taint", "df-generated"]
       - ["lang:core", "<crate::num::fmt::Part>::len", "Argument[self].Reference.Field[crate::num::fmt::Part::Zero(0)]", "ReturnValue", "value", "dfc-generated"]
       - ["lang:core", "<crate::num::fmt::Part>::write", "Argument[self].Reference.Field[crate::num::fmt::Part::Zero(0)]", "ReturnValue.Field[crate::option::Option::Some(0)]", "value", "dfc-generated"]
       - ["lang:core", "<crate::num::niche_types::I32NotAllOnes>::new", "Argument[0]", "ReturnValue.Field[crate::option::Option::Some(0)].Field[crate::num::niche_types::I32NotAllOnes(0)]", "value", "dfc-generated"]
@@ -792,6 +1169,8 @@ extensions:
       - ["lang:core", "<crate::num::saturating::Saturating as crate::ops::arith::AddAssign>::add_assign", "Argument[0]", "Argument[self]", "taint", "df-generated"]
       - ["lang:core", "<crate::num::saturating::Saturating as crate::ops::arith::DivAssign>::div_assign", "Argument[0]", "Argument[self]", "taint", "df-generated"]
       - ["lang:core", "<crate::num::saturating::Saturating as crate::ops::arith::MulAssign>::mul_assign", "Argument[0]", "Argument[self]", "taint", "df-generated"]
+      - ["lang:core", "<crate::num::saturating::Saturating as crate::ops::arith::Rem>::rem", "Argument[0]", "ReturnValue", "taint", "df-generated"]
+      - ["lang:core", "<crate::num::saturating::Saturating as crate::ops::arith::Rem>::rem", "Argument[self]", "ReturnValue", "taint", "df-generated"]
       - ["lang:core", "<crate::num::saturating::Saturating as crate::ops::arith::RemAssign>::rem_assign", "Argument[0]", "Argument[self]", "taint", "df-generated"]
       - ["lang:core", "<crate::num::saturating::Saturating as crate::ops::arith::SubAssign>::sub_assign", "Argument[0]", "Argument[self]", "taint", "df-generated"]
       - ["lang:core", "<crate::num::saturating::Saturating as crate::ops::bit::BitAnd>::bitand", "Argument[0]", "ReturnValue", "taint", "df-generated"]
@@ -804,10 +1183,16 @@ extensions:
       - ["lang:core", "<crate::num::saturating::Saturating as crate::ops::bit::BitXor>::bitxor", "Argument[self]", "ReturnValue", "taint", "df-generated"]
       - ["lang:core", "<crate::num::saturating::Saturating as crate::ops::bit::BitXorAssign>::bitxor_assign", "Argument[0]", "Argument[self]", "taint", "df-generated"]
       - ["lang:core", "<crate::num::saturating::Saturating as crate::ops::bit::Not>::not", "Argument[self]", "ReturnValue", "taint", "df-generated"]
+      - ["lang:core", "<crate::num::saturating::Saturating>::abs", "Argument[self].Field[0]", "ReturnValue.Field[crate::num::saturating::Saturating(0)]", "value", "dfc-generated"]
+      - ["lang:core", "<crate::num::saturating::Saturating>::abs", "Argument[self].Field[crate::num::saturating::Saturating(0)]", "ReturnValue.Field[crate::num::saturating::Saturating(0)]", "value", "dfc-generated"]
       - ["lang:core", "<crate::num::wrapping::Wrapping as crate::ops::arith::AddAssign>::add_assign", "Argument[0]", "Argument[self]", "taint", "df-generated"]
+      - ["lang:core", "<crate::num::wrapping::Wrapping as crate::ops::arith::Div>::div", "Argument[0]", "ReturnValue", "taint", "df-generated"]
+      - ["lang:core", "<crate::num::wrapping::Wrapping as crate::ops::arith::Div>::div", "Argument[self]", "ReturnValue", "taint", "df-generated"]
       - ["lang:core", "<crate::num::wrapping::Wrapping as crate::ops::arith::DivAssign>::div_assign", "Argument[0]", "Argument[self]", "taint", "df-generated"]
       - ["lang:core", "<crate::num::wrapping::Wrapping as crate::ops::arith::MulAssign>::mul_assign", "Argument[0]", "Argument[self]", "taint", "df-generated"]
       - ["lang:core", "<crate::num::wrapping::Wrapping as crate::ops::arith::Neg>::neg", "Argument[self]", "ReturnValue", "taint", "df-generated"]
+      - ["lang:core", "<crate::num::wrapping::Wrapping as crate::ops::arith::Rem>::rem", "Argument[0]", "ReturnValue", "taint", "df-generated"]
+      - ["lang:core", "<crate::num::wrapping::Wrapping as crate::ops::arith::Rem>::rem", "Argument[self]", "ReturnValue", "taint", "df-generated"]
       - ["lang:core", "<crate::num::wrapping::Wrapping as crate::ops::arith::RemAssign>::rem_assign", "Argument[0]", "Argument[self]", "taint", "df-generated"]
       - ["lang:core", "<crate::num::wrapping::Wrapping as crate::ops::arith::SubAssign>::sub_assign", "Argument[0]", "Argument[self]", "taint", "df-generated"]
       - ["lang:core", "<crate::num::wrapping::Wrapping as crate::ops::bit::BitAnd>::bitand", "Argument[0]", "ReturnValue", "taint", "df-generated"]
@@ -822,6 +1207,8 @@ extensions:
       - ["lang:core", "<crate::num::wrapping::Wrapping as crate::ops::bit::Not>::not", "Argument[self]", "ReturnValue", "taint", "df-generated"]
       - ["lang:core", "<crate::num::wrapping::Wrapping as crate::ops::bit::ShlAssign>::shl_assign", "Argument[0]", "Argument[self]", "taint", "df-generated"]
       - ["lang:core", "<crate::num::wrapping::Wrapping as crate::ops::bit::ShrAssign>::shr_assign", "Argument[0]", "Argument[self]", "taint", "df-generated"]
+      - ["lang:core", "<crate::num::wrapping::Wrapping>::abs", "Argument[self].Field[0]", "ReturnValue.Field[crate::num::wrapping::Wrapping(0)]", "value", "dfc-generated"]
+      - ["lang:core", "<crate::num::wrapping::Wrapping>::abs", "Argument[self].Field[crate::num::wrapping::Wrapping(0)]", "ReturnValue.Field[crate::num::wrapping::Wrapping(0)]", "value", "dfc-generated"]
       - ["lang:core", "<crate::ops::control_flow::ControlFlow as crate::ops::try_trait::FromResidual>::from_residual", "Argument[0].Field[crate::ops::control_flow::ControlFlow::Break(0)]", "ReturnValue.Field[crate::ops::control_flow::ControlFlow::Break(0)]", "value", "dfc-generated"]
       - ["lang:core", "<crate::ops::control_flow::ControlFlow as crate::ops::try_trait::Try>::branch", "Argument[self].Field[crate::ops::control_flow::ControlFlow::Break(0)]", "ReturnValue.Field[crate::ops::control_flow::ControlFlow::Break(0)].Field[crate::ops::control_flow::ControlFlow::Break(0)]", "value", "dfc-generated"]
       - ["lang:core", "<crate::ops::control_flow::ControlFlow as crate::ops::try_trait::Try>::branch", "Argument[self].Field[crate::ops::control_flow::ControlFlow::Continue(0)]", "ReturnValue.Field[crate::ops::control_flow::ControlFlow::Continue(0)]", "value", "dfc-generated"]
@@ -853,7 +1240,8 @@ extensions:
       - ["lang:core", "<crate::ops::range::Bound>::as_mut", "Argument[self].Reference.Field[crate::ops::range::Bound::Included(0)]", "ReturnValue.Field[crate::ops::range::Bound::Included(0)].Reference", "value", "dfc-generated"]
       - ["lang:core", "<crate::ops::range::Bound>::as_ref", "Argument[self].Reference.Field[crate::ops::range::Bound::Excluded(0)]", "ReturnValue.Field[crate::ops::range::Bound::Excluded(0)].Reference", "value", "dfc-generated"]
       - ["lang:core", "<crate::ops::range::Bound>::as_ref", "Argument[self].Reference.Field[crate::ops::range::Bound::Included(0)]", "ReturnValue.Field[crate::ops::range::Bound::Included(0)].Reference", "value", "dfc-generated"]
-      - ["lang:core", "<crate::ops::range::Bound>::cloned", "Argument[self]", "ReturnValue", "taint", "df-generated"]
+      - ["lang:core", "<crate::ops::range::Bound>::cloned", "Argument[self].Field[crate::ops::range::Bound::Excluded(0)].Reference", "ReturnValue.Field[crate::ops::range::Bound::Excluded(0)]", "value", "dfc-generated"]
+      - ["lang:core", "<crate::ops::range::Bound>::cloned", "Argument[self].Field[crate::ops::range::Bound::Included(0)].Reference", "ReturnValue.Field[crate::ops::range::Bound::Included(0)]", "value", "dfc-generated"]
       - ["lang:core", "<crate::ops::range::Bound>::map", "Argument[0].ReturnValue", "ReturnValue.Field[crate::ops::range::Bound::Excluded(0)]", "value", "dfc-generated"]
       - ["lang:core", "<crate::ops::range::Bound>::map", "Argument[0].ReturnValue", "ReturnValue.Field[crate::ops::range::Bound::Included(0)]", "value", "dfc-generated"]
       - ["lang:core", "<crate::ops::range::Bound>::map", "Argument[self].Field[crate::ops::range::Bound::Excluded(0)]", "Argument[0].Parameter[0]", "value", "dfc-generated"]
@@ -863,14 +1251,22 @@ extensions:
       - ["lang:core", "<crate::ops::range::Range as crate::iter::adapters::step_by::SpecRangeSetup>::setup", "Argument[0]", "ReturnValue", "value", "dfc-generated"]
       - ["lang:core", "<crate::ops::range::Range as crate::iter::range::RangeIteratorImpl>::spec_next", "Argument[self].Field[crate::ops::range::Range::start]", "ReturnValue.Field[crate::option::Option::Some(0)]", "value", "dfc-generated"]
       - ["lang:core", "<crate::ops::range::Range as crate::iter::range::RangeIteratorImpl>::spec_next_back", "Argument[self].Field[crate::ops::range::Range::end].Reference", "ReturnValue.Field[crate::option::Option::Some(0)]", "value", "dfc-generated"]
-      - ["lang:core", "<crate::ops::range::Range as crate::iter::range::RangeIteratorImpl>::spec_next_back", "Argument[self].Field[crate::ops::range::Range::end]", "ReturnValue.Field[crate::option::Option::Some(0)].Reference", "value", "dfc-generated"]
       - ["lang:core", "<crate::ops::range::Range as crate::iter::range::RangeIteratorImpl>::spec_next_back", "Argument[self].Field[crate::ops::range::Range::end]", "ReturnValue.Field[crate::option::Option::Some(0)]", "value", "dfc-generated"]
       - ["lang:core", "<crate::ops::range::Range as crate::iter::range::RangeIteratorImpl>::spec_nth", "Argument[self].Field[crate::ops::range::Range::end].Reference", "Argument[self].Field[crate::ops::range::Range::start]", "value", "dfc-generated"]
-      - ["lang:core", "<crate::ops::range::Range as crate::iter::range::RangeIteratorImpl>::spec_nth", "Argument[self].Field[crate::ops::range::Range::end]", "Argument[self].Field[crate::ops::range::Range::start].Reference", "value", "dfc-generated"]
       - ["lang:core", "<crate::ops::range::Range as crate::iter::range::RangeIteratorImpl>::spec_nth", "Argument[self].Field[crate::ops::range::Range::end]", "Argument[self].Field[crate::ops::range::Range::start]", "value", "dfc-generated"]
       - ["lang:core", "<crate::ops::range::Range as crate::iter::range::RangeIteratorImpl>::spec_nth_back", "Argument[self].Field[crate::ops::range::Range::end]", "ReturnValue.Field[crate::option::Option::Some(0)]", "value", "dfc-generated"]
       - ["lang:core", "<crate::ops::range::Range as crate::iter::range::RangeIteratorImpl>::spec_nth_back", "Argument[self].Field[crate::ops::range::Range::start]", "Argument[self].Field[crate::ops::range::Range::end]", "value", "dfc-generated"]
       - ["lang:core", "<crate::ops::range::Range as crate::iter::range::RangeIteratorImpl>::spec_nth_back", "Argument[self]", "ReturnValue", "taint", "df-generated"]
+      - ["lang:core", "<crate::ops::range::Range as crate::iter::traits::double_ended::DoubleEndedIterator>::next_back", "Argument[self].Field[crate::ops::range::Range::end].Reference", "ReturnValue.Field[crate::option::Option::Some(0)]", "value", "dfc-generated"]
+      - ["lang:core", "<crate::ops::range::Range as crate::iter::traits::double_ended::DoubleEndedIterator>::next_back", "Argument[self].Field[crate::ops::range::Range::end]", "ReturnValue.Field[crate::option::Option::Some(0)]", "value", "dfc-generated"]
+      - ["lang:core", "<crate::ops::range::Range as crate::iter::traits::double_ended::DoubleEndedIterator>::nth_back", "Argument[self].Field[crate::ops::range::Range::end].Reference", "ReturnValue.Field[crate::option::Option::Some(0)]", "value", "dfc-generated"]
+      - ["lang:core", "<crate::ops::range::Range as crate::iter::traits::double_ended::DoubleEndedIterator>::nth_back", "Argument[self].Field[crate::ops::range::Range::end]", "ReturnValue.Field[crate::option::Option::Some(0)]", "value", "dfc-generated"]
+      - ["lang:core", "<crate::ops::range::Range as crate::iter::traits::iterator::Iterator>::last", "Argument[self].Field[crate::ops::range::Range::end].Reference", "ReturnValue.Field[crate::option::Option::Some(0)]", "value", "dfc-generated"]
+      - ["lang:core", "<crate::ops::range::Range as crate::iter::traits::iterator::Iterator>::last", "Argument[self].Field[crate::ops::range::Range::end]", "ReturnValue.Field[crate::option::Option::Some(0)]", "value", "dfc-generated"]
+      - ["lang:core", "<crate::ops::range::Range as crate::iter::traits::iterator::Iterator>::max", "Argument[self].Field[crate::ops::range::Range::end].Reference", "ReturnValue.Field[crate::option::Option::Some(0)]", "value", "dfc-generated"]
+      - ["lang:core", "<crate::ops::range::Range as crate::iter::traits::iterator::Iterator>::max", "Argument[self].Field[crate::ops::range::Range::end]", "ReturnValue.Field[crate::option::Option::Some(0)]", "value", "dfc-generated"]
+      - ["lang:core", "<crate::ops::range::Range as crate::iter::traits::iterator::Iterator>::min", "Argument[self].Field[crate::ops::range::Range::start]", "ReturnValue.Field[crate::option::Option::Some(0)]", "value", "dfc-generated"]
+      - ["lang:core", "<crate::ops::range::Range as crate::iter::traits::iterator::Iterator>::next", "Argument[self].Field[crate::ops::range::Range::start]", "ReturnValue.Field[crate::option::Option::Some(0)]", "value", "dfc-generated"]
       - ["lang:core", "<crate::ops::range::Range as crate::ops::range::IntoBounds>::into_bounds", "Argument[self].Field[crate::ops::range::Range::end]", "ReturnValue.Field[1].Field[crate::ops::range::Bound::Excluded(0)]", "value", "dfc-generated"]
       - ["lang:core", "<crate::ops::range::Range as crate::ops::range::IntoBounds>::into_bounds", "Argument[self].Field[crate::ops::range::Range::start]", "ReturnValue.Field[0].Field[crate::ops::range::Bound::Included(0)]", "value", "dfc-generated"]
       - ["lang:core", "<crate::ops::range::Range as crate::ops::range::RangeBounds>::end_bound", "Argument[self].Field[crate::ops::range::Range::end]", "ReturnValue.Field[crate::ops::range::Bound::Excluded(0)].Reference", "value", "dfc-generated"]
@@ -878,7 +1274,6 @@ extensions:
       - ["lang:core", "<crate::ops::range::Range as crate::ops::range::RangeBounds>::start_bound", "Argument[self].Field[crate::ops::range::Range::start]", "ReturnValue.Field[crate::ops::range::Bound::Included(0)].Reference", "value", "dfc-generated"]
       - ["lang:core", "<crate::ops::range::Range as crate::ops::range::RangeBounds>::start_bound", "Argument[self].Field[crate::ops::range::Range::start]", "ReturnValue.Field[crate::ops::range::Bound::Included(0)]", "value", "dfc-generated"]
       - ["lang:core", "<crate::ops::range::RangeFrom as crate::convert::From>::from", "Argument[0].Field[crate::range::RangeFrom::start]", "ReturnValue.Field[crate::ops::range::RangeFrom::start]", "value", "dfc-generated"]
-      - ["lang:core", "<crate::ops::range::RangeFrom as crate::iter::traits::iterator::Iterator>::next", "Argument[self].Field[crate::ops::range::RangeFrom::start]", "ReturnValue.Field[crate::option::Option::Some(0)]", "value", "dfc-generated"]
       - ["lang:core", "<crate::ops::range::RangeFrom as crate::ops::range::IntoBounds>::into_bounds", "Argument[self].Field[crate::ops::range::RangeFrom::start]", "ReturnValue.Field[0].Field[crate::ops::range::Bound::Included(0)]", "value", "dfc-generated"]
       - ["lang:core", "<crate::ops::range::RangeFrom as crate::ops::range::OneSidedRange>::bound", "Argument[self].Field[crate::ops::range::RangeFrom::start]", "ReturnValue.Field[1]", "value", "dfc-generated"]
       - ["lang:core", "<crate::ops::range::RangeFrom as crate::ops::range::RangeBounds>::start_bound", "Argument[self].Field[crate::ops::range::RangeFrom::start]", "ReturnValue.Field[crate::ops::range::Bound::Included(0)].Reference", "value", "dfc-generated"]
@@ -890,24 +1285,29 @@ extensions:
       - ["lang:core", "<crate::ops::range::RangeFull as crate::slice::index::SliceIndex>::index", "Argument[0]", "ReturnValue", "value", "dfc-generated"]
       - ["lang:core", "<crate::ops::range::RangeFull as crate::slice::index::SliceIndex>::index_mut", "Argument[0]", "ReturnValue", "value", "dfc-generated"]
       - ["lang:core", "<crate::ops::range::RangeInclusive as crate::iter::range::RangeInclusiveIteratorImpl>::spec_next", "Argument[self].Field[crate::ops::range::RangeInclusive::start].Reference", "ReturnValue.Field[crate::option::Option::Some(0)]", "value", "dfc-generated"]
-      - ["lang:core", "<crate::ops::range::RangeInclusive as crate::iter::range::RangeInclusiveIteratorImpl>::spec_next", "Argument[self].Field[crate::ops::range::RangeInclusive::start]", "ReturnValue.Field[crate::option::Option::Some(0)].Reference", "value", "dfc-generated"]
       - ["lang:core", "<crate::ops::range::RangeInclusive as crate::iter::range::RangeInclusiveIteratorImpl>::spec_next", "Argument[self].Field[crate::ops::range::RangeInclusive::start]", "ReturnValue.Field[crate::option::Option::Some(0)]", "value", "dfc-generated"]
       - ["lang:core", "<crate::ops::range::RangeInclusive as crate::iter::range::RangeInclusiveIteratorImpl>::spec_next_back", "Argument[self].Field[crate::ops::range::RangeInclusive::end].Reference", "ReturnValue.Field[crate::option::Option::Some(0)]", "value", "dfc-generated"]
-      - ["lang:core", "<crate::ops::range::RangeInclusive as crate::iter::range::RangeInclusiveIteratorImpl>::spec_next_back", "Argument[self].Field[crate::ops::range::RangeInclusive::end]", "ReturnValue.Field[crate::option::Option::Some(0)].Reference", "value", "dfc-generated"]
       - ["lang:core", "<crate::ops::range::RangeInclusive as crate::iter::range::RangeInclusiveIteratorImpl>::spec_next_back", "Argument[self].Field[crate::ops::range::RangeInclusive::end]", "ReturnValue.Field[crate::option::Option::Some(0)]", "value", "dfc-generated"]
       - ["lang:core", "<crate::ops::range::RangeInclusive as crate::iter::range::RangeInclusiveIteratorImpl>::spec_try_fold", "Argument[0]", "ReturnValue", "value", "dfc-generated"]
-      - ["lang:core", "<crate::ops::range::RangeInclusive as crate::iter::range::RangeInclusiveIteratorImpl>::spec_try_fold", "Argument[self].Field[crate::ops::range::RangeInclusive::start].Reference", "Argument[1].Parameter[1]", "value", "dfc-generated"]
-      - ["lang:core", "<crate::ops::range::RangeInclusive as crate::iter::range::RangeInclusiveIteratorImpl>::spec_try_fold", "Argument[self].Field[crate::ops::range::RangeInclusive::start]", "Argument[1].Parameter[1].Reference", "value", "dfc-generated"]
       - ["lang:core", "<crate::ops::range::RangeInclusive as crate::iter::range::RangeInclusiveIteratorImpl>::spec_try_fold", "Argument[self].Field[crate::ops::range::RangeInclusive::start]", "Argument[1].Parameter[1]", "value", "dfc-generated"]
       - ["lang:core", "<crate::ops::range::RangeInclusive as crate::iter::range::RangeInclusiveIteratorImpl>::spec_try_rfold", "Argument[0]", "ReturnValue", "value", "dfc-generated"]
-      - ["lang:core", "<crate::ops::range::RangeInclusive as crate::iter::range::RangeInclusiveIteratorImpl>::spec_try_rfold", "Argument[self].Field[crate::ops::range::RangeInclusive::end]", "Argument[1].Parameter[1]", "value", "dfc-generated"]
       - ["lang:core", "<crate::ops::range::RangeInclusive as crate::iter::range::RangeInclusiveIteratorImpl>::spec_try_rfold", "Argument[self].Field[crate::ops::range::RangeInclusive::start]", "Argument[1].Parameter[1]", "value", "dfc-generated"]
+      - ["lang:core", "<crate::ops::range::RangeInclusive as crate::iter::traits::double_ended::DoubleEndedIterator>::next_back", "Argument[self].Field[crate::ops::range::RangeInclusive::end].Reference", "ReturnValue.Field[crate::option::Option::Some(0)]", "value", "dfc-generated"]
+      - ["lang:core", "<crate::ops::range::RangeInclusive as crate::iter::traits::double_ended::DoubleEndedIterator>::next_back", "Argument[self].Field[crate::ops::range::RangeInclusive::end]", "ReturnValue.Field[crate::option::Option::Some(0)]", "value", "dfc-generated"]
       - ["lang:core", "<crate::ops::range::RangeInclusive as crate::iter::traits::double_ended::DoubleEndedIterator>::nth_back", "Argument[self].Field[crate::ops::range::RangeInclusive::start].Reference", "Argument[self].Field[crate::ops::range::RangeInclusive::end]", "value", "dfc-generated"]
-      - ["lang:core", "<crate::ops::range::RangeInclusive as crate::iter::traits::double_ended::DoubleEndedIterator>::nth_back", "Argument[self].Field[crate::ops::range::RangeInclusive::start]", "Argument[self].Field[crate::ops::range::RangeInclusive::end].Reference", "value", "dfc-generated"]
       - ["lang:core", "<crate::ops::range::RangeInclusive as crate::iter::traits::double_ended::DoubleEndedIterator>::nth_back", "Argument[self].Field[crate::ops::range::RangeInclusive::start]", "Argument[self].Field[crate::ops::range::RangeInclusive::end]", "value", "dfc-generated"]
+      - ["lang:core", "<crate::ops::range::RangeInclusive as crate::iter::traits::double_ended::DoubleEndedIterator>::try_rfold", "Argument[0]", "ReturnValue", "value", "dfc-generated"]
+      - ["lang:core", "<crate::ops::range::RangeInclusive as crate::iter::traits::iterator::Iterator>::last", "Argument[self].Field[crate::ops::range::RangeInclusive::end].Reference", "ReturnValue.Field[crate::option::Option::Some(0)]", "value", "dfc-generated"]
+      - ["lang:core", "<crate::ops::range::RangeInclusive as crate::iter::traits::iterator::Iterator>::last", "Argument[self].Field[crate::ops::range::RangeInclusive::end]", "ReturnValue.Field[crate::option::Option::Some(0)]", "value", "dfc-generated"]
+      - ["lang:core", "<crate::ops::range::RangeInclusive as crate::iter::traits::iterator::Iterator>::max", "Argument[self].Field[crate::ops::range::RangeInclusive::end].Reference", "ReturnValue.Field[crate::option::Option::Some(0)]", "value", "dfc-generated"]
+      - ["lang:core", "<crate::ops::range::RangeInclusive as crate::iter::traits::iterator::Iterator>::max", "Argument[self].Field[crate::ops::range::RangeInclusive::end]", "ReturnValue.Field[crate::option::Option::Some(0)]", "value", "dfc-generated"]
+      - ["lang:core", "<crate::ops::range::RangeInclusive as crate::iter::traits::iterator::Iterator>::min", "Argument[self].Field[crate::ops::range::RangeInclusive::start].Reference", "ReturnValue.Field[crate::option::Option::Some(0)]", "value", "dfc-generated"]
+      - ["lang:core", "<crate::ops::range::RangeInclusive as crate::iter::traits::iterator::Iterator>::min", "Argument[self].Field[crate::ops::range::RangeInclusive::start]", "ReturnValue.Field[crate::option::Option::Some(0)]", "value", "dfc-generated"]
+      - ["lang:core", "<crate::ops::range::RangeInclusive as crate::iter::traits::iterator::Iterator>::next", "Argument[self].Field[crate::ops::range::RangeInclusive::start].Reference", "ReturnValue.Field[crate::option::Option::Some(0)]", "value", "dfc-generated"]
+      - ["lang:core", "<crate::ops::range::RangeInclusive as crate::iter::traits::iterator::Iterator>::next", "Argument[self].Field[crate::ops::range::RangeInclusive::start]", "ReturnValue.Field[crate::option::Option::Some(0)]", "value", "dfc-generated"]
       - ["lang:core", "<crate::ops::range::RangeInclusive as crate::iter::traits::iterator::Iterator>::nth", "Argument[self].Field[crate::ops::range::RangeInclusive::end].Reference", "Argument[self].Field[crate::ops::range::RangeInclusive::start]", "value", "dfc-generated"]
-      - ["lang:core", "<crate::ops::range::RangeInclusive as crate::iter::traits::iterator::Iterator>::nth", "Argument[self].Field[crate::ops::range::RangeInclusive::end]", "Argument[self].Field[crate::ops::range::RangeInclusive::start].Reference", "value", "dfc-generated"]
       - ["lang:core", "<crate::ops::range::RangeInclusive as crate::iter::traits::iterator::Iterator>::nth", "Argument[self].Field[crate::ops::range::RangeInclusive::end]", "Argument[self].Field[crate::ops::range::RangeInclusive::start]", "value", "dfc-generated"]
+      - ["lang:core", "<crate::ops::range::RangeInclusive as crate::iter::traits::iterator::Iterator>::try_fold", "Argument[0]", "ReturnValue", "value", "dfc-generated"]
       - ["lang:core", "<crate::ops::range::RangeInclusive as crate::ops::range::IntoBounds>::into_bounds", "Argument[self].Field[crate::ops::range::RangeInclusive::end]", "ReturnValue.Field[1].Field[crate::ops::range::Bound::Excluded(0)]", "value", "dfc-generated"]
       - ["lang:core", "<crate::ops::range::RangeInclusive as crate::ops::range::IntoBounds>::into_bounds", "Argument[self].Field[crate::ops::range::RangeInclusive::end]", "ReturnValue.Field[1].Field[crate::ops::range::Bound::Included(0)]", "value", "dfc-generated"]
       - ["lang:core", "<crate::ops::range::RangeInclusive as crate::ops::range::IntoBounds>::into_bounds", "Argument[self].Field[crate::ops::range::RangeInclusive::start]", "ReturnValue.Field[0].Field[crate::ops::range::Bound::Included(0)]", "value", "dfc-generated"]
@@ -935,12 +1335,11 @@ extensions:
       - ["lang:core", "<crate::ops::try_trait::NeverShortCircuit as crate::ops::try_trait::Try>::from_output", "Argument[0]", "ReturnValue.Field[crate::ops::try_trait::NeverShortCircuit(0)]", "value", "dfc-generated"]
       - ["lang:core", "<crate::ops::try_trait::NeverShortCircuit>::wrap_mut_1", "Argument[0]", "ReturnValue", "value", "dfc-generated"]
       - ["lang:core", "<crate::ops::try_trait::NeverShortCircuit>::wrap_mut_2", "Argument[0]", "ReturnValue", "value", "dfc-generated"]
-      - ["lang:core", "<crate::option::Item as crate::iter::traits::double_ended::DoubleEndedIterator>::next_back", "Argument[self].Field[crate::option::Item::opt].Reference", "ReturnValue", "value", "dfc-generated"]
-      - ["lang:core", "<crate::option::Item as crate::iter::traits::double_ended::DoubleEndedIterator>::next_back", "Argument[self].Field[crate::option::Item::opt]", "ReturnValue", "value", "dfc-generated"]
       - ["lang:core", "<crate::option::Iter as crate::clone::Clone>::clone", "Argument[self].Field[crate::option::Iter::inner].Reference", "ReturnValue.Field[crate::option::Iter::inner]", "value", "dfc-generated"]
       - ["lang:core", "<crate::option::Iter as crate::clone::Clone>::clone", "Argument[self].Field[crate::option::Iter::inner]", "ReturnValue.Field[crate::option::Iter::inner]", "value", "dfc-generated"]
+      - ["lang:core", "<crate::option::Iter as crate::iter::traits::iterator::Iterator>::next", "Argument[self]", "ReturnValue", "taint", "df-generated"]
+      - ["lang:core", "<crate::option::IterMut as crate::iter::traits::iterator::Iterator>::next", "Argument[self]", "ReturnValue", "taint", "df-generated"]
       - ["lang:core", "<crate::option::Option as crate::clone::Clone>::clone", "Argument[self].Field[crate::option::Option::Some(0)].Reference", "ReturnValue.Field[crate::option::Option::Some(0)]", "value", "dfc-generated"]
-      - ["lang:core", "<crate::option::Option as crate::clone::Clone>::clone", "Argument[self].Field[crate::option::Option::Some(0)]", "ReturnValue.Field[crate::option::Option::Some(0)]", "value", "dfc-generated"]
       - ["lang:core", "<crate::option::Option as crate::convert::From>::from", "Argument[0].Reference.Field[crate::option::Option::Some(0)]", "ReturnValue.Field[crate::option::Option::Some(0)].Reference", "value", "dfc-generated"]
       - ["lang:core", "<crate::option::Option as crate::convert::From>::from", "Argument[0]", "ReturnValue.Field[crate::option::Option::Some(0)]", "value", "dfc-generated"]
       - ["lang:core", "<crate::option::Option as crate::ops::try_trait::Try>::branch", "Argument[self].Field[crate::option::Option::Some(0)]", "ReturnValue.Field[crate::ops::control_flow::ControlFlow::Continue(0)]", "value", "dfc-generated"]
@@ -953,7 +1352,6 @@ extensions:
       - ["lang:core", "<crate::option::Option>::as_mut", "Argument[self].Reference.Field[crate::option::Option::Some(0)]", "ReturnValue.Field[crate::option::Option::Some(0)].Reference", "value", "dfc-generated"]
       - ["lang:core", "<crate::option::Option>::as_ref", "Argument[self].Reference.Field[crate::option::Option::Some(0)]", "ReturnValue.Field[crate::option::Option::Some(0)].Reference", "value", "dfc-generated"]
       - ["lang:core", "<crate::option::Option>::cloned", "Argument[self].Field[crate::option::Option::Some(0)].Reference", "ReturnValue.Field[crate::option::Option::Some(0)]", "value", "dfc-generated"]
-      - ["lang:core", "<crate::option::Option>::cloned", "Argument[self].Field[crate::option::Option::Some(0)]", "ReturnValue.Field[crate::option::Option::Some(0)]", "value", "dfc-generated"]
       - ["lang:core", "<crate::option::Option>::copied", "Argument[self].Field[crate::option::Option::Some(0)].Reference", "ReturnValue.Field[crate::option::Option::Some(0)]", "value", "dfc-generated"]
       - ["lang:core", "<crate::option::Option>::expect", "Argument[self].Field[crate::option::Option::Some(0)]", "ReturnValue", "value", "dfc-generated"]
       - ["lang:core", "<crate::option::Option>::flatten", "Argument[self].Field[crate::option::Option::Some(0)]", "ReturnValue", "value", "dfc-generated"]
@@ -976,22 +1374,21 @@ extensions:
       - ["lang:core", "<crate::option::Option>::map_or", "Argument[0]", "ReturnValue", "value", "dfc-generated"]
       - ["lang:core", "<crate::option::Option>::map_or", "Argument[1].ReturnValue", "ReturnValue", "value", "dfc-generated"]
       - ["lang:core", "<crate::option::Option>::map_or", "Argument[self].Field[crate::option::Option::Some(0)]", "Argument[1].Parameter[0]", "value", "dfc-generated"]
+      - ["lang:core", "<crate::option::Option>::map_or_else", "Argument[0].ReturnValue", "ReturnValue.Field[crate::result::Result::Err(0)]", "value", "dfc-generated"]
       - ["lang:core", "<crate::option::Option>::map_or_else", "Argument[0].ReturnValue", "ReturnValue", "value", "dfc-generated"]
       - ["lang:core", "<crate::option::Option>::map_or_else", "Argument[1].ReturnValue", "ReturnValue", "value", "dfc-generated"]
+      - ["lang:core", "<crate::option::Option>::map_or_else", "Argument[self].Field[crate::option::Option::Some(0)].Reference", "ReturnValue.Field[crate::result::Result::Ok(0)]", "value", "dfc-generated"]
       - ["lang:core", "<crate::option::Option>::map_or_else", "Argument[self].Field[crate::option::Option::Some(0)]", "Argument[1].Parameter[0]", "value", "dfc-generated"]
       - ["lang:core", "<crate::option::Option>::ok_or", "Argument[0]", "ReturnValue.Field[crate::result::Result::Err(0)]", "value", "dfc-generated"]
       - ["lang:core", "<crate::option::Option>::ok_or", "Argument[self].Field[crate::option::Option::Some(0)]", "ReturnValue.Field[crate::result::Result::Ok(0)]", "value", "dfc-generated"]
       - ["lang:core", "<crate::option::Option>::ok_or_else", "Argument[0].ReturnValue", "ReturnValue.Field[crate::result::Result::Err(0)]", "value", "dfc-generated"]
+      - ["lang:core", "<crate::option::Option>::ok_or_else", "Argument[0]", "ReturnValue.Field[crate::result::Result::Err(0)]", "value", "dfc-generated"]
       - ["lang:core", "<crate::option::Option>::ok_or_else", "Argument[self].Field[crate::option::Option::Some(0)]", "ReturnValue.Field[crate::result::Result::Ok(0)]", "value", "dfc-generated"]
       - ["lang:core", "<crate::option::Option>::or", "Argument[0]", "ReturnValue", "value", "dfc-generated"]
       - ["lang:core", "<crate::option::Option>::or", "Argument[self]", "ReturnValue", "value", "dfc-generated"]
       - ["lang:core", "<crate::option::Option>::or_else", "Argument[0].ReturnValue", "ReturnValue", "value", "dfc-generated"]
       - ["lang:core", "<crate::option::Option>::or_else", "Argument[self]", "ReturnValue", "value", "dfc-generated"]
-      - ["lang:core", "<crate::option::Option>::replace", "Argument[0]", "Argument[self].Reference.Field[crate::option::Option::Some(0)]", "value", "dfc-generated"]
-      - ["lang:core", "<crate::option::Option>::replace", "Argument[self].Reference", "ReturnValue", "value", "dfc-generated"]
-      - ["lang:core", "<crate::option::Option>::take", "Argument[self].Reference", "ReturnValue", "value", "dfc-generated"]
       - ["lang:core", "<crate::option::Option>::take_if", "Argument[self].Reference.Field[crate::option::Option::Some(0)]", "Argument[0].Parameter[0].Reference", "value", "dfc-generated"]
-      - ["lang:core", "<crate::option::Option>::take_if", "Argument[self].Reference", "ReturnValue", "value", "dfc-generated"]
       - ["lang:core", "<crate::option::Option>::transpose", "Argument[self].Field[crate::option::Option::Some(0)].Field[crate::result::Result::Err(0)]", "ReturnValue.Field[crate::result::Result::Err(0)]", "value", "dfc-generated"]
       - ["lang:core", "<crate::option::Option>::transpose", "Argument[self].Field[crate::option::Option::Some(0)].Field[crate::result::Result::Ok(0)]", "ReturnValue.Field[crate::result::Result::Ok(0)].Field[crate::option::Option::Some(0)]", "value", "dfc-generated"]
       - ["lang:core", "<crate::option::Option>::unwrap", "Argument[self].Field[crate::option::Option::Some(0)]", "ReturnValue", "value", "dfc-generated"]
@@ -1033,28 +1430,37 @@ extensions:
       - ["lang:core", "<crate::pin::Pin as crate::ops::deref::Deref>::deref", "Argument[self].Field[crate::pin::Pin::__pointer].Reference", "ReturnValue.Reference", "value", "dfc-generated"]
       - ["lang:core", "<crate::pin::Pin as crate::ops::deref::DerefMut>::deref_mut", "Argument[self].Field[crate::pin::Pin::__pointer].Reference", "ReturnValue.Reference", "value", "dfc-generated"]
       - ["lang:core", "<crate::pin::Pin>::as_mut", "Argument[self].Field[crate::pin::Pin::__pointer].Reference", "ReturnValue.Field[crate::pin::Pin::__pointer].Reference", "value", "dfc-generated"]
+      - ["lang:core", "<crate::pin::Pin>::as_mut", "Argument[self].Field[crate::pin::Pin::__pointer].Reference", "ReturnValue", "value", "dfc-generated"]
       - ["lang:core", "<crate::pin::Pin>::as_ref", "Argument[self].Field[crate::pin::Pin::__pointer].Reference", "ReturnValue.Field[crate::pin::Pin::__pointer].Reference", "value", "dfc-generated"]
+      - ["lang:core", "<crate::pin::Pin>::as_ref", "Argument[self].Field[crate::pin::Pin::__pointer].Reference", "ReturnValue", "value", "dfc-generated"]
       - ["lang:core", "<crate::pin::Pin>::get_mut", "Argument[self].Field[crate::pin::Pin::__pointer]", "ReturnValue", "value", "dfc-generated"]
       - ["lang:core", "<crate::pin::Pin>::get_ref", "Argument[self].Field[crate::pin::Pin::__pointer]", "ReturnValue", "value", "dfc-generated"]
       - ["lang:core", "<crate::pin::Pin>::get_unchecked_mut", "Argument[self].Field[crate::pin::Pin::__pointer]", "ReturnValue", "value", "dfc-generated"]
       - ["lang:core", "<crate::pin::Pin>::into_inner", "Argument[0].Field[crate::pin::Pin::__pointer]", "ReturnValue", "value", "dfc-generated"]
       - ["lang:core", "<crate::pin::Pin>::into_inner_unchecked", "Argument[0].Field[crate::pin::Pin::__pointer]", "ReturnValue", "value", "dfc-generated"]
       - ["lang:core", "<crate::pin::Pin>::into_ref", "Argument[self].Field[crate::pin::Pin::__pointer]", "ReturnValue.Field[crate::pin::Pin::__pointer]", "value", "dfc-generated"]
+      - ["lang:core", "<crate::pin::Pin>::map_unchecked", "Argument[0].ReturnValue.Reference", "ReturnValue", "value", "dfc-generated"]
       - ["lang:core", "<crate::pin::Pin>::map_unchecked", "Argument[0].ReturnValue", "ReturnValue.Field[crate::pin::Pin::__pointer]", "value", "dfc-generated"]
       - ["lang:core", "<crate::pin::Pin>::map_unchecked", "Argument[self].Field[crate::pin::Pin::__pointer].Reference", "Argument[0].Parameter[0].Reference", "value", "dfc-generated"]
+      - ["lang:core", "<crate::pin::Pin>::map_unchecked_mut", "Argument[0].ReturnValue.Reference", "ReturnValue", "value", "dfc-generated"]
       - ["lang:core", "<crate::pin::Pin>::map_unchecked_mut", "Argument[0].ReturnValue", "ReturnValue.Field[crate::pin::Pin::__pointer]", "value", "dfc-generated"]
       - ["lang:core", "<crate::pin::Pin>::map_unchecked_mut", "Argument[self].Field[crate::pin::Pin::__pointer].Field[0]", "ReturnValue.Field[crate::pin::Pin::__pointer].Reference", "value", "dfc-generated"]
+      - ["lang:core", "<crate::pin::Pin>::map_unchecked_mut", "Argument[self].Field[crate::pin::Pin::__pointer].Field[0]", "ReturnValue", "value", "dfc-generated"]
       - ["lang:core", "<crate::pin::Pin>::map_unchecked_mut", "Argument[self].Field[crate::pin::Pin::__pointer]", "Argument[0].Parameter[0]", "value", "dfc-generated"]
+      - ["lang:core", "<crate::pin::Pin>::new", "Argument[0].Reference", "ReturnValue", "value", "dfc-generated"]
       - ["lang:core", "<crate::pin::Pin>::new", "Argument[0]", "ReturnValue.Field[crate::pin::Pin::__pointer]", "value", "dfc-generated"]
       - ["lang:core", "<crate::pin::Pin>::new_unchecked", "Argument[0]", "ReturnValue.Field[crate::pin::Pin::__pointer]", "value", "dfc-generated"]
       - ["lang:core", "<crate::pin::Pin>::set", "Argument[0]", "Argument[self].Field[crate::pin::Pin::__pointer].Reference", "value", "dfc-generated"]
+      - ["lang:core", "<crate::pin::Pin>::static_mut", "Argument[0].Reference", "ReturnValue", "value", "dfc-generated"]
       - ["lang:core", "<crate::pin::Pin>::static_mut", "Argument[0]", "ReturnValue.Field[crate::pin::Pin::__pointer]", "value", "dfc-generated"]
+      - ["lang:core", "<crate::pin::Pin>::static_ref", "Argument[0].Reference", "ReturnValue", "value", "dfc-generated"]
       - ["lang:core", "<crate::pin::Pin>::static_ref", "Argument[0]", "ReturnValue.Field[crate::pin::Pin::__pointer]", "value", "dfc-generated"]
       - ["lang:core", "<crate::ptr::alignment::Alignment>::as_usize", "Argument[self]", "ReturnValue", "taint", "df-generated"]
       - ["lang:core", "<crate::ptr::alignment::Alignment>::max", "Argument[0]", "ReturnValue", "value", "dfc-generated"]
       - ["lang:core", "<crate::ptr::alignment::Alignment>::max", "Argument[1]", "ReturnValue", "value", "dfc-generated"]
       - ["lang:core", "<crate::ptr::metadata::DynMetadata as crate::clone::Clone>::clone", "Argument[self].Reference", "ReturnValue", "value", "dfc-generated"]
       - ["lang:core", "<crate::ptr::non_null::NonNull as crate::clone::Clone>::clone", "Argument[self].Reference", "ReturnValue", "value", "dfc-generated"]
+      - ["lang:core", "<crate::ptr::non_null::NonNull as crate::convert::From>::from", "Argument[0].Field[crate::ptr::unique::Unique::pointer]", "ReturnValue", "value", "dfc-generated"]
       - ["lang:core", "<crate::ptr::non_null::NonNull as crate::convert::From>::from", "Argument[0]", "ReturnValue", "taint", "df-generated"]
       - ["lang:core", "<crate::ptr::non_null::NonNull>::from_mut", "Argument[0]", "ReturnValue", "taint", "df-generated"]
       - ["lang:core", "<crate::ptr::non_null::NonNull>::from_ref", "Argument[0]", "ReturnValue", "taint", "df-generated"]
@@ -1086,37 +1492,37 @@ extensions:
       - ["lang:core", "<crate::range::RangeInclusive as crate::ops::range::RangeBounds>::start_bound", "Argument[self].Field[crate::range::RangeInclusive::start]", "ReturnValue.Field[crate::ops::range::Bound::Included(0)].Reference", "value", "dfc-generated"]
       - ["lang:core", "<crate::range::RangeInclusive as crate::ops::range::RangeBounds>::start_bound", "Argument[self].Field[crate::range::RangeInclusive::start]", "ReturnValue.Field[crate::ops::range::Bound::Included(0)]", "value", "dfc-generated"]
       - ["lang:core", "<crate::range::RangeInclusive>::into_slice_range", "Argument[self].Field[crate::range::RangeInclusive::start]", "ReturnValue.Field[crate::range::Range::start]", "value", "dfc-generated"]
-      - ["lang:core", "<crate::range::iter::IterRange as crate::iter::traits::iterator::Iterator>::advance_by", "Argument[0]", "ReturnValue", "taint", "df-generated"]
-      - ["lang:core", "<crate::range::iter::IterRange as crate::iter::traits::iterator::Iterator>::max", "Argument[self]", "ReturnValue", "taint", "df-generated"]
-      - ["lang:core", "<crate::range::iter::IterRange as crate::iter::traits::iterator::Iterator>::min", "Argument[self]", "ReturnValue", "taint", "df-generated"]
-      - ["lang:core", "<crate::range::iter::IterRange as crate::iter::traits::iterator::Iterator>::nth", "Argument[self].Field[0].Element", "ReturnValue.Field[crate::option::Option::Some(0)]", "value", "dfc-generated"]
-      - ["lang:core", "<crate::range::iter::IterRange as crate::iter::traits::iterator::Iterator>::nth", "Argument[self].Field[crate::range::iter::IterRange(0)].Element", "ReturnValue.Field[crate::option::Option::Some(0)]", "value", "dfc-generated"]
+      - ["lang:core", "<crate::range::iter::IterRange as crate::iter::traits::double_ended::DoubleEndedIterator>::next_back", "Argument[self].Field[0].Field[crate::ops::range::Range::end]", "ReturnValue.Field[crate::option::Option::Some(0)]", "value", "dfc-generated"]
+      - ["lang:core", "<crate::range::iter::IterRange as crate::iter::traits::double_ended::DoubleEndedIterator>::next_back", "Argument[self].Field[crate::range::iter::IterRange(0)].Field[crate::ops::range::Range::end]", "ReturnValue.Field[crate::option::Option::Some(0)]", "value", "dfc-generated"]
+      - ["lang:core", "<crate::range::iter::IterRange as crate::iter::traits::double_ended::DoubleEndedIterator>::nth_back", "Argument[self].Field[0].Field[crate::ops::range::Range::end]", "ReturnValue.Field[crate::option::Option::Some(0)]", "value", "dfc-generated"]
+      - ["lang:core", "<crate::range::iter::IterRange as crate::iter::traits::double_ended::DoubleEndedIterator>::nth_back", "Argument[self].Field[crate::range::iter::IterRange(0)].Field[crate::ops::range::Range::end]", "ReturnValue.Field[crate::option::Option::Some(0)]", "value", "dfc-generated"]
+      - ["lang:core", "<crate::range::iter::IterRange as crate::iter::traits::iterator::Iterator>::last", "Argument[self].Field[0].Field[crate::ops::range::Range::end]", "ReturnValue.Field[crate::option::Option::Some(0)]", "value", "dfc-generated"]
+      - ["lang:core", "<crate::range::iter::IterRange as crate::iter::traits::iterator::Iterator>::last", "Argument[self].Field[crate::range::iter::IterRange(0)].Field[crate::ops::range::Range::end]", "ReturnValue.Field[crate::option::Option::Some(0)]", "value", "dfc-generated"]
+      - ["lang:core", "<crate::range::iter::IterRange as crate::iter::traits::iterator::Iterator>::max", "Argument[self].Field[0].Field[crate::ops::range::Range::end]", "ReturnValue.Field[crate::option::Option::Some(0)]", "value", "dfc-generated"]
+      - ["lang:core", "<crate::range::iter::IterRange as crate::iter::traits::iterator::Iterator>::max", "Argument[self].Field[crate::range::iter::IterRange(0)].Field[crate::ops::range::Range::end]", "ReturnValue.Field[crate::option::Option::Some(0)]", "value", "dfc-generated"]
+      - ["lang:core", "<crate::range::iter::IterRange as crate::iter::traits::iterator::Iterator>::min", "Argument[self].Field[0].Field[crate::ops::range::Range::start]", "ReturnValue.Field[crate::option::Option::Some(0)]", "value", "dfc-generated"]
+      - ["lang:core", "<crate::range::iter::IterRange as crate::iter::traits::iterator::Iterator>::min", "Argument[self].Field[crate::range::iter::IterRange(0)].Field[crate::ops::range::Range::start]", "ReturnValue.Field[crate::option::Option::Some(0)]", "value", "dfc-generated"]
+      - ["lang:core", "<crate::range::iter::IterRange as crate::iter::traits::iterator::Iterator>::next", "Argument[self].Field[0].Field[crate::ops::range::Range::start]", "ReturnValue.Field[crate::option::Option::Some(0)]", "value", "dfc-generated"]
+      - ["lang:core", "<crate::range::iter::IterRange as crate::iter::traits::iterator::Iterator>::next", "Argument[self].Field[crate::range::iter::IterRange(0)].Field[crate::ops::range::Range::start]", "ReturnValue.Field[crate::option::Option::Some(0)]", "value", "dfc-generated"]
       - ["lang:core", "<crate::range::iter::IterRange>::remainder", "Argument[self]", "ReturnValue", "taint", "df-generated"]
-      - ["lang:core", "<crate::range::iter::IterRangeFrom as crate::iter::traits::iterator::Iterator>::nth", "Argument[self].Field[0].Element", "ReturnValue.Field[crate::option::Option::Some(0)]", "value", "dfc-generated"]
-      - ["lang:core", "<crate::range::iter::IterRangeFrom as crate::iter::traits::iterator::Iterator>::nth", "Argument[self].Field[crate::range::iter::IterRangeFrom(0)].Element", "ReturnValue.Field[crate::option::Option::Some(0)]", "value", "dfc-generated"]
       - ["lang:core", "<crate::range::iter::IterRangeFrom>::remainder", "Argument[self].Field[0].Field[crate::ops::range::RangeFrom::start]", "ReturnValue.Field[crate::range::RangeFrom::start]", "value", "dfc-generated"]
       - ["lang:core", "<crate::range::iter::IterRangeFrom>::remainder", "Argument[self].Field[crate::range::iter::IterRangeFrom(0)].Field[crate::ops::range::RangeFrom::start]", "ReturnValue.Field[crate::range::RangeFrom::start]", "value", "dfc-generated"]
       - ["lang:core", "<crate::range::iter::IterRangeInclusive as crate::iter::traits::double_ended::DoubleEndedIterator>::advance_back_by", "Argument[0]", "ReturnValue", "taint", "df-generated"]
+      - ["lang:core", "<crate::range::iter::IterRangeInclusive as crate::iter::traits::double_ended::DoubleEndedIterator>::next_back", "Argument[self].Field[0].Field[crate::ops::range::RangeInclusive::end]", "ReturnValue.Field[crate::option::Option::Some(0)]", "value", "dfc-generated"]
+      - ["lang:core", "<crate::range::iter::IterRangeInclusive as crate::iter::traits::double_ended::DoubleEndedIterator>::next_back", "Argument[self].Field[crate::range::iter::IterRangeInclusive(0)].Field[crate::ops::range::RangeInclusive::end]", "ReturnValue.Field[crate::option::Option::Some(0)]", "value", "dfc-generated"]
       - ["lang:core", "<crate::range::iter::IterRangeInclusive as crate::iter::traits::iterator::Iterator>::advance_by", "Argument[0]", "ReturnValue", "taint", "df-generated"]
-      - ["lang:core", "<crate::range::iter::IterRangeInclusive as crate::iter::traits::iterator::Iterator>::max", "Argument[self]", "ReturnValue", "taint", "df-generated"]
-      - ["lang:core", "<crate::range::iter::IterRangeInclusive as crate::iter::traits::iterator::Iterator>::min", "Argument[self]", "ReturnValue", "taint", "df-generated"]
-      - ["lang:core", "<crate::range::iter::IterRangeInclusive as crate::iter::traits::iterator::Iterator>::nth", "Argument[self].Field[0].Element", "ReturnValue.Field[crate::option::Option::Some(0)]", "value", "dfc-generated"]
-      - ["lang:core", "<crate::range::iter::IterRangeInclusive as crate::iter::traits::iterator::Iterator>::nth", "Argument[self].Field[crate::range::iter::IterRangeInclusive(0)].Element", "ReturnValue.Field[crate::option::Option::Some(0)]", "value", "dfc-generated"]
+      - ["lang:core", "<crate::range::iter::IterRangeInclusive as crate::iter::traits::iterator::Iterator>::last", "Argument[self].Field[0].Field[crate::ops::range::RangeInclusive::end]", "ReturnValue.Field[crate::option::Option::Some(0)]", "value", "dfc-generated"]
+      - ["lang:core", "<crate::range::iter::IterRangeInclusive as crate::iter::traits::iterator::Iterator>::last", "Argument[self].Field[crate::range::iter::IterRangeInclusive(0)].Field[crate::ops::range::RangeInclusive::end]", "ReturnValue.Field[crate::option::Option::Some(0)]", "value", "dfc-generated"]
+      - ["lang:core", "<crate::range::iter::IterRangeInclusive as crate::iter::traits::iterator::Iterator>::max", "Argument[self].Field[0].Field[crate::ops::range::RangeInclusive::end]", "ReturnValue.Field[crate::option::Option::Some(0)]", "value", "dfc-generated"]
+      - ["lang:core", "<crate::range::iter::IterRangeInclusive as crate::iter::traits::iterator::Iterator>::max", "Argument[self].Field[crate::range::iter::IterRangeInclusive(0)].Field[crate::ops::range::RangeInclusive::end]", "ReturnValue.Field[crate::option::Option::Some(0)]", "value", "dfc-generated"]
+      - ["lang:core", "<crate::range::iter::IterRangeInclusive as crate::iter::traits::iterator::Iterator>::min", "Argument[self].Field[0].Field[crate::ops::range::RangeInclusive::start]", "ReturnValue.Field[crate::option::Option::Some(0)]", "value", "dfc-generated"]
+      - ["lang:core", "<crate::range::iter::IterRangeInclusive as crate::iter::traits::iterator::Iterator>::min", "Argument[self].Field[crate::range::iter::IterRangeInclusive(0)].Field[crate::ops::range::RangeInclusive::start]", "ReturnValue.Field[crate::option::Option::Some(0)]", "value", "dfc-generated"]
+      - ["lang:core", "<crate::range::iter::IterRangeInclusive as crate::iter::traits::iterator::Iterator>::next", "Argument[self].Field[0].Field[crate::ops::range::RangeInclusive::start]", "ReturnValue.Field[crate::option::Option::Some(0)]", "value", "dfc-generated"]
+      - ["lang:core", "<crate::range::iter::IterRangeInclusive as crate::iter::traits::iterator::Iterator>::next", "Argument[self].Field[crate::range::iter::IterRangeInclusive(0)].Field[crate::ops::range::RangeInclusive::start]", "ReturnValue.Field[crate::option::Option::Some(0)]", "value", "dfc-generated"]
       - ["lang:core", "<crate::range::iter::IterRangeInclusive>::remainder", "Argument[self]", "ReturnValue", "taint", "df-generated"]
-      - ["lang:core", "<crate::result::IntoIter as crate::iter::traits::double_ended::DoubleEndedIterator>::next_back", "Argument[self].Field[crate::result::IntoIter::inner].Reference", "ReturnValue", "value", "dfc-generated"]
-      - ["lang:core", "<crate::result::IntoIter as crate::iter::traits::double_ended::DoubleEndedIterator>::next_back", "Argument[self].Field[crate::result::IntoIter::inner]", "ReturnValue", "value", "dfc-generated"]
-      - ["lang:core", "<crate::result::IntoIter as crate::iter::traits::iterator::Iterator>::next", "Argument[self].Field[crate::result::IntoIter::inner].Reference", "ReturnValue", "value", "dfc-generated"]
-      - ["lang:core", "<crate::result::IntoIter as crate::iter::traits::iterator::Iterator>::next", "Argument[self].Field[crate::result::IntoIter::inner]", "ReturnValue", "value", "dfc-generated"]
       - ["lang:core", "<crate::result::Iter as crate::clone::Clone>::clone", "Argument[self].Field[crate::result::Iter::inner]", "ReturnValue.Field[crate::result::Iter::inner]", "value", "dfc-generated"]
-      - ["lang:core", "<crate::result::Iter as crate::iter::traits::double_ended::DoubleEndedIterator>::next_back", "Argument[self].Field[crate::result::Iter::inner].Reference", "ReturnValue", "value", "dfc-generated"]
-      - ["lang:core", "<crate::result::Iter as crate::iter::traits::double_ended::DoubleEndedIterator>::next_back", "Argument[self].Field[crate::result::Iter::inner]", "ReturnValue", "value", "dfc-generated"]
-      - ["lang:core", "<crate::result::Iter as crate::iter::traits::iterator::Iterator>::next", "Argument[self].Field[crate::result::Iter::inner].Reference", "ReturnValue", "value", "dfc-generated"]
-      - ["lang:core", "<crate::result::Iter as crate::iter::traits::iterator::Iterator>::next", "Argument[self].Field[crate::result::Iter::inner]", "ReturnValue", "value", "dfc-generated"]
-      - ["lang:core", "<crate::result::IterMut as crate::iter::traits::double_ended::DoubleEndedIterator>::next_back", "Argument[self].Field[crate::result::IterMut::inner].Reference", "ReturnValue", "value", "dfc-generated"]
-      - ["lang:core", "<crate::result::IterMut as crate::iter::traits::double_ended::DoubleEndedIterator>::next_back", "Argument[self].Field[crate::result::IterMut::inner]", "ReturnValue", "value", "dfc-generated"]
-      - ["lang:core", "<crate::result::IterMut as crate::iter::traits::iterator::Iterator>::next", "Argument[self].Field[crate::result::IterMut::inner].Reference", "ReturnValue", "value", "dfc-generated"]
-      - ["lang:core", "<crate::result::IterMut as crate::iter::traits::iterator::Iterator>::next", "Argument[self].Field[crate::result::IterMut::inner]", "ReturnValue", "value", "dfc-generated"]
-      - ["lang:core", "<crate::result::Result as crate::clone::Clone>::clone", "Argument[self]", "ReturnValue", "taint", "df-generated"]
+      - ["lang:core", "<crate::result::Result as crate::clone::Clone>::clone", "Argument[self].Field[crate::result::Result::Err(0)].Reference", "ReturnValue.Field[crate::result::Result::Err(0)]", "value", "dfc-generated"]
+      - ["lang:core", "<crate::result::Result as crate::clone::Clone>::clone", "Argument[self].Field[crate::result::Result::Ok(0)].Reference", "ReturnValue.Field[crate::result::Result::Ok(0)]", "value", "dfc-generated"]
       - ["lang:core", "<crate::result::Result as crate::ops::try_trait::Try>::branch", "Argument[self].Field[crate::result::Result::Err(0)]", "ReturnValue.Field[crate::ops::control_flow::ControlFlow::Break(0)].Field[crate::result::Result::Err(0)]", "value", "dfc-generated"]
       - ["lang:core", "<crate::result::Result as crate::ops::try_trait::Try>::branch", "Argument[self].Field[crate::result::Result::Ok(0)]", "ReturnValue.Field[crate::ops::control_flow::ControlFlow::Continue(0)]", "value", "dfc-generated"]
       - ["lang:core", "<crate::result::Result as crate::ops::try_trait::Try>::from_output", "Argument[0]", "ReturnValue.Field[crate::result::Result::Ok(0)]", "value", "dfc-generated"]
@@ -1124,6 +1530,7 @@ extensions:
       - ["lang:core", "<crate::result::Result>::and", "Argument[self].Field[crate::result::Result::Err(0)]", "ReturnValue.Field[crate::result::Result::Err(0)]", "value", "dfc-generated"]
       - ["lang:core", "<crate::result::Result>::and_then", "Argument[self].Field[crate::result::Result::Err(0)]", "ReturnValue.Field[crate::result::Result::Err(0)]", "value", "dfc-generated"]
       - ["lang:core", "<crate::result::Result>::and_then", "Argument[self].Field[crate::result::Result::Ok(0)]", "Argument[0].Parameter[0]", "value", "dfc-generated"]
+      - ["lang:core", "<crate::result::Result>::and_then", "Argument[self].Field[crate::result::Result::Ok(0)]", "ReturnValue.Field[crate::result::Result::Ok(0)]", "value", "dfc-generated"]
       - ["lang:core", "<crate::result::Result>::as_deref", "Argument[self].Reference.Field[crate::result::Result::Err(0)]", "ReturnValue.Field[crate::result::Result::Err(0)].Reference", "value", "dfc-generated"]
       - ["lang:core", "<crate::result::Result>::as_deref_mut", "Argument[self].Reference.Field[crate::result::Result::Err(0)]", "ReturnValue.Field[crate::result::Result::Err(0)].Reference", "value", "dfc-generated"]
       - ["lang:core", "<crate::result::Result>::as_mut", "Argument[self].Reference.Field[crate::result::Result::Err(0)]", "ReturnValue.Field[crate::result::Result::Err(0)].Reference", "value", "dfc-generated"]
@@ -1132,7 +1539,6 @@ extensions:
       - ["lang:core", "<crate::result::Result>::as_ref", "Argument[self].Reference.Field[crate::result::Result::Ok(0)]", "ReturnValue.Field[crate::result::Result::Ok(0)].Reference", "value", "dfc-generated"]
       - ["lang:core", "<crate::result::Result>::cloned", "Argument[self].Field[crate::result::Result::Err(0)]", "ReturnValue.Field[crate::result::Result::Err(0)]", "value", "dfc-generated"]
       - ["lang:core", "<crate::result::Result>::cloned", "Argument[self].Field[crate::result::Result::Ok(0)].Reference", "ReturnValue.Field[crate::result::Result::Ok(0)]", "value", "dfc-generated"]
-      - ["lang:core", "<crate::result::Result>::cloned", "Argument[self].Field[crate::result::Result::Ok(0)]", "ReturnValue.Field[crate::result::Result::Ok(0)]", "value", "dfc-generated"]
       - ["lang:core", "<crate::result::Result>::copied", "Argument[self].Field[crate::result::Result::Err(0)]", "ReturnValue.Field[crate::result::Result::Err(0)]", "value", "dfc-generated"]
       - ["lang:core", "<crate::result::Result>::copied", "Argument[self].Field[crate::result::Result::Ok(0)].Reference", "ReturnValue.Field[crate::result::Result::Ok(0)]", "value", "dfc-generated"]
       - ["lang:core", "<crate::result::Result>::err", "Argument[self].Field[crate::result::Result::Err(0)]", "ReturnValue.Field[crate::option::Option::Some(0)]", "value", "dfc-generated"]
@@ -1151,6 +1557,7 @@ extensions:
       - ["lang:core", "<crate::result::Result>::iter", "Argument[self]", "ReturnValue", "taint", "df-generated"]
       - ["lang:core", "<crate::result::Result>::iter_mut", "Argument[self]", "ReturnValue", "taint", "df-generated"]
       - ["lang:core", "<crate::result::Result>::map", "Argument[0].ReturnValue", "ReturnValue.Field[crate::result::Result::Ok(0)]", "value", "dfc-generated"]
+      - ["lang:core", "<crate::result::Result>::map", "Argument[0]", "ReturnValue.Field[crate::result::Result::Ok(0)].Field[1]", "value", "dfc-generated"]
       - ["lang:core", "<crate::result::Result>::map_err", "Argument[0].ReturnValue", "ReturnValue.Field[crate::result::Result::Err(0)]", "value", "dfc-generated"]
       - ["lang:core", "<crate::result::Result>::map_err", "Argument[self].Field[crate::result::Result::Err(0)].Field[crate::sync::mpmc::error::SendTimeoutError::Disconnected(0)]", "ReturnValue.Field[crate::result::Result::Err(0)].Field[crate::sync::mpsc::TrySendError::Disconnected(0)]", "value", "dfc-generated"]
       - ["lang:core", "<crate::result::Result>::map_err", "Argument[self].Field[crate::result::Result::Err(0)]", "Argument[0].Parameter[0]", "value", "dfc-generated"]
@@ -1177,12 +1584,11 @@ extensions:
       - ["lang:core", "<crate::result::Result>::unwrap_or", "Argument[self].Field[crate::result::Result::Ok(0)]", "ReturnValue", "value", "dfc-generated"]
       - ["lang:core", "<crate::result::Result>::unwrap_or_default", "Argument[self].Field[crate::result::Result::Ok(0)]", "ReturnValue", "value", "dfc-generated"]
       - ["lang:core", "<crate::result::Result>::unwrap_or_else", "Argument[0].ReturnValue", "ReturnValue", "value", "dfc-generated"]
-      - ["lang:core", "<crate::result::Result>::unwrap_or_else", "Argument[self].Field[crate::result::Result::Err(0)].Reference", "ReturnValue", "value", "dfc-generated"]
       - ["lang:core", "<crate::result::Result>::unwrap_or_else", "Argument[self].Field[crate::result::Result::Err(0)]", "Argument[0].Parameter[0]", "value", "dfc-generated"]
       - ["lang:core", "<crate::result::Result>::unwrap_or_else", "Argument[self].Field[crate::result::Result::Ok(0)]", "ReturnValue", "value", "dfc-generated"]
       - ["lang:core", "<crate::result::Result>::unwrap_unchecked", "Argument[self].Field[crate::result::Result::Ok(0)]", "ReturnValue", "value", "dfc-generated"]
+      - ["lang:core", "<crate::slice::GetDisjointMutError as crate::fmt::Display>::fmt", "Argument[0]", "ReturnValue", "taint", "df-generated"]
       - ["lang:core", "<crate::slice::ascii::EscapeAscii as crate::iter::traits::iterator::Iterator>::fold", "Argument[0]", "ReturnValue", "value", "dfc-generated"]
-      - ["lang:core", "<crate::slice::ascii::EscapeAscii as crate::iter::traits::iterator::Iterator>::fold", "Argument[1].ReturnValue", "ReturnValue", "value", "dfc-generated"]
       - ["lang:core", "<crate::slice::ascii::EscapeAscii as crate::iter::traits::iterator::Iterator>::try_fold", "Argument[0]", "ReturnValue", "value", "dfc-generated"]
       - ["lang:core", "<crate::slice::iter::ArrayChunks as crate::clone::Clone>::clone", "Argument[self]", "ReturnValue", "taint", "df-generated"]
       - ["lang:core", "<crate::slice::iter::ArrayChunks as crate::iter::traits::iterator::Iterator>::next", "Argument[self].Field[crate::slice::iter::ArrayChunks::iter].Element", "ReturnValue.Field[crate::option::Option::Some(0)]", "value", "dfc-generated"]
@@ -1190,7 +1596,6 @@ extensions:
       - ["lang:core", "<crate::slice::iter::ArrayChunks>::remainder", "Argument[self].Field[crate::slice::iter::ArrayChunks::rem]", "ReturnValue", "value", "dfc-generated"]
       - ["lang:core", "<crate::slice::iter::ArrayChunksMut>::into_remainder", "Argument[self].Field[crate::slice::iter::ArrayChunksMut::rem]", "ReturnValue", "value", "dfc-generated"]
       - ["lang:core", "<crate::slice::iter::ArrayWindows as crate::iter::traits::iterator::Iterator>::count", "Argument[self].Field[crate::slice::iter::ArrayWindows::num]", "ReturnValue", "value", "dfc-generated"]
-      - ["lang:core", "<crate::slice::iter::ArrayWindows as crate::iter::traits::iterator::Iterator>::last", "Argument[self].Element", "ReturnValue.Field[crate::option::Option::Some(0)]", "value", "dfc-generated"]
       - ["lang:core", "<crate::slice::iter::ArrayWindows as crate::iter::traits::iterator::Iterator>::size_hint", "Argument[self].Field[crate::slice::iter::ArrayWindows::num]", "ReturnValue.Field[0]", "value", "dfc-generated"]
       - ["lang:core", "<crate::slice::iter::ArrayWindows as crate::iter::traits::iterator::Iterator>::size_hint", "Argument[self].Field[crate::slice::iter::ArrayWindows::num]", "ReturnValue.Field[1].Field[crate::option::Option::Some(0)]", "value", "dfc-generated"]
       - ["lang:core", "<crate::slice::iter::ChunkBy>::new", "Argument[0]", "ReturnValue.Field[crate::slice::iter::ChunkBy::slice]", "value", "dfc-generated"]
@@ -1256,17 +1661,25 @@ extensions:
       - ["lang:core", "<crate::slice::iter::RChunksMut as crate::iter::traits::iterator::Iterator>::size_hint", "Argument[self]", "ReturnValue", "taint", "df-generated"]
       - ["lang:core", "<crate::slice::iter::RChunksMut>::new", "Argument[0]", "ReturnValue.Field[crate::slice::iter::RChunksMut::v]", "value", "dfc-generated"]
       - ["lang:core", "<crate::slice::iter::RChunksMut>::new", "Argument[1]", "ReturnValue.Field[crate::slice::iter::RChunksMut::chunk_size]", "value", "dfc-generated"]
-      - ["lang:core", "<crate::slice::iter::RSplit as crate::clone::Clone>::clone", "Argument[self].Field[crate::slice::iter::RSplit::inner].Reference", "ReturnValue.Field[crate::slice::iter::RSplit::inner]", "value", "dfc-generated"]
-      - ["lang:core", "<crate::slice::iter::RSplit as crate::clone::Clone>::clone", "Argument[self].Field[crate::slice::iter::RSplit::inner]", "ReturnValue.Field[crate::slice::iter::RSplit::inner]", "value", "dfc-generated"]
+      - ["lang:core", "<crate::slice::iter::RSplit as crate::clone::Clone>::clone", "Argument[self]", "ReturnValue", "taint", "df-generated"]
+      - ["lang:core", "<crate::slice::iter::RSplit as crate::iter::traits::double_ended::DoubleEndedIterator>::next_back", "Argument[self].Field[crate::slice::iter::RSplit::inner].Field[crate::slice::iter::Split::v]", "ReturnValue.Field[crate::option::Option::Some(0)]", "value", "dfc-generated"]
+      - ["lang:core", "<crate::slice::iter::RSplit as crate::iter::traits::iterator::Iterator>::next", "Argument[self].Field[crate::slice::iter::RSplit::inner].Field[crate::slice::iter::Split::v]", "ReturnValue.Field[crate::option::Option::Some(0)]", "value", "dfc-generated"]
+      - ["lang:core", "<crate::slice::iter::RSplit as crate::slice::iter::SplitIter>::finish", "Argument[self].Field[crate::slice::iter::RSplit::inner].Field[crate::slice::iter::Split::v]", "ReturnValue.Field[crate::option::Option::Some(0)]", "value", "dfc-generated"]
       - ["lang:core", "<crate::slice::iter::RSplit>::new", "Argument[0]", "ReturnValue.Field[crate::slice::iter::RSplit::inner].Field[crate::slice::iter::Split::v]", "value", "dfc-generated"]
       - ["lang:core", "<crate::slice::iter::RSplit>::new", "Argument[1]", "ReturnValue.Field[crate::slice::iter::RSplit::inner].Field[crate::slice::iter::Split::pred]", "value", "dfc-generated"]
       - ["lang:core", "<crate::slice::iter::RSplitMut>::new", "Argument[0]", "ReturnValue.Field[crate::slice::iter::RSplitMut::inner].Field[crate::slice::iter::SplitMut::v]", "value", "dfc-generated"]
       - ["lang:core", "<crate::slice::iter::RSplitMut>::new", "Argument[1]", "ReturnValue.Field[crate::slice::iter::RSplitMut::inner].Field[crate::slice::iter::SplitMut::pred]", "value", "dfc-generated"]
+      - ["lang:core", "<crate::slice::iter::RSplitN as crate::iter::traits::iterator::Iterator>::next", "Argument[self]", "ReturnValue", "taint", "df-generated"]
+      - ["lang:core", "<crate::slice::iter::RSplitN as crate::iter::traits::iterator::Iterator>::size_hint", "Argument[self].Field[crate::slice::iter::RSplitN::inner].Field[crate::slice::iter::GenericSplitN::count]", "ReturnValue.Field[0]", "value", "dfc-generated"]
       - ["lang:core", "<crate::slice::iter::RSplitN>::new", "Argument[0]", "ReturnValue.Field[crate::slice::iter::RSplitN::inner].Field[crate::slice::iter::GenericSplitN::iter]", "value", "dfc-generated"]
       - ["lang:core", "<crate::slice::iter::RSplitN>::new", "Argument[1]", "ReturnValue.Field[crate::slice::iter::RSplitN::inner].Field[crate::slice::iter::GenericSplitN::count]", "value", "dfc-generated"]
+      - ["lang:core", "<crate::slice::iter::RSplitNMut as crate::iter::traits::iterator::Iterator>::next", "Argument[self]", "ReturnValue", "taint", "df-generated"]
+      - ["lang:core", "<crate::slice::iter::RSplitNMut as crate::iter::traits::iterator::Iterator>::size_hint", "Argument[self].Field[crate::slice::iter::RSplitNMut::inner].Field[crate::slice::iter::GenericSplitN::count]", "ReturnValue.Field[0]", "value", "dfc-generated"]
       - ["lang:core", "<crate::slice::iter::RSplitNMut>::new", "Argument[0]", "ReturnValue.Field[crate::slice::iter::RSplitNMut::inner].Field[crate::slice::iter::GenericSplitN::iter]", "value", "dfc-generated"]
       - ["lang:core", "<crate::slice::iter::RSplitNMut>::new", "Argument[1]", "ReturnValue.Field[crate::slice::iter::RSplitNMut::inner].Field[crate::slice::iter::GenericSplitN::count]", "value", "dfc-generated"]
       - ["lang:core", "<crate::slice::iter::Split as crate::clone::Clone>::clone", "Argument[self]", "ReturnValue", "taint", "df-generated"]
+      - ["lang:core", "<crate::slice::iter::Split as crate::iter::traits::double_ended::DoubleEndedIterator>::next_back", "Argument[self].Field[crate::slice::iter::Split::v]", "ReturnValue.Field[crate::option::Option::Some(0)]", "value", "dfc-generated"]
+      - ["lang:core", "<crate::slice::iter::Split as crate::iter::traits::iterator::Iterator>::next", "Argument[self].Field[crate::slice::iter::Split::v]", "ReturnValue.Field[crate::option::Option::Some(0)]", "value", "dfc-generated"]
       - ["lang:core", "<crate::slice::iter::Split as crate::slice::iter::SplitIter>::finish", "Argument[self].Field[crate::slice::iter::Split::v]", "ReturnValue.Field[crate::option::Option::Some(0)]", "value", "dfc-generated"]
       - ["lang:core", "<crate::slice::iter::Split>::as_slice", "Argument[self].Field[crate::slice::iter::Split::v]", "ReturnValue.Reference", "value", "dfc-generated"]
       - ["lang:core", "<crate::slice::iter::Split>::new", "Argument[0]", "ReturnValue.Field[crate::slice::iter::Split::v]", "value", "dfc-generated"]
@@ -1280,11 +1693,14 @@ extensions:
       - ["lang:core", "<crate::slice::iter::SplitInclusive>::new", "Argument[1]", "ReturnValue.Field[crate::slice::iter::SplitInclusive::pred]", "value", "dfc-generated"]
       - ["lang:core", "<crate::slice::iter::SplitInclusiveMut>::new", "Argument[0]", "ReturnValue.Field[crate::slice::iter::SplitInclusiveMut::v]", "value", "dfc-generated"]
       - ["lang:core", "<crate::slice::iter::SplitInclusiveMut>::new", "Argument[1]", "ReturnValue.Field[crate::slice::iter::SplitInclusiveMut::pred]", "value", "dfc-generated"]
-      - ["lang:core", "<crate::slice::iter::SplitMut as crate::slice::iter::SplitIter>::finish", "Argument[self].Field[crate::slice::iter::SplitMut::v]", "ReturnValue.Field[crate::option::Option::Some(0)]", "value", "dfc-generated"]
       - ["lang:core", "<crate::slice::iter::SplitMut>::new", "Argument[0]", "ReturnValue.Field[crate::slice::iter::SplitMut::v]", "value", "dfc-generated"]
       - ["lang:core", "<crate::slice::iter::SplitMut>::new", "Argument[1]", "ReturnValue.Field[crate::slice::iter::SplitMut::pred]", "value", "dfc-generated"]
+      - ["lang:core", "<crate::slice::iter::SplitN as crate::iter::traits::iterator::Iterator>::next", "Argument[self]", "ReturnValue", "taint", "df-generated"]
+      - ["lang:core", "<crate::slice::iter::SplitN as crate::iter::traits::iterator::Iterator>::size_hint", "Argument[self].Field[crate::slice::iter::SplitN::inner].Field[crate::slice::iter::GenericSplitN::count]", "ReturnValue.Field[0]", "value", "dfc-generated"]
       - ["lang:core", "<crate::slice::iter::SplitN>::new", "Argument[0]", "ReturnValue.Field[crate::slice::iter::SplitN::inner].Field[crate::slice::iter::GenericSplitN::iter]", "value", "dfc-generated"]
       - ["lang:core", "<crate::slice::iter::SplitN>::new", "Argument[1]", "ReturnValue.Field[crate::slice::iter::SplitN::inner].Field[crate::slice::iter::GenericSplitN::count]", "value", "dfc-generated"]
+      - ["lang:core", "<crate::slice::iter::SplitNMut as crate::iter::traits::iterator::Iterator>::next", "Argument[self]", "ReturnValue", "taint", "df-generated"]
+      - ["lang:core", "<crate::slice::iter::SplitNMut as crate::iter::traits::iterator::Iterator>::size_hint", "Argument[self].Field[crate::slice::iter::SplitNMut::inner].Field[crate::slice::iter::GenericSplitN::count]", "ReturnValue.Field[0]", "value", "dfc-generated"]
       - ["lang:core", "<crate::slice::iter::SplitNMut>::new", "Argument[0]", "ReturnValue.Field[crate::slice::iter::SplitNMut::inner].Field[crate::slice::iter::GenericSplitN::iter]", "value", "dfc-generated"]
       - ["lang:core", "<crate::slice::iter::SplitNMut>::new", "Argument[1]", "ReturnValue.Field[crate::slice::iter::SplitNMut::inner].Field[crate::slice::iter::GenericSplitN::count]", "value", "dfc-generated"]
       - ["lang:core", "<crate::slice::iter::Windows as crate::clone::Clone>::clone", "Argument[self].Field[crate::slice::iter::Windows::size]", "ReturnValue.Field[crate::slice::iter::Windows::size]", "value", "dfc-generated"]
@@ -1301,28 +1717,26 @@ extensions:
       - ["lang:core", "<crate::slice::iter::Windows>::new", "Argument[0]", "ReturnValue.Field[crate::slice::iter::Windows::v]", "value", "dfc-generated"]
       - ["lang:core", "<crate::slice::iter::Windows>::new", "Argument[1]", "ReturnValue.Field[crate::slice::iter::Windows::size]", "value", "dfc-generated"]
       - ["lang:core", "<crate::str::LinesMap as crate::ops::function::Fn>::call", "Argument[0].Field[0]", "ReturnValue", "value", "dfc-generated"]
+      - ["lang:core", "<crate::str::error::ParseBoolError as crate::fmt::Display>::fmt", "Argument[0]", "ReturnValue", "taint", "df-generated"]
       - ["lang:core", "<crate::str::error::Utf8Error>::error_len", "Argument[self]", "ReturnValue", "taint", "df-generated"]
       - ["lang:core", "<crate::str::error::Utf8Error>::valid_up_to", "Argument[self].Field[crate::str::error::Utf8Error::valid_up_to]", "ReturnValue", "value", "dfc-generated"]
-      - ["lang:core", "<crate::str::iter::Bytes as crate::iter::traits::iterator::Iterator>::nth", "Argument[self].Field[0].Element", "ReturnValue.Field[crate::option::Option::Some(0)]", "value", "dfc-generated"]
-      - ["lang:core", "<crate::str::iter::Bytes as crate::iter::traits::iterator::Iterator>::nth", "Argument[self].Field[crate::str::iter::Bytes(0)].Element", "ReturnValue.Field[crate::option::Option::Some(0)]", "value", "dfc-generated"]
       - ["lang:core", "<crate::str::iter::CharIndices as crate::iter::traits::double_ended::DoubleEndedIterator>::next_back", "Argument[self]", "ReturnValue", "taint", "df-generated"]
       - ["lang:core", "<crate::str::iter::CharIndices as crate::iter::traits::iterator::Iterator>::last", "Argument[self]", "ReturnValue", "taint", "df-generated"]
       - ["lang:core", "<crate::str::iter::CharIndices as crate::iter::traits::iterator::Iterator>::next", "Argument[self].Field[crate::str::iter::CharIndices::front_offset]", "ReturnValue.Field[crate::option::Option::Some(0)].Field[0]", "value", "dfc-generated"]
       - ["lang:core", "<crate::str::iter::CharIndices>::offset", "Argument[self].Field[crate::str::iter::CharIndices::front_offset]", "ReturnValue", "value", "dfc-generated"]
       - ["lang:core", "<crate::str::iter::EncodeUtf16 as crate::iter::traits::iterator::Iterator>::next", "Argument[self].Field[crate::str::iter::EncodeUtf16::extra]", "ReturnValue.Field[crate::option::Option::Some(0)]", "value", "dfc-generated"]
       - ["lang:core", "<crate::str::iter::EscapeDebug as crate::iter::traits::iterator::Iterator>::fold", "Argument[0]", "ReturnValue", "value", "dfc-generated"]
-      - ["lang:core", "<crate::str::iter::EscapeDebug as crate::iter::traits::iterator::Iterator>::fold", "Argument[1].ReturnValue", "ReturnValue", "value", "dfc-generated"]
       - ["lang:core", "<crate::str::iter::EscapeDebug as crate::iter::traits::iterator::Iterator>::try_fold", "Argument[0]", "ReturnValue", "value", "dfc-generated"]
       - ["lang:core", "<crate::str::iter::EscapeDefault as crate::iter::traits::iterator::Iterator>::fold", "Argument[0]", "ReturnValue", "value", "dfc-generated"]
-      - ["lang:core", "<crate::str::iter::EscapeDefault as crate::iter::traits::iterator::Iterator>::fold", "Argument[1].ReturnValue", "ReturnValue", "value", "dfc-generated"]
       - ["lang:core", "<crate::str::iter::EscapeDefault as crate::iter::traits::iterator::Iterator>::try_fold", "Argument[0]", "ReturnValue", "value", "dfc-generated"]
       - ["lang:core", "<crate::str::iter::EscapeUnicode as crate::iter::traits::iterator::Iterator>::fold", "Argument[0]", "ReturnValue", "value", "dfc-generated"]
-      - ["lang:core", "<crate::str::iter::EscapeUnicode as crate::iter::traits::iterator::Iterator>::fold", "Argument[1].ReturnValue", "ReturnValue", "value", "dfc-generated"]
       - ["lang:core", "<crate::str::iter::EscapeUnicode as crate::iter::traits::iterator::Iterator>::try_fold", "Argument[0]", "ReturnValue", "value", "dfc-generated"]
       - ["lang:core", "<crate::str::iter::MatchIndices as crate::clone::Clone>::clone", "Argument[self]", "ReturnValue", "taint", "df-generated"]
-      - ["lang:core", "<crate::str::iter::MatchIndicesInternal as crate::clone::Clone>::clone", "Argument[self]", "ReturnValue", "taint", "df-generated"]
+      - ["lang:core", "<crate::str::iter::MatchIndicesInternal as crate::clone::Clone>::clone", "Argument[self].Field[0].Reference", "ReturnValue.Field[crate::str::iter::MatchIndicesInternal(0)]", "value", "dfc-generated"]
+      - ["lang:core", "<crate::str::iter::MatchIndicesInternal as crate::clone::Clone>::clone", "Argument[self].Field[crate::str::iter::MatchIndicesInternal(0)].Reference", "ReturnValue.Field[crate::str::iter::MatchIndicesInternal(0)]", "value", "dfc-generated"]
       - ["lang:core", "<crate::str::iter::Matches as crate::clone::Clone>::clone", "Argument[self]", "ReturnValue", "taint", "df-generated"]
-      - ["lang:core", "<crate::str::iter::MatchesInternal as crate::clone::Clone>::clone", "Argument[self]", "ReturnValue", "taint", "df-generated"]
+      - ["lang:core", "<crate::str::iter::MatchesInternal as crate::clone::Clone>::clone", "Argument[self].Field[0].Reference", "ReturnValue.Field[crate::str::iter::MatchesInternal(0)]", "value", "dfc-generated"]
+      - ["lang:core", "<crate::str::iter::MatchesInternal as crate::clone::Clone>::clone", "Argument[self].Field[crate::str::iter::MatchesInternal(0)].Reference", "ReturnValue.Field[crate::str::iter::MatchesInternal(0)]", "value", "dfc-generated"]
       - ["lang:core", "<crate::str::iter::RMatchIndices as crate::clone::Clone>::clone", "Argument[self]", "ReturnValue", "taint", "df-generated"]
       - ["lang:core", "<crate::str::iter::RMatches as crate::clone::Clone>::clone", "Argument[self]", "ReturnValue", "taint", "df-generated"]
       - ["lang:core", "<crate::str::iter::RSplit as crate::clone::Clone>::clone", "Argument[self]", "ReturnValue", "taint", "df-generated"]
@@ -1331,7 +1745,6 @@ extensions:
       - ["lang:core", "<crate::str::iter::Split as crate::clone::Clone>::clone", "Argument[self]", "ReturnValue", "taint", "df-generated"]
       - ["lang:core", "<crate::str::iter::SplitInclusive as crate::clone::Clone>::clone", "Argument[self]", "ReturnValue", "taint", "df-generated"]
       - ["lang:core", "<crate::str::iter::SplitInternal as crate::clone::Clone>::clone", "Argument[self].Field[crate::str::iter::SplitInternal::matcher].Reference", "ReturnValue.Field[crate::str::iter::SplitInternal::matcher]", "value", "dfc-generated"]
-      - ["lang:core", "<crate::str::iter::SplitInternal as crate::clone::Clone>::clone", "Argument[self].Field[crate::str::iter::SplitInternal::matcher]", "ReturnValue.Field[crate::str::iter::SplitInternal::matcher]", "value", "dfc-generated"]
       - ["lang:core", "<crate::str::iter::SplitN as crate::clone::Clone>::clone", "Argument[self]", "ReturnValue", "taint", "df-generated"]
       - ["lang:core", "<crate::str::iter::SplitNInternal as crate::clone::Clone>::clone", "Argument[self].Field[crate::str::iter::SplitNInternal::iter].Reference", "ReturnValue.Field[crate::str::iter::SplitNInternal::iter]", "value", "dfc-generated"]
       - ["lang:core", "<crate::str::iter::SplitNInternal as crate::clone::Clone>::clone", "Argument[self].Field[crate::str::iter::SplitNInternal::iter]", "ReturnValue.Field[crate::str::iter::SplitNInternal::iter]", "value", "dfc-generated"]
@@ -1359,75 +1772,105 @@ extensions:
       - ["lang:core", "<crate::str::pattern::StrSearcher as crate::str::pattern::Searcher>::haystack", "Argument[self].Field[crate::str::pattern::StrSearcher::haystack]", "ReturnValue", "value", "dfc-generated"]
       - ["lang:core", "<crate::sync::atomic::AtomicBool>::from_mut", "Argument[0]", "ReturnValue", "taint", "df-generated"]
       - ["lang:core", "<crate::sync::atomic::AtomicBool>::from_mut_slice", "Argument[0]", "ReturnValue", "taint", "df-generated"]
+      - ["lang:core", "<crate::sync::atomic::AtomicBool>::get_mut", "Argument[self]", "ReturnValue", "taint", "df-generated"]
       - ["lang:core", "<crate::sync::atomic::AtomicBool>::get_mut_slice", "Argument[0]", "ReturnValue", "taint", "df-generated"]
       - ["lang:core", "<crate::sync::atomic::AtomicBool>::new", "Argument[0]", "ReturnValue", "taint", "df-generated"]
+      - ["lang:core", "<crate::sync::atomic::AtomicI128>::as_ptr", "Argument[self]", "ReturnValue", "taint", "df-generated"]
       - ["lang:core", "<crate::sync::atomic::AtomicI128>::from_mut", "Argument[0]", "ReturnValue", "taint", "df-generated"]
       - ["lang:core", "<crate::sync::atomic::AtomicI128>::from_mut_slice", "Argument[0]", "ReturnValue", "taint", "df-generated"]
+      - ["lang:core", "<crate::sync::atomic::AtomicI128>::get_mut", "Argument[self].Field[crate::sync::atomic::AtomicI128::v].Field[crate::cell::UnsafeCell::value]", "ReturnValue.Reference", "value", "dfc-generated"]
       - ["lang:core", "<crate::sync::atomic::AtomicI128>::get_mut_slice", "Argument[0]", "ReturnValue", "taint", "df-generated"]
       - ["lang:core", "<crate::sync::atomic::AtomicI128>::into_inner", "Argument[self].Field[crate::sync::atomic::AtomicI128::v].Field[crate::cell::UnsafeCell::value]", "ReturnValue", "value", "dfc-generated"]
       - ["lang:core", "<crate::sync::atomic::AtomicI128>::new", "Argument[0]", "ReturnValue.Field[crate::sync::atomic::AtomicI128::v].Field[crate::cell::UnsafeCell::value]", "value", "dfc-generated"]
+      - ["lang:core", "<crate::sync::atomic::AtomicI16>::as_ptr", "Argument[self]", "ReturnValue", "taint", "df-generated"]
       - ["lang:core", "<crate::sync::atomic::AtomicI16>::from_mut", "Argument[0]", "ReturnValue", "taint", "df-generated"]
       - ["lang:core", "<crate::sync::atomic::AtomicI16>::from_mut_slice", "Argument[0]", "ReturnValue", "taint", "df-generated"]
+      - ["lang:core", "<crate::sync::atomic::AtomicI16>::get_mut", "Argument[self].Field[crate::sync::atomic::AtomicI16::v].Field[crate::cell::UnsafeCell::value]", "ReturnValue.Reference", "value", "dfc-generated"]
       - ["lang:core", "<crate::sync::atomic::AtomicI16>::get_mut_slice", "Argument[0]", "ReturnValue", "taint", "df-generated"]
       - ["lang:core", "<crate::sync::atomic::AtomicI16>::into_inner", "Argument[self].Field[crate::sync::atomic::AtomicI16::v].Field[crate::cell::UnsafeCell::value]", "ReturnValue", "value", "dfc-generated"]
       - ["lang:core", "<crate::sync::atomic::AtomicI16>::new", "Argument[0]", "ReturnValue.Field[crate::sync::atomic::AtomicI16::v].Field[crate::cell::UnsafeCell::value]", "value", "dfc-generated"]
+      - ["lang:core", "<crate::sync::atomic::AtomicI32>::as_ptr", "Argument[self]", "ReturnValue", "taint", "df-generated"]
       - ["lang:core", "<crate::sync::atomic::AtomicI32>::from_mut", "Argument[0]", "ReturnValue", "taint", "df-generated"]
       - ["lang:core", "<crate::sync::atomic::AtomicI32>::from_mut_slice", "Argument[0]", "ReturnValue", "taint", "df-generated"]
+      - ["lang:core", "<crate::sync::atomic::AtomicI32>::get_mut", "Argument[self].Field[crate::sync::atomic::AtomicI32::v].Field[crate::cell::UnsafeCell::value]", "ReturnValue.Reference", "value", "dfc-generated"]
       - ["lang:core", "<crate::sync::atomic::AtomicI32>::get_mut_slice", "Argument[0]", "ReturnValue", "taint", "df-generated"]
       - ["lang:core", "<crate::sync::atomic::AtomicI32>::into_inner", "Argument[self].Field[crate::sync::atomic::AtomicI32::v].Field[crate::cell::UnsafeCell::value]", "ReturnValue", "value", "dfc-generated"]
       - ["lang:core", "<crate::sync::atomic::AtomicI32>::new", "Argument[0]", "ReturnValue.Field[crate::sync::atomic::AtomicI32::v].Field[crate::cell::UnsafeCell::value]", "value", "dfc-generated"]
+      - ["lang:core", "<crate::sync::atomic::AtomicI64>::as_ptr", "Argument[self]", "ReturnValue", "taint", "df-generated"]
       - ["lang:core", "<crate::sync::atomic::AtomicI64>::from_mut", "Argument[0]", "ReturnValue", "taint", "df-generated"]
       - ["lang:core", "<crate::sync::atomic::AtomicI64>::from_mut_slice", "Argument[0]", "ReturnValue", "taint", "df-generated"]
+      - ["lang:core", "<crate::sync::atomic::AtomicI64>::get_mut", "Argument[self].Field[crate::sync::atomic::AtomicI64::v].Field[crate::cell::UnsafeCell::value]", "ReturnValue.Reference", "value", "dfc-generated"]
       - ["lang:core", "<crate::sync::atomic::AtomicI64>::get_mut_slice", "Argument[0]", "ReturnValue", "taint", "df-generated"]
       - ["lang:core", "<crate::sync::atomic::AtomicI64>::into_inner", "Argument[self].Field[crate::sync::atomic::AtomicI64::v].Field[crate::cell::UnsafeCell::value]", "ReturnValue", "value", "dfc-generated"]
       - ["lang:core", "<crate::sync::atomic::AtomicI64>::new", "Argument[0]", "ReturnValue.Field[crate::sync::atomic::AtomicI64::v].Field[crate::cell::UnsafeCell::value]", "value", "dfc-generated"]
+      - ["lang:core", "<crate::sync::atomic::AtomicI8>::as_ptr", "Argument[self]", "ReturnValue", "taint", "df-generated"]
       - ["lang:core", "<crate::sync::atomic::AtomicI8>::from_mut", "Argument[0]", "ReturnValue", "taint", "df-generated"]
       - ["lang:core", "<crate::sync::atomic::AtomicI8>::from_mut_slice", "Argument[0]", "ReturnValue", "taint", "df-generated"]
+      - ["lang:core", "<crate::sync::atomic::AtomicI8>::get_mut", "Argument[self].Field[crate::sync::atomic::AtomicI8::v].Field[crate::cell::UnsafeCell::value]", "ReturnValue.Reference", "value", "dfc-generated"]
       - ["lang:core", "<crate::sync::atomic::AtomicI8>::get_mut_slice", "Argument[0]", "ReturnValue", "taint", "df-generated"]
       - ["lang:core", "<crate::sync::atomic::AtomicI8>::into_inner", "Argument[self].Field[crate::sync::atomic::AtomicI8::v].Field[crate::cell::UnsafeCell::value]", "ReturnValue", "value", "dfc-generated"]
       - ["lang:core", "<crate::sync::atomic::AtomicI8>::new", "Argument[0]", "ReturnValue.Field[crate::sync::atomic::AtomicI8::v].Field[crate::cell::UnsafeCell::value]", "value", "dfc-generated"]
+      - ["lang:core", "<crate::sync::atomic::AtomicIsize>::as_ptr", "Argument[self]", "ReturnValue", "taint", "df-generated"]
       - ["lang:core", "<crate::sync::atomic::AtomicIsize>::from_mut", "Argument[0]", "ReturnValue", "taint", "df-generated"]
       - ["lang:core", "<crate::sync::atomic::AtomicIsize>::from_mut_slice", "Argument[0]", "ReturnValue", "taint", "df-generated"]
+      - ["lang:core", "<crate::sync::atomic::AtomicIsize>::get_mut", "Argument[self].Field[crate::sync::atomic::AtomicIsize::v].Field[crate::cell::UnsafeCell::value]", "ReturnValue.Reference", "value", "dfc-generated"]
       - ["lang:core", "<crate::sync::atomic::AtomicIsize>::get_mut_slice", "Argument[0]", "ReturnValue", "taint", "df-generated"]
       - ["lang:core", "<crate::sync::atomic::AtomicIsize>::into_inner", "Argument[self].Field[crate::sync::atomic::AtomicIsize::v].Field[crate::cell::UnsafeCell::value]", "ReturnValue", "value", "dfc-generated"]
       - ["lang:core", "<crate::sync::atomic::AtomicIsize>::new", "Argument[0]", "ReturnValue.Field[crate::sync::atomic::AtomicIsize::v].Field[crate::cell::UnsafeCell::value]", "value", "dfc-generated"]
+      - ["lang:core", "<crate::sync::atomic::AtomicPtr>::as_ptr", "Argument[self]", "ReturnValue", "taint", "df-generated"]
       - ["lang:core", "<crate::sync::atomic::AtomicPtr>::from_mut", "Argument[0]", "ReturnValue", "taint", "df-generated"]
       - ["lang:core", "<crate::sync::atomic::AtomicPtr>::from_mut_slice", "Argument[0]", "ReturnValue", "taint", "df-generated"]
+      - ["lang:core", "<crate::sync::atomic::AtomicPtr>::get_mut", "Argument[self].Field[crate::sync::atomic::AtomicPtr::p].Field[crate::cell::UnsafeCell::value]", "ReturnValue.Reference", "value", "dfc-generated"]
       - ["lang:core", "<crate::sync::atomic::AtomicPtr>::get_mut_slice", "Argument[0]", "ReturnValue", "taint", "df-generated"]
       - ["lang:core", "<crate::sync::atomic::AtomicPtr>::into_inner", "Argument[self].Field[crate::sync::atomic::AtomicPtr::p].Field[crate::cell::UnsafeCell::value]", "ReturnValue", "value", "dfc-generated"]
       - ["lang:core", "<crate::sync::atomic::AtomicPtr>::new", "Argument[0]", "ReturnValue.Field[crate::sync::atomic::AtomicPtr::p].Field[crate::cell::UnsafeCell::value]", "value", "dfc-generated"]
+      - ["lang:core", "<crate::sync::atomic::AtomicU128>::as_ptr", "Argument[self]", "ReturnValue", "taint", "df-generated"]
       - ["lang:core", "<crate::sync::atomic::AtomicU128>::from_mut", "Argument[0]", "ReturnValue", "taint", "df-generated"]
       - ["lang:core", "<crate::sync::atomic::AtomicU128>::from_mut_slice", "Argument[0]", "ReturnValue", "taint", "df-generated"]
+      - ["lang:core", "<crate::sync::atomic::AtomicU128>::get_mut", "Argument[self].Field[crate::sync::atomic::AtomicU128::v].Field[crate::cell::UnsafeCell::value]", "ReturnValue.Reference", "value", "dfc-generated"]
       - ["lang:core", "<crate::sync::atomic::AtomicU128>::get_mut_slice", "Argument[0]", "ReturnValue", "taint", "df-generated"]
       - ["lang:core", "<crate::sync::atomic::AtomicU128>::into_inner", "Argument[self].Field[crate::sync::atomic::AtomicU128::v].Field[crate::cell::UnsafeCell::value]", "ReturnValue", "value", "dfc-generated"]
       - ["lang:core", "<crate::sync::atomic::AtomicU128>::new", "Argument[0]", "ReturnValue.Field[crate::sync::atomic::AtomicU128::v].Field[crate::cell::UnsafeCell::value]", "value", "dfc-generated"]
+      - ["lang:core", "<crate::sync::atomic::AtomicU16>::as_ptr", "Argument[self]", "ReturnValue", "taint", "df-generated"]
       - ["lang:core", "<crate::sync::atomic::AtomicU16>::from_mut", "Argument[0]", "ReturnValue", "taint", "df-generated"]
       - ["lang:core", "<crate::sync::atomic::AtomicU16>::from_mut_slice", "Argument[0]", "ReturnValue", "taint", "df-generated"]
+      - ["lang:core", "<crate::sync::atomic::AtomicU16>::get_mut", "Argument[self].Field[crate::sync::atomic::AtomicU16::v].Field[crate::cell::UnsafeCell::value]", "ReturnValue.Reference", "value", "dfc-generated"]
       - ["lang:core", "<crate::sync::atomic::AtomicU16>::get_mut_slice", "Argument[0]", "ReturnValue", "taint", "df-generated"]
       - ["lang:core", "<crate::sync::atomic::AtomicU16>::into_inner", "Argument[self].Field[crate::sync::atomic::AtomicU16::v].Field[crate::cell::UnsafeCell::value]", "ReturnValue", "value", "dfc-generated"]
       - ["lang:core", "<crate::sync::atomic::AtomicU16>::new", "Argument[0]", "ReturnValue.Field[crate::sync::atomic::AtomicU16::v].Field[crate::cell::UnsafeCell::value]", "value", "dfc-generated"]
+      - ["lang:core", "<crate::sync::atomic::AtomicU32>::as_ptr", "Argument[self]", "ReturnValue", "taint", "df-generated"]
       - ["lang:core", "<crate::sync::atomic::AtomicU32>::from_mut", "Argument[0]", "ReturnValue", "taint", "df-generated"]
       - ["lang:core", "<crate::sync::atomic::AtomicU32>::from_mut_slice", "Argument[0]", "ReturnValue", "taint", "df-generated"]
+      - ["lang:core", "<crate::sync::atomic::AtomicU32>::get_mut", "Argument[self].Field[crate::sync::atomic::AtomicU32::v].Field[crate::cell::UnsafeCell::value]", "ReturnValue.Reference", "value", "dfc-generated"]
       - ["lang:core", "<crate::sync::atomic::AtomicU32>::get_mut_slice", "Argument[0]", "ReturnValue", "taint", "df-generated"]
       - ["lang:core", "<crate::sync::atomic::AtomicU32>::into_inner", "Argument[self].Field[crate::sync::atomic::AtomicU32::v].Field[crate::cell::UnsafeCell::value]", "ReturnValue", "value", "dfc-generated"]
       - ["lang:core", "<crate::sync::atomic::AtomicU32>::new", "Argument[0]", "ReturnValue.Field[crate::sync::atomic::AtomicU32::v].Field[crate::cell::UnsafeCell::value]", "value", "dfc-generated"]
+      - ["lang:core", "<crate::sync::atomic::AtomicU64>::as_ptr", "Argument[self]", "ReturnValue", "taint", "df-generated"]
       - ["lang:core", "<crate::sync::atomic::AtomicU64>::from_mut", "Argument[0]", "ReturnValue", "taint", "df-generated"]
       - ["lang:core", "<crate::sync::atomic::AtomicU64>::from_mut_slice", "Argument[0]", "ReturnValue", "taint", "df-generated"]
+      - ["lang:core", "<crate::sync::atomic::AtomicU64>::get_mut", "Argument[self].Field[crate::sync::atomic::AtomicU64::v].Field[crate::cell::UnsafeCell::value]", "ReturnValue.Reference", "value", "dfc-generated"]
       - ["lang:core", "<crate::sync::atomic::AtomicU64>::get_mut_slice", "Argument[0]", "ReturnValue", "taint", "df-generated"]
       - ["lang:core", "<crate::sync::atomic::AtomicU64>::into_inner", "Argument[self].Field[crate::sync::atomic::AtomicU64::v].Field[crate::cell::UnsafeCell::value]", "ReturnValue", "value", "dfc-generated"]
       - ["lang:core", "<crate::sync::atomic::AtomicU64>::new", "Argument[0]", "ReturnValue.Field[crate::sync::atomic::AtomicU64::v].Field[crate::cell::UnsafeCell::value]", "value", "dfc-generated"]
+      - ["lang:core", "<crate::sync::atomic::AtomicU8>::as_ptr", "Argument[self]", "ReturnValue", "taint", "df-generated"]
       - ["lang:core", "<crate::sync::atomic::AtomicU8>::from_mut", "Argument[0]", "ReturnValue", "taint", "df-generated"]
       - ["lang:core", "<crate::sync::atomic::AtomicU8>::from_mut_slice", "Argument[0]", "ReturnValue", "taint", "df-generated"]
+      - ["lang:core", "<crate::sync::atomic::AtomicU8>::get_mut", "Argument[self].Field[crate::sync::atomic::AtomicU8::v].Field[crate::cell::UnsafeCell::value]", "ReturnValue.Reference", "value", "dfc-generated"]
       - ["lang:core", "<crate::sync::atomic::AtomicU8>::get_mut_slice", "Argument[0]", "ReturnValue", "taint", "df-generated"]
       - ["lang:core", "<crate::sync::atomic::AtomicU8>::into_inner", "Argument[self].Field[crate::sync::atomic::AtomicU8::v].Field[crate::cell::UnsafeCell::value]", "ReturnValue", "value", "dfc-generated"]
       - ["lang:core", "<crate::sync::atomic::AtomicU8>::new", "Argument[0]", "ReturnValue.Field[crate::sync::atomic::AtomicU8::v].Field[crate::cell::UnsafeCell::value]", "value", "dfc-generated"]
+      - ["lang:core", "<crate::sync::atomic::AtomicUsize>::as_ptr", "Argument[self]", "ReturnValue", "taint", "df-generated"]
       - ["lang:core", "<crate::sync::atomic::AtomicUsize>::from_mut", "Argument[0]", "ReturnValue", "taint", "df-generated"]
       - ["lang:core", "<crate::sync::atomic::AtomicUsize>::from_mut_slice", "Argument[0]", "ReturnValue", "taint", "df-generated"]
+      - ["lang:core", "<crate::sync::atomic::AtomicUsize>::get_mut", "Argument[self].Field[crate::sync::atomic::AtomicUsize::v].Field[crate::cell::UnsafeCell::value]", "ReturnValue.Reference", "value", "dfc-generated"]
       - ["lang:core", "<crate::sync::atomic::AtomicUsize>::get_mut_slice", "Argument[0]", "ReturnValue", "taint", "df-generated"]
       - ["lang:core", "<crate::sync::atomic::AtomicUsize>::into_inner", "Argument[self].Field[crate::sync::atomic::AtomicUsize::v].Field[crate::cell::UnsafeCell::value]", "ReturnValue", "value", "dfc-generated"]
       - ["lang:core", "<crate::sync::atomic::AtomicUsize>::new", "Argument[0]", "ReturnValue.Field[crate::sync::atomic::AtomicUsize::v].Field[crate::cell::UnsafeCell::value]", "value", "dfc-generated"]
       - ["lang:core", "<crate::sync::exclusive::Exclusive>::from_mut", "Argument[0]", "ReturnValue", "taint", "df-generated"]
+      - ["lang:core", "<crate::sync::exclusive::Exclusive>::from_pin_mut", "Argument[0]", "ReturnValue", "taint", "df-generated"]
       - ["lang:core", "<crate::sync::exclusive::Exclusive>::get_mut", "Argument[self].Field[crate::sync::exclusive::Exclusive::inner]", "ReturnValue.Reference", "value", "dfc-generated"]
+      - ["lang:core", "<crate::sync::exclusive::Exclusive>::get_pin_mut", "Argument[self].Field[crate::pin::Pin::__pointer].Field[crate::sync::exclusive::Exclusive::inner]", "ReturnValue.Field[crate::pin::Pin::__pointer].Reference", "value", "dfc-generated"]
+      - ["lang:core", "<crate::sync::exclusive::Exclusive>::get_pin_mut", "Argument[self].Field[crate::pin::Pin::__pointer].Field[crate::sync::exclusive::Exclusive::inner]", "ReturnValue", "value", "dfc-generated"]
       - ["lang:core", "<crate::sync::exclusive::Exclusive>::into_inner", "Argument[self].Field[crate::sync::exclusive::Exclusive::inner]", "ReturnValue", "value", "dfc-generated"]
       - ["lang:core", "<crate::sync::exclusive::Exclusive>::new", "Argument[0]", "ReturnValue.Field[crate::sync::exclusive::Exclusive::inner]", "value", "dfc-generated"]
       - ["lang:core", "<crate::task::poll::Poll as crate::convert::From>::from", "Argument[0]", "ReturnValue.Field[crate::task::poll::Poll::Ready(0)]", "value", "dfc-generated"]
@@ -1455,7 +1898,6 @@ extensions:
       - ["lang:core", "<crate::task::wake::ContextBuilder>::local_waker", "Argument[0]", "ReturnValue.Field[crate::task::wake::ContextBuilder::local_waker]", "value", "dfc-generated"]
       - ["lang:core", "<crate::task::wake::ContextBuilder>::waker", "Argument[0]", "ReturnValue.Field[crate::task::wake::ContextBuilder::waker]", "value", "dfc-generated"]
       - ["lang:core", "<crate::task::wake::LocalWaker as crate::clone::Clone>::clone_from", "Argument[0].Reference", "Argument[self].Reference", "value", "dfc-generated"]
-      - ["lang:core", "<crate::task::wake::LocalWaker as crate::clone::Clone>::clone_from", "Argument[0]", "Argument[self].Reference", "value", "dfc-generated"]
       - ["lang:core", "<crate::task::wake::LocalWaker>::data", "Argument[self].Field[crate::task::wake::LocalWaker::waker].Field[crate::task::wake::RawWaker::data]", "ReturnValue", "value", "dfc-generated"]
       - ["lang:core", "<crate::task::wake::LocalWaker>::from_raw", "Argument[0]", "ReturnValue.Field[crate::task::wake::LocalWaker::waker]", "value", "dfc-generated"]
       - ["lang:core", "<crate::task::wake::LocalWaker>::new", "Argument[0]", "ReturnValue.Field[crate::task::wake::LocalWaker::waker].Field[crate::task::wake::RawWaker::data]", "value", "dfc-generated"]
@@ -1468,12 +1910,12 @@ extensions:
       - ["lang:core", "<crate::task::wake::RawWakerVTable>::new", "Argument[2]", "ReturnValue.Field[crate::task::wake::RawWakerVTable::wake_by_ref]", "value", "dfc-generated"]
       - ["lang:core", "<crate::task::wake::RawWakerVTable>::new", "Argument[3]", "ReturnValue.Field[crate::task::wake::RawWakerVTable::drop]", "value", "dfc-generated"]
       - ["lang:core", "<crate::task::wake::Waker as crate::clone::Clone>::clone_from", "Argument[0].Reference", "Argument[self].Reference", "value", "dfc-generated"]
-      - ["lang:core", "<crate::task::wake::Waker as crate::clone::Clone>::clone_from", "Argument[0]", "Argument[self].Reference", "value", "dfc-generated"]
       - ["lang:core", "<crate::task::wake::Waker>::data", "Argument[self].Field[crate::task::wake::Waker::waker].Field[crate::task::wake::RawWaker::data]", "ReturnValue", "value", "dfc-generated"]
       - ["lang:core", "<crate::task::wake::Waker>::from_raw", "Argument[0]", "ReturnValue.Field[crate::task::wake::Waker::waker]", "value", "dfc-generated"]
       - ["lang:core", "<crate::task::wake::Waker>::new", "Argument[0]", "ReturnValue.Field[crate::task::wake::Waker::waker].Field[crate::task::wake::RawWaker::data]", "value", "dfc-generated"]
       - ["lang:core", "<crate::task::wake::Waker>::new", "Argument[1]", "ReturnValue.Field[crate::task::wake::Waker::waker].Field[crate::task::wake::RawWaker::vtable]", "value", "dfc-generated"]
       - ["lang:core", "<crate::task::wake::Waker>::vtable", "Argument[self].Field[crate::task::wake::Waker::waker].Field[crate::task::wake::RawWaker::vtable]", "ReturnValue", "value", "dfc-generated"]
+      - ["lang:core", "<crate::time::Duration as crate::fmt::Debug>::fmt", "Argument[0]", "ReturnValue", "taint", "df-generated"]
       - ["lang:core", "<crate::time::Duration as crate::ops::arith::AddAssign>::add_assign", "Argument[0]", "Argument[self]", "taint", "df-generated"]
       - ["lang:core", "<crate::time::Duration as crate::ops::arith::Div>::div", "Argument[0]", "ReturnValue", "taint", "df-generated"]
       - ["lang:core", "<crate::time::Duration as crate::ops::arith::Div>::div", "Argument[self]", "ReturnValue", "taint", "df-generated"]
@@ -1506,6 +1948,7 @@ extensions:
       - ["lang:core", "<crate::time::Duration>::new", "Argument[0]", "ReturnValue.Field[crate::time::Duration::secs]", "value", "dfc-generated"]
       - ["lang:core", "<crate::time::Duration>::new", "Argument[1]", "ReturnValue.Field[crate::time::Duration::nanos].Field[crate::num::niche_types::Nanoseconds(0)]", "value", "dfc-generated"]
       - ["lang:core", "<crate::time::Duration>::saturating_mul", "Argument[0]", "ReturnValue", "taint", "df-generated"]
+      - ["lang:core", "<crate::time::TryFromFloatSecsError as crate::fmt::Display>::fmt", "Argument[0]", "ReturnValue", "taint", "df-generated"]
       - ["lang:core", "<dyn crate::any::Any>::downcast_mut_unchecked", "Argument[self]", "ReturnValue", "taint", "df-generated"]
       - ["lang:core", "<dyn crate::any::Any>::downcast_ref_unchecked", "Argument[self]", "ReturnValue", "taint", "df-generated"]
       - ["lang:core", "<dyn crate::error::Error>::downcast_mut", "Argument[self]", "ReturnValue", "taint", "df-generated"]
@@ -1539,6 +1982,7 @@ extensions:
       - ["lang:core", "<f128>::to_degrees", "Argument[self]", "ReturnValue", "taint", "df-generated"]
       - ["lang:core", "<f128>::to_radians", "Argument[self]", "ReturnValue", "taint", "df-generated"]
       - ["lang:core", "<f16 as crate::clone::Clone>::clone", "Argument[self].Reference", "ReturnValue", "value", "dfc-generated"]
+      - ["lang:core", "<f16 as crate::convert::From>::from", "Argument[0]", "ReturnValue", "taint", "df-generated"]
       - ["lang:core", "<f16 as crate::ops::arith::Add>::add", "Argument[0]", "ReturnValue", "taint", "df-generated"]
       - ["lang:core", "<f16 as crate::ops::arith::Add>::add", "Argument[self]", "ReturnValue", "taint", "df-generated"]
       - ["lang:core", "<f16 as crate::ops::arith::Div>::div", "Argument[0]", "ReturnValue", "taint", "df-generated"]
@@ -1566,6 +2010,10 @@ extensions:
       - ["lang:core", "<f16>::to_radians", "Argument[self]", "ReturnValue", "taint", "df-generated"]
       - ["lang:core", "<f32 as crate::clone::Clone>::clone", "Argument[self].Reference", "ReturnValue", "value", "dfc-generated"]
       - ["lang:core", "<f32 as crate::convert::From>::from", "Argument[0]", "ReturnValue", "taint", "df-generated"]
+      - ["lang:core", "<f32 as crate::fmt::Debug>::fmt", "Argument[0]", "ReturnValue", "taint", "df-generated"]
+      - ["lang:core", "<f32 as crate::fmt::Display>::fmt", "Argument[0]", "ReturnValue", "taint", "df-generated"]
+      - ["lang:core", "<f32 as crate::fmt::LowerExp>::fmt", "Argument[0]", "ReturnValue", "taint", "df-generated"]
+      - ["lang:core", "<f32 as crate::fmt::UpperExp>::fmt", "Argument[0]", "ReturnValue", "taint", "df-generated"]
       - ["lang:core", "<f32 as crate::num::dec2flt::float::RawFloat>::from_u64", "Argument[0]", "ReturnValue", "taint", "df-generated"]
       - ["lang:core", "<f32 as crate::ops::arith::Add>::add", "Argument[0]", "ReturnValue", "taint", "df-generated"]
       - ["lang:core", "<f32 as crate::ops::arith::Add>::add", "Argument[self]", "ReturnValue", "taint", "df-generated"]
@@ -1592,6 +2040,10 @@ extensions:
       - ["lang:core", "<f32>::to_radians", "Argument[self]", "ReturnValue", "taint", "df-generated"]
       - ["lang:core", "<f64 as crate::clone::Clone>::clone", "Argument[self].Reference", "ReturnValue", "value", "dfc-generated"]
       - ["lang:core", "<f64 as crate::convert::From>::from", "Argument[0]", "ReturnValue", "taint", "df-generated"]
+      - ["lang:core", "<f64 as crate::fmt::Debug>::fmt", "Argument[0]", "ReturnValue", "taint", "df-generated"]
+      - ["lang:core", "<f64 as crate::fmt::Display>::fmt", "Argument[0]", "ReturnValue", "taint", "df-generated"]
+      - ["lang:core", "<f64 as crate::fmt::LowerExp>::fmt", "Argument[0]", "ReturnValue", "taint", "df-generated"]
+      - ["lang:core", "<f64 as crate::fmt::UpperExp>::fmt", "Argument[0]", "ReturnValue", "taint", "df-generated"]
       - ["lang:core", "<f64 as crate::num::dec2flt::float::RawFloat>::from_u64", "Argument[0]", "ReturnValue", "taint", "df-generated"]
       - ["lang:core", "<f64 as crate::ops::arith::Add>::add", "Argument[0]", "ReturnValue", "taint", "df-generated"]
       - ["lang:core", "<f64 as crate::ops::arith::Add>::add", "Argument[self]", "ReturnValue", "taint", "df-generated"]
@@ -1621,6 +2073,13 @@ extensions:
       - ["lang:core", "<i128 as crate::clone::Clone>::clone", "Argument[self].Reference", "ReturnValue", "value", "dfc-generated"]
       - ["lang:core", "<i128 as crate::convert::From>::from", "Argument[0]", "ReturnValue", "taint", "df-generated"]
       - ["lang:core", "<i128 as crate::convert::TryFrom>::try_from", "Argument[0]", "ReturnValue", "taint", "df-generated"]
+      - ["lang:core", "<i128 as crate::fmt::Binary>::fmt", "Argument[0]", "ReturnValue", "taint", "df-generated"]
+      - ["lang:core", "<i128 as crate::fmt::Display>::fmt", "Argument[0]", "ReturnValue", "taint", "df-generated"]
+      - ["lang:core", "<i128 as crate::fmt::LowerExp>::fmt", "Argument[0]", "ReturnValue", "taint", "df-generated"]
+      - ["lang:core", "<i128 as crate::fmt::LowerHex>::fmt", "Argument[0]", "ReturnValue", "taint", "df-generated"]
+      - ["lang:core", "<i128 as crate::fmt::Octal>::fmt", "Argument[0]", "ReturnValue", "taint", "df-generated"]
+      - ["lang:core", "<i128 as crate::fmt::UpperExp>::fmt", "Argument[0]", "ReturnValue", "taint", "df-generated"]
+      - ["lang:core", "<i128 as crate::fmt::UpperHex>::fmt", "Argument[0]", "ReturnValue", "taint", "df-generated"]
       - ["lang:core", "<i128 as crate::fmt::num::DisplayInt>::from_u8", "Argument[0]", "ReturnValue", "taint", "df-generated"]
       - ["lang:core", "<i128 as crate::fmt::num::DisplayInt>::to_u128", "Argument[self]", "ReturnValue", "taint", "df-generated"]
       - ["lang:core", "<i128 as crate::fmt::num::DisplayInt>::to_u64", "Argument[self]", "ReturnValue", "taint", "df-generated"]
@@ -1679,6 +2138,13 @@ extensions:
       - ["lang:core", "<i16 as crate::clone::Clone>::clone", "Argument[self].Reference", "ReturnValue", "value", "dfc-generated"]
       - ["lang:core", "<i16 as crate::convert::From>::from", "Argument[0]", "ReturnValue", "taint", "df-generated"]
       - ["lang:core", "<i16 as crate::convert::TryFrom>::try_from", "Argument[0]", "ReturnValue", "taint", "df-generated"]
+      - ["lang:core", "<i16 as crate::fmt::Binary>::fmt", "Argument[0]", "ReturnValue", "taint", "df-generated"]
+      - ["lang:core", "<i16 as crate::fmt::Display>::fmt", "Argument[0]", "ReturnValue", "taint", "df-generated"]
+      - ["lang:core", "<i16 as crate::fmt::LowerExp>::fmt", "Argument[0]", "ReturnValue", "taint", "df-generated"]
+      - ["lang:core", "<i16 as crate::fmt::LowerHex>::fmt", "Argument[0]", "ReturnValue", "taint", "df-generated"]
+      - ["lang:core", "<i16 as crate::fmt::Octal>::fmt", "Argument[0]", "ReturnValue", "taint", "df-generated"]
+      - ["lang:core", "<i16 as crate::fmt::UpperExp>::fmt", "Argument[0]", "ReturnValue", "taint", "df-generated"]
+      - ["lang:core", "<i16 as crate::fmt::UpperHex>::fmt", "Argument[0]", "ReturnValue", "taint", "df-generated"]
       - ["lang:core", "<i16 as crate::fmt::num::DisplayInt>::from_u8", "Argument[0]", "ReturnValue", "taint", "df-generated"]
       - ["lang:core", "<i16 as crate::fmt::num::DisplayInt>::to_u128", "Argument[self]", "ReturnValue", "taint", "df-generated"]
       - ["lang:core", "<i16 as crate::fmt::num::DisplayInt>::to_u64", "Argument[self]", "ReturnValue", "taint", "df-generated"]
@@ -1741,6 +2207,13 @@ extensions:
       - ["lang:core", "<i32 as crate::clone::Clone>::clone", "Argument[self].Reference", "ReturnValue", "value", "dfc-generated"]
       - ["lang:core", "<i32 as crate::convert::From>::from", "Argument[0]", "ReturnValue", "taint", "df-generated"]
       - ["lang:core", "<i32 as crate::convert::TryFrom>::try_from", "Argument[0]", "ReturnValue", "taint", "df-generated"]
+      - ["lang:core", "<i32 as crate::fmt::Binary>::fmt", "Argument[0]", "ReturnValue", "taint", "df-generated"]
+      - ["lang:core", "<i32 as crate::fmt::Display>::fmt", "Argument[0]", "ReturnValue", "taint", "df-generated"]
+      - ["lang:core", "<i32 as crate::fmt::LowerExp>::fmt", "Argument[0]", "ReturnValue", "taint", "df-generated"]
+      - ["lang:core", "<i32 as crate::fmt::LowerHex>::fmt", "Argument[0]", "ReturnValue", "taint", "df-generated"]
+      - ["lang:core", "<i32 as crate::fmt::Octal>::fmt", "Argument[0]", "ReturnValue", "taint", "df-generated"]
+      - ["lang:core", "<i32 as crate::fmt::UpperExp>::fmt", "Argument[0]", "ReturnValue", "taint", "df-generated"]
+      - ["lang:core", "<i32 as crate::fmt::UpperHex>::fmt", "Argument[0]", "ReturnValue", "taint", "df-generated"]
       - ["lang:core", "<i32 as crate::fmt::num::DisplayInt>::from_u8", "Argument[0]", "ReturnValue", "taint", "df-generated"]
       - ["lang:core", "<i32 as crate::fmt::num::DisplayInt>::to_u128", "Argument[self]", "ReturnValue", "taint", "df-generated"]
       - ["lang:core", "<i32 as crate::fmt::num::DisplayInt>::to_u64", "Argument[self]", "ReturnValue", "taint", "df-generated"]
@@ -1803,6 +2276,13 @@ extensions:
       - ["lang:core", "<i64 as crate::clone::Clone>::clone", "Argument[self].Reference", "ReturnValue", "value", "dfc-generated"]
       - ["lang:core", "<i64 as crate::convert::From>::from", "Argument[0]", "ReturnValue", "taint", "df-generated"]
       - ["lang:core", "<i64 as crate::convert::TryFrom>::try_from", "Argument[0]", "ReturnValue", "taint", "df-generated"]
+      - ["lang:core", "<i64 as crate::fmt::Binary>::fmt", "Argument[0]", "ReturnValue", "taint", "df-generated"]
+      - ["lang:core", "<i64 as crate::fmt::Display>::fmt", "Argument[0]", "ReturnValue", "taint", "df-generated"]
+      - ["lang:core", "<i64 as crate::fmt::LowerExp>::fmt", "Argument[0]", "ReturnValue", "taint", "df-generated"]
+      - ["lang:core", "<i64 as crate::fmt::LowerHex>::fmt", "Argument[0]", "ReturnValue", "taint", "df-generated"]
+      - ["lang:core", "<i64 as crate::fmt::Octal>::fmt", "Argument[0]", "ReturnValue", "taint", "df-generated"]
+      - ["lang:core", "<i64 as crate::fmt::UpperExp>::fmt", "Argument[0]", "ReturnValue", "taint", "df-generated"]
+      - ["lang:core", "<i64 as crate::fmt::UpperHex>::fmt", "Argument[0]", "ReturnValue", "taint", "df-generated"]
       - ["lang:core", "<i64 as crate::fmt::num::DisplayInt>::from_u8", "Argument[0]", "ReturnValue", "taint", "df-generated"]
       - ["lang:core", "<i64 as crate::fmt::num::DisplayInt>::to_u128", "Argument[self]", "ReturnValue", "taint", "df-generated"]
       - ["lang:core", "<i64 as crate::fmt::num::DisplayInt>::to_u64", "Argument[self]", "ReturnValue", "taint", "df-generated"]
@@ -1865,6 +2345,13 @@ extensions:
       - ["lang:core", "<i8 as crate::clone::Clone>::clone", "Argument[self].Reference", "ReturnValue", "value", "dfc-generated"]
       - ["lang:core", "<i8 as crate::convert::From>::from", "Argument[0]", "ReturnValue", "taint", "df-generated"]
       - ["lang:core", "<i8 as crate::convert::TryFrom>::try_from", "Argument[0]", "ReturnValue", "taint", "df-generated"]
+      - ["lang:core", "<i8 as crate::fmt::Binary>::fmt", "Argument[0]", "ReturnValue", "taint", "df-generated"]
+      - ["lang:core", "<i8 as crate::fmt::Display>::fmt", "Argument[0]", "ReturnValue", "taint", "df-generated"]
+      - ["lang:core", "<i8 as crate::fmt::LowerExp>::fmt", "Argument[0]", "ReturnValue", "taint", "df-generated"]
+      - ["lang:core", "<i8 as crate::fmt::LowerHex>::fmt", "Argument[0]", "ReturnValue", "taint", "df-generated"]
+      - ["lang:core", "<i8 as crate::fmt::Octal>::fmt", "Argument[0]", "ReturnValue", "taint", "df-generated"]
+      - ["lang:core", "<i8 as crate::fmt::UpperExp>::fmt", "Argument[0]", "ReturnValue", "taint", "df-generated"]
+      - ["lang:core", "<i8 as crate::fmt::UpperHex>::fmt", "Argument[0]", "ReturnValue", "taint", "df-generated"]
       - ["lang:core", "<i8 as crate::fmt::num::DisplayInt>::from_u8", "Argument[0]", "ReturnValue", "taint", "df-generated"]
       - ["lang:core", "<i8 as crate::fmt::num::DisplayInt>::to_u128", "Argument[self]", "ReturnValue", "taint", "df-generated"]
       - ["lang:core", "<i8 as crate::fmt::num::DisplayInt>::to_u64", "Argument[self]", "ReturnValue", "taint", "df-generated"]
@@ -1927,6 +2414,13 @@ extensions:
       - ["lang:core", "<isize as crate::clone::Clone>::clone", "Argument[self].Reference", "ReturnValue", "value", "dfc-generated"]
       - ["lang:core", "<isize as crate::convert::From>::from", "Argument[0]", "ReturnValue", "taint", "df-generated"]
       - ["lang:core", "<isize as crate::convert::TryFrom>::try_from", "Argument[0]", "ReturnValue", "taint", "df-generated"]
+      - ["lang:core", "<isize as crate::fmt::Binary>::fmt", "Argument[0]", "ReturnValue", "taint", "df-generated"]
+      - ["lang:core", "<isize as crate::fmt::Display>::fmt", "Argument[0]", "ReturnValue", "taint", "df-generated"]
+      - ["lang:core", "<isize as crate::fmt::LowerExp>::fmt", "Argument[0]", "ReturnValue", "taint", "df-generated"]
+      - ["lang:core", "<isize as crate::fmt::LowerHex>::fmt", "Argument[0]", "ReturnValue", "taint", "df-generated"]
+      - ["lang:core", "<isize as crate::fmt::Octal>::fmt", "Argument[0]", "ReturnValue", "taint", "df-generated"]
+      - ["lang:core", "<isize as crate::fmt::UpperExp>::fmt", "Argument[0]", "ReturnValue", "taint", "df-generated"]
+      - ["lang:core", "<isize as crate::fmt::UpperHex>::fmt", "Argument[0]", "ReturnValue", "taint", "df-generated"]
       - ["lang:core", "<isize as crate::fmt::num::DisplayInt>::from_u8", "Argument[0]", "ReturnValue", "taint", "df-generated"]
       - ["lang:core", "<isize as crate::fmt::num::DisplayInt>::to_u128", "Argument[self]", "ReturnValue", "taint", "df-generated"]
       - ["lang:core", "<isize as crate::fmt::num::DisplayInt>::to_u64", "Argument[self]", "ReturnValue", "taint", "df-generated"]
@@ -1989,16 +2483,25 @@ extensions:
       - ["lang:core", "<str as crate::convert::AsMut>::as_mut", "Argument[self]", "ReturnValue", "value", "dfc-generated"]
       - ["lang:core", "<str as crate::convert::AsRef>::as_ref", "Argument[self]", "ReturnValue", "taint", "df-generated"]
       - ["lang:core", "<str as crate::convert::AsRef>::as_ref", "Argument[self]", "ReturnValue", "value", "dfc-generated"]
+      - ["lang:core", "<str as crate::fmt::Display>::fmt", "Argument[0]", "ReturnValue", "taint", "df-generated"]
       - ["lang:core", "<str>::as_bytes_mut", "Argument[self]", "ReturnValue", "taint", "df-generated"]
       - ["lang:core", "<str>::as_mut_ptr", "Argument[self]", "ReturnValue", "taint", "df-generated"]
       - ["lang:core", "<str>::as_ptr", "Argument[self]", "ReturnValue", "taint", "df-generated"]
       - ["lang:core", "<str>::as_str", "Argument[self]", "ReturnValue", "value", "dfc-generated"]
       - ["lang:core", "<str>::from_utf8_mut", "Argument[0]", "ReturnValue", "taint", "df-generated"]
       - ["lang:core", "<str>::from_utf8_unchecked_mut", "Argument[0]", "ReturnValue", "taint", "df-generated"]
+      - ["lang:core", "<str>::rsplitn", "Argument[0]", "ReturnValue.Field[crate::str::iter::RSplitN(0)].Field[crate::str::iter::SplitNInternal::count]", "value", "dfc-generated"]
       - ["lang:core", "<str>::splitn", "Argument[0]", "ReturnValue.Field[crate::str::iter::SplitN(0)].Field[crate::str::iter::SplitNInternal::count]", "value", "dfc-generated"]
       - ["lang:core", "<u128 as crate::clone::Clone>::clone", "Argument[self].Reference", "ReturnValue", "value", "dfc-generated"]
       - ["lang:core", "<u128 as crate::convert::From>::from", "Argument[0]", "ReturnValue", "taint", "df-generated"]
       - ["lang:core", "<u128 as crate::convert::TryFrom>::try_from", "Argument[0]", "ReturnValue", "taint", "df-generated"]
+      - ["lang:core", "<u128 as crate::fmt::Binary>::fmt", "Argument[0]", "ReturnValue", "taint", "df-generated"]
+      - ["lang:core", "<u128 as crate::fmt::Display>::fmt", "Argument[0]", "ReturnValue", "taint", "df-generated"]
+      - ["lang:core", "<u128 as crate::fmt::LowerExp>::fmt", "Argument[0]", "ReturnValue", "taint", "df-generated"]
+      - ["lang:core", "<u128 as crate::fmt::LowerHex>::fmt", "Argument[0]", "ReturnValue", "taint", "df-generated"]
+      - ["lang:core", "<u128 as crate::fmt::Octal>::fmt", "Argument[0]", "ReturnValue", "taint", "df-generated"]
+      - ["lang:core", "<u128 as crate::fmt::UpperExp>::fmt", "Argument[0]", "ReturnValue", "taint", "df-generated"]
+      - ["lang:core", "<u128 as crate::fmt::UpperHex>::fmt", "Argument[0]", "ReturnValue", "taint", "df-generated"]
       - ["lang:core", "<u128 as crate::fmt::num::DisplayInt>::from_u8", "Argument[0]", "ReturnValue", "taint", "df-generated"]
       - ["lang:core", "<u128 as crate::fmt::num::DisplayInt>::to_u128", "Argument[self]", "ReturnValue", "taint", "df-generated"]
       - ["lang:core", "<u128 as crate::fmt::num::DisplayInt>::to_u64", "Argument[self]", "ReturnValue", "taint", "df-generated"]
@@ -2073,6 +2576,12 @@ extensions:
       - ["lang:core", "<u16 as crate::clone::Clone>::clone", "Argument[self].Reference", "ReturnValue", "value", "dfc-generated"]
       - ["lang:core", "<u16 as crate::convert::From>::from", "Argument[0]", "ReturnValue", "taint", "df-generated"]
       - ["lang:core", "<u16 as crate::convert::TryFrom>::try_from", "Argument[0]", "ReturnValue", "taint", "df-generated"]
+      - ["lang:core", "<u16 as crate::fmt::Binary>::fmt", "Argument[0]", "ReturnValue", "taint", "df-generated"]
+      - ["lang:core", "<u16 as crate::fmt::LowerExp>::fmt", "Argument[0]", "ReturnValue", "taint", "df-generated"]
+      - ["lang:core", "<u16 as crate::fmt::LowerHex>::fmt", "Argument[0]", "ReturnValue", "taint", "df-generated"]
+      - ["lang:core", "<u16 as crate::fmt::Octal>::fmt", "Argument[0]", "ReturnValue", "taint", "df-generated"]
+      - ["lang:core", "<u16 as crate::fmt::UpperExp>::fmt", "Argument[0]", "ReturnValue", "taint", "df-generated"]
+      - ["lang:core", "<u16 as crate::fmt::UpperHex>::fmt", "Argument[0]", "ReturnValue", "taint", "df-generated"]
       - ["lang:core", "<u16 as crate::fmt::num::DisplayInt>::from_u8", "Argument[0]", "ReturnValue", "taint", "df-generated"]
       - ["lang:core", "<u16 as crate::fmt::num::DisplayInt>::to_u128", "Argument[self]", "ReturnValue", "taint", "df-generated"]
       - ["lang:core", "<u16 as crate::fmt::num::DisplayInt>::to_u64", "Argument[self]", "ReturnValue", "taint", "df-generated"]
@@ -2160,6 +2669,12 @@ extensions:
       - ["lang:core", "<u32 as crate::clone::Clone>::clone", "Argument[self].Reference", "ReturnValue", "value", "dfc-generated"]
       - ["lang:core", "<u32 as crate::convert::From>::from", "Argument[0]", "ReturnValue", "taint", "df-generated"]
       - ["lang:core", "<u32 as crate::convert::TryFrom>::try_from", "Argument[0]", "ReturnValue", "taint", "df-generated"]
+      - ["lang:core", "<u32 as crate::fmt::Binary>::fmt", "Argument[0]", "ReturnValue", "taint", "df-generated"]
+      - ["lang:core", "<u32 as crate::fmt::LowerExp>::fmt", "Argument[0]", "ReturnValue", "taint", "df-generated"]
+      - ["lang:core", "<u32 as crate::fmt::LowerHex>::fmt", "Argument[0]", "ReturnValue", "taint", "df-generated"]
+      - ["lang:core", "<u32 as crate::fmt::Octal>::fmt", "Argument[0]", "ReturnValue", "taint", "df-generated"]
+      - ["lang:core", "<u32 as crate::fmt::UpperExp>::fmt", "Argument[0]", "ReturnValue", "taint", "df-generated"]
+      - ["lang:core", "<u32 as crate::fmt::UpperHex>::fmt", "Argument[0]", "ReturnValue", "taint", "df-generated"]
       - ["lang:core", "<u32 as crate::fmt::num::DisplayInt>::from_u8", "Argument[0]", "ReturnValue", "taint", "df-generated"]
       - ["lang:core", "<u32 as crate::fmt::num::DisplayInt>::to_u128", "Argument[self]", "ReturnValue", "taint", "df-generated"]
       - ["lang:core", "<u32 as crate::fmt::num::DisplayInt>::to_u64", "Argument[self]", "ReturnValue", "taint", "df-generated"]
@@ -2179,6 +2694,7 @@ extensions:
       - ["lang:core", "<u32 as crate::num::bignum::FullOps>::full_mul_add", "Argument[1]", "ReturnValue", "taint", "df-generated"]
       - ["lang:core", "<u32 as crate::num::bignum::FullOps>::full_mul_add", "Argument[2]", "ReturnValue", "taint", "df-generated"]
       - ["lang:core", "<u32 as crate::num::bignum::FullOps>::full_mul_add", "Argument[self]", "ReturnValue", "taint", "df-generated"]
+      - ["lang:core", "<u32 as crate::num::dec2flt::float::CastInto>::cast", "Argument[self]", "ReturnValue", "taint", "df-generated"]
       - ["lang:core", "<u32 as crate::ops::arith::Add>::add", "Argument[0]", "ReturnValue", "taint", "df-generated"]
       - ["lang:core", "<u32 as crate::ops::arith::Add>::add", "Argument[self]", "ReturnValue", "taint", "df-generated"]
       - ["lang:core", "<u32 as crate::ops::arith::Div>::div", "Argument[0]", "ReturnValue", "taint", "df-generated"]
@@ -2247,6 +2763,12 @@ extensions:
       - ["lang:core", "<u64 as crate::clone::Clone>::clone", "Argument[self].Reference", "ReturnValue", "value", "dfc-generated"]
       - ["lang:core", "<u64 as crate::convert::From>::from", "Argument[0]", "ReturnValue", "taint", "df-generated"]
       - ["lang:core", "<u64 as crate::convert::TryFrom>::try_from", "Argument[0]", "ReturnValue", "taint", "df-generated"]
+      - ["lang:core", "<u64 as crate::fmt::Binary>::fmt", "Argument[0]", "ReturnValue", "taint", "df-generated"]
+      - ["lang:core", "<u64 as crate::fmt::LowerExp>::fmt", "Argument[0]", "ReturnValue", "taint", "df-generated"]
+      - ["lang:core", "<u64 as crate::fmt::LowerHex>::fmt", "Argument[0]", "ReturnValue", "taint", "df-generated"]
+      - ["lang:core", "<u64 as crate::fmt::Octal>::fmt", "Argument[0]", "ReturnValue", "taint", "df-generated"]
+      - ["lang:core", "<u64 as crate::fmt::UpperExp>::fmt", "Argument[0]", "ReturnValue", "taint", "df-generated"]
+      - ["lang:core", "<u64 as crate::fmt::UpperHex>::fmt", "Argument[0]", "ReturnValue", "taint", "df-generated"]
       - ["lang:core", "<u64 as crate::fmt::num::DisplayInt>::from_u8", "Argument[0]", "ReturnValue", "taint", "df-generated"]
       - ["lang:core", "<u64 as crate::fmt::num::DisplayInt>::to_u128", "Argument[self]", "ReturnValue", "taint", "df-generated"]
       - ["lang:core", "<u64 as crate::fmt::num::DisplayInt>::to_u64", "Argument[self]", "ReturnValue", "taint", "df-generated"]
@@ -2259,6 +2781,7 @@ extensions:
       - ["lang:core", "<u64 as crate::intrinsics::fallback::DisjointBitOr>::disjoint_bitor", "Argument[self]", "ReturnValue", "taint", "df-generated"]
       - ["lang:core", "<u64 as crate::iter::range::Step>::steps_between", "Argument[0]", "ReturnValue", "taint", "df-generated"]
       - ["lang:core", "<u64 as crate::iter::range::Step>::steps_between", "Argument[1]", "ReturnValue", "taint", "df-generated"]
+      - ["lang:core", "<u64 as crate::num::dec2flt::float::CastInto>::cast", "Argument[self]", "ReturnValue", "taint", "df-generated"]
       - ["lang:core", "<u64 as crate::ops::arith::Add>::add", "Argument[0]", "ReturnValue", "taint", "df-generated"]
       - ["lang:core", "<u64 as crate::ops::arith::Add>::add", "Argument[self]", "ReturnValue", "taint", "df-generated"]
       - ["lang:core", "<u64 as crate::ops::arith::Div>::div", "Argument[0]", "ReturnValue", "taint", "df-generated"]
@@ -2327,6 +2850,12 @@ extensions:
       - ["lang:core", "<u8 as crate::clone::Clone>::clone", "Argument[self].Reference", "ReturnValue", "value", "dfc-generated"]
       - ["lang:core", "<u8 as crate::convert::From>::from", "Argument[0]", "ReturnValue", "taint", "df-generated"]
       - ["lang:core", "<u8 as crate::convert::TryFrom>::try_from", "Argument[0]", "ReturnValue", "taint", "df-generated"]
+      - ["lang:core", "<u8 as crate::fmt::Binary>::fmt", "Argument[0]", "ReturnValue", "taint", "df-generated"]
+      - ["lang:core", "<u8 as crate::fmt::LowerExp>::fmt", "Argument[0]", "ReturnValue", "taint", "df-generated"]
+      - ["lang:core", "<u8 as crate::fmt::LowerHex>::fmt", "Argument[0]", "ReturnValue", "taint", "df-generated"]
+      - ["lang:core", "<u8 as crate::fmt::Octal>::fmt", "Argument[0]", "ReturnValue", "taint", "df-generated"]
+      - ["lang:core", "<u8 as crate::fmt::UpperExp>::fmt", "Argument[0]", "ReturnValue", "taint", "df-generated"]
+      - ["lang:core", "<u8 as crate::fmt::UpperHex>::fmt", "Argument[0]", "ReturnValue", "taint", "df-generated"]
       - ["lang:core", "<u8 as crate::fmt::num::DisplayInt>::from_u8", "Argument[0]", "ReturnValue", "taint", "df-generated"]
       - ["lang:core", "<u8 as crate::fmt::num::DisplayInt>::to_u128", "Argument[self]", "ReturnValue", "taint", "df-generated"]
       - ["lang:core", "<u8 as crate::fmt::num::DisplayInt>::to_u64", "Argument[self]", "ReturnValue", "taint", "df-generated"]
@@ -2417,6 +2946,12 @@ extensions:
       - ["lang:core", "<usize as crate::clone::Clone>::clone", "Argument[self].Reference", "ReturnValue", "value", "dfc-generated"]
       - ["lang:core", "<usize as crate::convert::From>::from", "Argument[0]", "ReturnValue", "taint", "df-generated"]
       - ["lang:core", "<usize as crate::convert::TryFrom>::try_from", "Argument[0]", "ReturnValue", "taint", "df-generated"]
+      - ["lang:core", "<usize as crate::fmt::Binary>::fmt", "Argument[0]", "ReturnValue", "taint", "df-generated"]
+      - ["lang:core", "<usize as crate::fmt::LowerExp>::fmt", "Argument[0]", "ReturnValue", "taint", "df-generated"]
+      - ["lang:core", "<usize as crate::fmt::LowerHex>::fmt", "Argument[0]", "ReturnValue", "taint", "df-generated"]
+      - ["lang:core", "<usize as crate::fmt::Octal>::fmt", "Argument[0]", "ReturnValue", "taint", "df-generated"]
+      - ["lang:core", "<usize as crate::fmt::UpperExp>::fmt", "Argument[0]", "ReturnValue", "taint", "df-generated"]
+      - ["lang:core", "<usize as crate::fmt::UpperHex>::fmt", "Argument[0]", "ReturnValue", "taint", "df-generated"]
       - ["lang:core", "<usize as crate::fmt::num::DisplayInt>::from_u8", "Argument[0]", "ReturnValue", "taint", "df-generated"]
       - ["lang:core", "<usize as crate::fmt::num::DisplayInt>::to_u128", "Argument[self]", "ReturnValue", "taint", "df-generated"]
       - ["lang:core", "<usize as crate::fmt::num::DisplayInt>::to_u64", "Argument[self]", "ReturnValue", "taint", "df-generated"]
@@ -2554,9 +3089,6 @@ extensions:
       - ["lang:core", "crate::iter::sources::successors::successors", "Argument[0]", "ReturnValue.Field[crate::iter::sources::successors::Successors::next]", "value", "dfc-generated"]
       - ["lang:core", "crate::iter::sources::successors::successors", "Argument[1]", "ReturnValue.Field[crate::iter::sources::successors::Successors::succ]", "value", "dfc-generated"]
       - ["lang:core", "crate::mem::copy", "Argument[0].Reference", "ReturnValue", "value", "dfc-generated"]
-      - ["lang:core", "crate::mem::replace", "Argument[0].Reference", "ReturnValue", "value", "dfc-generated"]
-      - ["lang:core", "crate::mem::replace", "Argument[1]", "Argument[0].Reference", "value", "dfc-generated"]
-      - ["lang:core", "crate::mem::take", "Argument[0].Reference", "ReturnValue", "value", "dfc-generated"]
       - ["lang:core", "crate::mem::transmute_copy", "Argument[0]", "ReturnValue", "taint", "df-generated"]
       - ["lang:core", "crate::num::flt2dec::estimator::estimate_scaling_factor", "Argument[1]", "ReturnValue", "taint", "df-generated"]
       - ["lang:core", "crate::num::flt2dec::strategy::dragon::format_exact", "Argument[0]", "ReturnValue", "taint", "df-generated"]
@@ -2584,8 +3116,6 @@ extensions:
       - ["lang:core", "crate::panic::abort_unwind", "Argument[0].ReturnValue", "ReturnValue", "value", "dfc-generated"]
       - ["lang:core", "crate::ptr::from_mut", "Argument[0]", "ReturnValue", "value", "dfc-generated"]
       - ["lang:core", "crate::ptr::from_ref", "Argument[0]", "ReturnValue", "value", "dfc-generated"]
-      - ["lang:core", "crate::ptr::replace", "Argument[0].Reference", "ReturnValue", "value", "dfc-generated"]
-      - ["lang:core", "crate::ptr::replace", "Argument[1]", "Argument[0].Reference", "value", "dfc-generated"]
       - ["lang:core", "crate::ptr::with_exposed_provenance", "Argument[0]", "ReturnValue", "taint", "df-generated"]
       - ["lang:core", "crate::ptr::with_exposed_provenance_mut", "Argument[0]", "ReturnValue", "taint", "df-generated"]
       - ["lang:core", "crate::slice::index::range", "Argument[1].Field[crate::ops::range::RangeTo::end]", "ReturnValue.Field[crate::ops::range::Range::end]", "value", "dfc-generated"]
@@ -2598,3 +3128,41 @@ extensions:
       - ["lang:core", "crate::str::converts::from_utf8_mut", "Argument[0]", "ReturnValue", "taint", "df-generated"]
       - ["lang:core", "crate::str::converts::from_utf8_unchecked_mut", "Argument[0]", "ReturnValue", "taint", "df-generated"]
       - ["lang:core", "crate::str::validations::next_code_point", "Argument[0].Element", "ReturnValue", "value", "dfc-generated"]
+  - addsTo:
+      pack: codeql/rust-all
+      extensible: sinkModel
+    data:
+      - ["lang:core", "<[_]>::select_nth_unstable", "Argument[0]", "log-injection", "df-generated"]
+      - ["lang:core", "<[_]>::select_nth_unstable_by", "Argument[0]", "log-injection", "df-generated"]
+      - ["lang:core", "<[_]>::select_nth_unstable_by_key", "Argument[0]", "log-injection", "df-generated"]
+      - ["lang:core", "<_ as crate::clone::uninit::CopySpec>::clone_one", "Argument[1]", "pointer-access", "df-generated"]
+      - ["lang:core", "<crate::cell::lazy::LazyCell>::force_mut", "Argument[0]", "pointer-access", "df-generated"]
+      - ["lang:core", "<crate::ffi::c_str::CStr as crate::ops::index::Index>::index", "Argument[0]", "log-injection", "df-generated"]
+      - ["lang:core", "<crate::fmt::num::Binary as crate::fmt::num::GenericRadix>::digit", "Argument[0]", "log-injection", "df-generated"]
+      - ["lang:core", "<crate::fmt::num::LowerHex as crate::fmt::num::GenericRadix>::digit", "Argument[0]", "log-injection", "df-generated"]
+      - ["lang:core", "<crate::fmt::num::Octal as crate::fmt::num::GenericRadix>::digit", "Argument[0]", "log-injection", "df-generated"]
+      - ["lang:core", "<crate::fmt::num::UpperHex as crate::fmt::num::GenericRadix>::digit", "Argument[0]", "log-injection", "df-generated"]
+      - ["lang:core", "<crate::mem::manually_drop::ManuallyDrop>::take", "Argument[0]", "pointer-access", "df-generated"]
+      - ["lang:core", "<crate::option::Option>::expect", "Argument[0]", "log-injection", "df-generated"]
+      - ["lang:core", "<crate::option::Option>::map", "Argument[self]", "pointer-access", "df-generated"]
+      - ["lang:core", "<crate::result::Result>::expect", "Argument[0]", "log-injection", "df-generated"]
+      - ["lang:core", "<crate::result::Result>::expect_err", "Argument[0]", "log-injection", "df-generated"]
+      - ["lang:core", "<crate::result::Result>::unwrap_or_else", "Argument[0]", "log-injection", "df-generated"]
+      - ["lang:core", "crate::mem::transmute_copy", "Argument[0]", "pointer-access", "df-generated"]
+      - ["lang:core", "crate::panicking::assert_failed", "Argument[3]", "log-injection", "df-generated"]
+      - ["lang:core", "crate::panicking::assert_matches_failed", "Argument[2]", "log-injection", "df-generated"]
+      - ["lang:core", "crate::panicking::panic_display", "Argument[0]", "log-injection", "df-generated"]
+      - ["lang:core", "crate::panicking::panic_str_2015", "Argument[0]", "log-injection", "df-generated"]
+      - ["lang:core", "crate::panicking::unreachable_display", "Argument[0]", "log-injection", "df-generated"]
+      - ["lang:core", "crate::slice::sort::select::partition_at_index", "Argument[1]", "log-injection", "df-generated"]
+      - ["lang:core", "crate::slice::sort::stable::drift::sort", "Argument[0]", "pointer-access", "df-generated"]
+      - ["lang:core", "crate::slice::sort::stable::quicksort::quicksort", "Argument[0]", "pointer-access", "df-generated"]
+      - ["lang:core", "crate::slice::sort::stable::sort", "Argument[0]", "pointer-access", "df-generated"]
+  - addsTo:
+      pack: codeql/rust-all
+      extensible: sourceModel
+    data:
+      - ["lang:core", "<[crate::mem::maybe_uninit::MaybeUninit]>::assume_init_drop", "Argument[self]", "pointer-invalidate", "df-generated"]
+      - ["lang:core", "crate::intrinsics::drop_in_place", "Argument[0]", "pointer-invalidate", "df-generated"]
+      - ["lang:core", "crate::ptr::dangling", "ReturnValue", "pointer-invalidate", "df-generated"]
+      - ["lang:core", "crate::ptr::drop_in_place", "Argument[0]", "pointer-invalidate", "df-generated"]
diff --git a/rust/ql/lib/ext/generated/rust/lang-other.model.yml b/rust/ql/lib/ext/generated/rust/lang-other.model.yml
new file mode 100644
index 00000000000..5c88c935851
--- /dev/null
+++ b/rust/ql/lib/ext/generated/rust/lang-other.model.yml
@@ -0,0 +1,8 @@
+# THIS FILE IS AN AUTO-GENERATED MODELS AS DATA FILE. DO NOT EDIT.
+extensions:
+  - addsTo:
+      pack: codeql/rust-all
+      extensible: summaryModel
+    data:
+      - ["lang:other", "<crate::detect::cache::Initializer>::set", "Argument[0]", "Argument[self]", "taint", "df-generated"]
+      - ["lang:other", "<crate::detect::cache::Initializer>::unset", "Argument[0]", "Argument[self]", "taint", "df-generated"]
diff --git a/rust/ql/lib/ext/generated/rust/lang-proc_macro.model.yml b/rust/ql/lib/ext/generated/rust/lang-proc_macro.model.yml
index 8f45f5773b4..8c26b521233 100644
--- a/rust/ql/lib/ext/generated/rust/lang-proc_macro.model.yml
+++ b/rust/ql/lib/ext/generated/rust/lang-proc_macro.model.yml
@@ -49,18 +49,28 @@ extensions:
       - ["lang:proc_macro", "<crate::Spacing as crate::bridge::Mark>::mark", "Argument[0]", "ReturnValue", "value", "dfc-generated"]
       - ["lang:proc_macro", "<crate::Spacing as crate::bridge::Unmark>::unmark", "Argument[self]", "ReturnValue", "value", "dfc-generated"]
       - ["lang:proc_macro", "<crate::TokenStream as crate::to_tokens::ToTokens>::into_token_stream", "Argument[self]", "ReturnValue", "value", "dfc-generated"]
+      - ["lang:proc_macro", "<crate::TokenStream>::expand_expr", "Argument[self].Field[0].Field[crate::option::Option::Some(0)]", "ReturnValue.Reference", "value", "dfc-generated"]
+      - ["lang:proc_macro", "<crate::TokenStream>::expand_expr", "Argument[self].Field[crate::TokenStream(0)].Field[crate::option::Option::Some(0)]", "ReturnValue.Reference", "value", "dfc-generated"]
       - ["lang:proc_macro", "<crate::TokenTree as crate::convert::From>::from", "Argument[0]", "ReturnValue.Field[crate::TokenTree::Group(0)]", "value", "dfc-generated"]
       - ["lang:proc_macro", "<crate::TokenTree as crate::convert::From>::from", "Argument[0]", "ReturnValue.Field[crate::TokenTree::Ident(0)]", "value", "dfc-generated"]
       - ["lang:proc_macro", "<crate::TokenTree as crate::convert::From>::from", "Argument[0]", "ReturnValue.Field[crate::TokenTree::Literal(0)]", "value", "dfc-generated"]
       - ["lang:proc_macro", "<crate::TokenTree as crate::convert::From>::from", "Argument[0]", "ReturnValue.Field[crate::TokenTree::Punct(0)]", "value", "dfc-generated"]
+      - ["lang:proc_macro", "<crate::boxed::Box as crate::convert::From>::from", "Argument[0].Field[crate::bridge::rpc::PanicMessage::StaticStr(0)]", "ReturnValue.Reference", "value", "dfc-generated"]
+      - ["lang:proc_macro", "<crate::boxed::Box as crate::convert::From>::from", "Argument[0].Field[crate::bridge::rpc::PanicMessage::String(0)]", "ReturnValue.Reference", "value", "dfc-generated"]
       - ["lang:proc_macro", "<crate::bridge::DelimSpan>::from_single", "Argument[0]", "ReturnValue.Field[crate::bridge::DelimSpan::close]", "value", "dfc-generated"]
       - ["lang:proc_macro", "<crate::bridge::DelimSpan>::from_single", "Argument[0]", "ReturnValue.Field[crate::bridge::DelimSpan::entire]", "value", "dfc-generated"]
       - ["lang:proc_macro", "<crate::bridge::DelimSpan>::from_single", "Argument[0]", "ReturnValue.Field[crate::bridge::DelimSpan::open]", "value", "dfc-generated"]
+      - ["lang:proc_macro", "<crate::bridge::Diagnostic as crate::bridge::Unmark>::unmark", "Argument[self].Field[crate::bridge::Diagnostic::level]", "ReturnValue.Field[crate::bridge::Diagnostic::level]", "value", "dfc-generated"]
+      - ["lang:proc_macro", "<crate::bridge::Group as crate::bridge::Unmark>::unmark", "Argument[self].Field[crate::bridge::Group::delimiter]", "ReturnValue.Field[crate::bridge::Group::delimiter]", "value", "dfc-generated"]
+      - ["lang:proc_macro", "<crate::bridge::Ident as crate::bridge::Unmark>::unmark", "Argument[self].Field[crate::bridge::Ident::is_raw]", "ReturnValue.Field[crate::bridge::Ident::is_raw]", "value", "dfc-generated"]
       - ["lang:proc_macro", "<crate::bridge::LitKind as crate::bridge::Mark>::mark", "Argument[0]", "ReturnValue", "value", "dfc-generated"]
       - ["lang:proc_macro", "<crate::bridge::LitKind as crate::bridge::Unmark>::unmark", "Argument[self]", "ReturnValue", "value", "dfc-generated"]
+      - ["lang:proc_macro", "<crate::bridge::Literal as crate::bridge::Unmark>::unmark", "Argument[self].Field[crate::bridge::Literal::kind]", "ReturnValue.Field[crate::bridge::Literal::kind]", "value", "dfc-generated"]
       - ["lang:proc_macro", "<crate::bridge::Marked as crate::bridge::Mark>::mark", "Argument[0]", "ReturnValue.Field[crate::bridge::Marked::value]", "value", "dfc-generated"]
       - ["lang:proc_macro", "<crate::bridge::Marked as crate::bridge::Unmark>::unmark", "Argument[self].Field[crate::bridge::Marked::value]", "ReturnValue", "value", "dfc-generated"]
-      - ["lang:proc_macro", "<crate::bridge::buffer::Buffer>::take", "Argument[self].Reference", "ReturnValue", "value", "dfc-generated"]
+      - ["lang:proc_macro", "<crate::bridge::Marked as crate::bridge::rpc::DecodeMut>::decode", "Argument[1]", "ReturnValue", "taint", "df-generated"]
+      - ["lang:proc_macro", "<crate::bridge::Punct as crate::bridge::Unmark>::unmark", "Argument[self].Field[crate::bridge::Punct::ch]", "ReturnValue.Field[crate::bridge::Punct::ch]", "value", "dfc-generated"]
+      - ["lang:proc_macro", "<crate::bridge::Punct as crate::bridge::Unmark>::unmark", "Argument[self].Field[crate::bridge::Punct::joint]", "ReturnValue.Field[crate::bridge::Punct::joint]", "value", "dfc-generated"]
       - ["lang:proc_macro", "<crate::bridge::client::Client as crate::clone::Clone>::clone", "Argument[self].Reference", "ReturnValue", "value", "dfc-generated"]
       - ["lang:proc_macro", "<crate::bridge::client::ProcMacro>::attr", "Argument[0]", "ReturnValue.Field[crate::bridge::client::ProcMacro::Attr::name]", "value", "dfc-generated"]
       - ["lang:proc_macro", "<crate::bridge::client::ProcMacro>::bang", "Argument[0]", "ReturnValue.Field[crate::bridge::client::ProcMacro::Bang::name]", "value", "dfc-generated"]
@@ -70,9 +80,7 @@ extensions:
       - ["lang:proc_macro", "<crate::bridge::client::ProcMacro>::name", "Argument[self].Field[crate::bridge::client::ProcMacro::Bang::name]", "ReturnValue", "value", "dfc-generated"]
       - ["lang:proc_macro", "<crate::bridge::client::ProcMacro>::name", "Argument[self].Field[crate::bridge::client::ProcMacro::CustomDerive::trait_name]", "ReturnValue", "value", "dfc-generated"]
       - ["lang:proc_macro", "<crate::bridge::client::SourceFile as crate::clone::Clone>::clone", "Argument[self].Reference", "ReturnValue", "value", "dfc-generated"]
-      - ["lang:proc_macro", "<crate::bridge::client::SourceFile as crate::clone::Clone>::clone", "Argument[self]", "ReturnValue", "value", "dfc-generated"]
       - ["lang:proc_macro", "<crate::bridge::client::TokenStream as crate::clone::Clone>::clone", "Argument[self].Reference", "ReturnValue", "value", "dfc-generated"]
-      - ["lang:proc_macro", "<crate::bridge::client::TokenStream as crate::clone::Clone>::clone", "Argument[self]", "ReturnValue", "value", "dfc-generated"]
       - ["lang:proc_macro", "<crate::bridge::closure::Closure as crate::convert::From>::from", "Argument[0]", "ReturnValue", "taint", "df-generated"]
       - ["lang:proc_macro", "<crate::bridge::closure::Closure>::call", "Argument[0]", "Argument[self]", "taint", "df-generated"]
       - ["lang:proc_macro", "<crate::bridge::closure::Closure>::call", "Argument[self]", "ReturnValue", "taint", "df-generated"]
@@ -118,3 +126,17 @@ extensions:
       - ["lang:proc_macro", "crate::bridge::client::state::set", "Argument[1].ReturnValue", "ReturnValue", "value", "dfc-generated"]
       - ["lang:proc_macro", "crate::bridge::client::state::set", "Argument[1]", "Argument[1].Parameter[0]", "value", "dfc-generated"]
       - ["lang:proc_macro", "crate::bridge::client::state::with", "Argument[0].ReturnValue", "ReturnValue", "value", "dfc-generated"]
+  - addsTo:
+      pack: codeql/rust-all
+      extensible: sinkModel
+    data:
+      - ["lang:proc_macro", "<crate::Ident>::new", "Argument[0]", "log-injection", "df-generated"]
+      - ["lang:proc_macro", "<crate::Ident>::new_raw", "Argument[0]", "log-injection", "df-generated"]
+      - ["lang:proc_macro", "<crate::Literal>::f32_suffixed", "Argument[0]", "log-injection", "df-generated"]
+      - ["lang:proc_macro", "<crate::Literal>::f32_unsuffixed", "Argument[0]", "log-injection", "df-generated"]
+      - ["lang:proc_macro", "<crate::Literal>::f64_suffixed", "Argument[0]", "log-injection", "df-generated"]
+      - ["lang:proc_macro", "<crate::Literal>::f64_unsuffixed", "Argument[0]", "log-injection", "df-generated"]
+      - ["lang:proc_macro", "<crate::Punct>::new", "Argument[0]", "log-injection", "df-generated"]
+      - ["lang:proc_macro", "<crate::bridge::symbol::Symbol>::new_ident", "Argument[0]", "log-injection", "df-generated"]
+      - ["lang:proc_macro", "<f32 as crate::to_tokens::ToTokens>::to_tokens", "Argument[self]", "log-injection", "df-generated"]
+      - ["lang:proc_macro", "<f64 as crate::to_tokens::ToTokens>::to_tokens", "Argument[self]", "log-injection", "df-generated"]
diff --git a/rust/ql/lib/ext/generated/rust/lang-std.model.yml b/rust/ql/lib/ext/generated/rust/lang-std.model.yml
index 00d31391a4d..39f57b3b83d 100644
--- a/rust/ql/lib/ext/generated/rust/lang-std.model.yml
+++ b/rust/ql/lib/ext/generated/rust/lang-std.model.yml
@@ -11,6 +11,9 @@ extensions:
       - ["lang:std", "<&[u8] as crate::io::Read>::read_to_end", "Argument[self].Element", "Argument[self].Reference.Reference", "value", "dfc-generated"]
       - ["lang:std", "<&[u8] as crate::io::Read>::read_to_string", "Argument[self].Element", "Argument[self].Reference.Reference", "value", "dfc-generated"]
       - ["lang:std", "<&[u8] as crate::io::copy::BufferedReaderSpec>::copy_to", "Argument[self].Element", "Argument[self].Reference.Reference", "value", "dfc-generated"]
+      - ["lang:std", "<&crate::collections::hash::set::HashSet as crate::ops::arith::Sub>::sub", "Argument[0]", "ReturnValue", "taint", "df-generated"]
+      - ["lang:std", "<&crate::collections::hash::set::HashSet as crate::ops::bit::BitAnd>::bitand", "Argument[0]", "ReturnValue", "taint", "df-generated"]
+      - ["lang:std", "<&crate::collections::hash::set::HashSet as crate::ops::bit::BitAnd>::bitand", "Argument[self]", "ReturnValue", "taint", "df-generated"]
       - ["lang:std", "<&crate::io::stdio::Stdin as crate::io::Read>::read", "Argument[self]", "Argument[0]", "taint", "df-generated"]
       - ["lang:std", "<&crate::io::stdio::Stdin as crate::io::Read>::read_exact", "Argument[self]", "Argument[0]", "taint", "df-generated"]
       - ["lang:std", "<&crate::io::stdio::Stdin as crate::io::Read>::read_to_string", "Argument[self]", "Argument[0]", "taint", "df-generated"]
@@ -29,72 +32,38 @@ extensions:
       - ["lang:std", "<crate::boxed::Box as crate::io::Read>::read_exact", "Argument[self]", "Argument[0]", "taint", "df-generated"]
       - ["lang:std", "<crate::boxed::Box as crate::io::Read>::read_to_end", "Argument[self]", "Argument[0]", "taint", "df-generated"]
       - ["lang:std", "<crate::boxed::Box as crate::io::Read>::read_to_string", "Argument[self]", "Argument[0]", "taint", "df-generated"]
-      - ["lang:std", "<crate::collections::hash::map::Drain as crate::iter::traits::iterator::Iterator>::fold", "Argument[0]", "ReturnValue", "value", "dfc-generated"]
-      - ["lang:std", "<crate::collections::hash::map::Drain as crate::iter::traits::iterator::Iterator>::fold", "Argument[1].ReturnValue", "ReturnValue", "value", "dfc-generated"]
       - ["lang:std", "<crate::collections::hash::map::Entry>::and_modify", "Argument[self].Field[crate::collections::hash::map::Entry::Occupied(0)]", "ReturnValue.Field[crate::collections::hash::map::Entry::Occupied(0)]", "value", "dfc-generated"]
       - ["lang:std", "<crate::collections::hash::map::Entry>::and_modify", "Argument[self].Field[crate::collections::hash::map::Entry::Vacant(0)]", "ReturnValue.Field[crate::collections::hash::map::Entry::Vacant(0)]", "value", "dfc-generated"]
       - ["lang:std", "<crate::collections::hash::map::Entry>::insert_entry", "Argument[self].Field[crate::collections::hash::map::Entry::Occupied(0)]", "ReturnValue", "value", "dfc-generated"]
       - ["lang:std", "<crate::collections::hash::map::HashMap as crate::clone::Clone>::clone", "Argument[self].Field[crate::collections::hash::map::HashMap::base].Reference", "ReturnValue.Field[crate::collections::hash::map::HashMap::base]", "value", "dfc-generated"]
-      - ["lang:std", "<crate::collections::hash::map::HashMap as crate::clone::Clone>::clone", "Argument[self].Field[crate::collections::hash::map::HashMap::base]", "ReturnValue.Field[crate::collections::hash::map::HashMap::base].Reference", "value", "dfc-generated"]
       - ["lang:std", "<crate::collections::hash::map::HashMap as crate::clone::Clone>::clone", "Argument[self].Field[crate::collections::hash::map::HashMap::base]", "ReturnValue.Field[crate::collections::hash::map::HashMap::base]", "value", "dfc-generated"]
-      - ["lang:std", "<crate::collections::hash::map::HashMap>::raw_entry", "Argument[self]", "ReturnValue.Field[crate::collections::hash::map::RawEntryBuilder::map]", "value", "dfc-generated"]
-      - ["lang:std", "<crate::collections::hash::map::HashMap>::raw_entry_mut", "Argument[self]", "ReturnValue.Field[crate::collections::hash::map::RawEntryBuilderMut::map]", "value", "dfc-generated"]
       - ["lang:std", "<crate::collections::hash::map::HashMap>::try_insert", "Argument[1]", "ReturnValue.Field[crate::result::Result::Err(0)].Field[crate::collections::hash::map::OccupiedError::value]", "value", "dfc-generated"]
-      - ["lang:std", "<crate::collections::hash::map::IntoIter as crate::iter::traits::iterator::Iterator>::fold", "Argument[0]", "ReturnValue", "value", "dfc-generated"]
-      - ["lang:std", "<crate::collections::hash::map::IntoIter as crate::iter::traits::iterator::Iterator>::fold", "Argument[1].ReturnValue", "ReturnValue", "value", "dfc-generated"]
-      - ["lang:std", "<crate::collections::hash::map::IntoKeys as crate::iter::traits::iterator::Iterator>::fold", "Argument[0]", "ReturnValue", "value", "dfc-generated"]
-      - ["lang:std", "<crate::collections::hash::map::IntoKeys as crate::iter::traits::iterator::Iterator>::fold", "Argument[1].ReturnValue", "ReturnValue", "value", "dfc-generated"]
-      - ["lang:std", "<crate::collections::hash::map::IntoValues as crate::iter::traits::iterator::Iterator>::fold", "Argument[0]", "ReturnValue", "value", "dfc-generated"]
-      - ["lang:std", "<crate::collections::hash::map::IntoValues as crate::iter::traits::iterator::Iterator>::fold", "Argument[1].ReturnValue", "ReturnValue", "value", "dfc-generated"]
       - ["lang:std", "<crate::collections::hash::map::Iter as crate::clone::Clone>::clone", "Argument[self].Field[crate::collections::hash::map::Iter::base].Reference", "ReturnValue.Field[crate::collections::hash::map::Iter::base]", "value", "dfc-generated"]
-      - ["lang:std", "<crate::collections::hash::map::Iter as crate::clone::Clone>::clone", "Argument[self].Field[crate::collections::hash::map::Iter::base]", "ReturnValue.Field[crate::collections::hash::map::Iter::base].Reference", "value", "dfc-generated"]
       - ["lang:std", "<crate::collections::hash::map::Iter as crate::clone::Clone>::clone", "Argument[self].Field[crate::collections::hash::map::Iter::base]", "ReturnValue.Field[crate::collections::hash::map::Iter::base]", "value", "dfc-generated"]
-      - ["lang:std", "<crate::collections::hash::map::Iter as crate::iter::traits::iterator::Iterator>::fold", "Argument[0]", "ReturnValue", "value", "dfc-generated"]
-      - ["lang:std", "<crate::collections::hash::map::Iter as crate::iter::traits::iterator::Iterator>::fold", "Argument[1].ReturnValue", "ReturnValue", "value", "dfc-generated"]
-      - ["lang:std", "<crate::collections::hash::map::IterMut as crate::iter::traits::iterator::Iterator>::fold", "Argument[0]", "ReturnValue", "value", "dfc-generated"]
-      - ["lang:std", "<crate::collections::hash::map::IterMut as crate::iter::traits::iterator::Iterator>::fold", "Argument[1].ReturnValue", "ReturnValue", "value", "dfc-generated"]
-      - ["lang:std", "<crate::collections::hash::map::Keys as crate::clone::Clone>::clone", "Argument[self]", "ReturnValue", "taint", "df-generated"]
-      - ["lang:std", "<crate::collections::hash::map::Keys as crate::iter::traits::iterator::Iterator>::fold", "Argument[0]", "ReturnValue", "value", "dfc-generated"]
-      - ["lang:std", "<crate::collections::hash::map::Keys as crate::iter::traits::iterator::Iterator>::fold", "Argument[1].ReturnValue", "ReturnValue", "value", "dfc-generated"]
-      - ["lang:std", "<crate::collections::hash::map::RawEntryMut>::and_modify", "Argument[self].Field[crate::collections::hash::map::RawEntryMut::Occupied(0)]", "ReturnValue.Field[crate::collections::hash::map::RawEntryMut::Occupied(0)]", "value", "dfc-generated"]
-      - ["lang:std", "<crate::collections::hash::map::RawEntryMut>::and_modify", "Argument[self].Field[crate::collections::hash::map::RawEntryMut::Vacant(0)]", "ReturnValue.Field[crate::collections::hash::map::RawEntryMut::Vacant(0)]", "value", "dfc-generated"]
-      - ["lang:std", "<crate::collections::hash::map::Values as crate::clone::Clone>::clone", "Argument[self]", "ReturnValue", "taint", "df-generated"]
-      - ["lang:std", "<crate::collections::hash::map::Values as crate::iter::traits::iterator::Iterator>::fold", "Argument[0]", "ReturnValue", "value", "dfc-generated"]
-      - ["lang:std", "<crate::collections::hash::map::Values as crate::iter::traits::iterator::Iterator>::fold", "Argument[1].ReturnValue", "ReturnValue", "value", "dfc-generated"]
-      - ["lang:std", "<crate::collections::hash::map::ValuesMut as crate::iter::traits::iterator::Iterator>::fold", "Argument[0]", "ReturnValue", "value", "dfc-generated"]
-      - ["lang:std", "<crate::collections::hash::map::ValuesMut as crate::iter::traits::iterator::Iterator>::fold", "Argument[1].ReturnValue", "ReturnValue", "value", "dfc-generated"]
-      - ["lang:std", "<crate::collections::hash::set::Difference as crate::clone::Clone>::clone", "Argument[self]", "ReturnValue", "taint", "df-generated"]
-      - ["lang:std", "<crate::collections::hash::set::Difference as crate::iter::traits::iterator::Iterator>::fold", "Argument[0]", "ReturnValue", "value", "dfc-generated"]
-      - ["lang:std", "<crate::collections::hash::set::Difference as crate::iter::traits::iterator::Iterator>::fold", "Argument[1].ReturnValue", "ReturnValue", "value", "dfc-generated"]
-      - ["lang:std", "<crate::collections::hash::set::Drain as crate::iter::traits::iterator::Iterator>::fold", "Argument[0]", "ReturnValue", "value", "dfc-generated"]
-      - ["lang:std", "<crate::collections::hash::set::Drain as crate::iter::traits::iterator::Iterator>::fold", "Argument[1].ReturnValue", "ReturnValue", "value", "dfc-generated"]
+      - ["lang:std", "<crate::collections::hash::map::Keys as crate::clone::Clone>::clone", "Argument[self].Field[crate::collections::hash::map::Keys::inner].Field[crate::collections::hash::map::Iter::base]", "ReturnValue.Field[crate::collections::hash::map::Keys::inner].Field[crate::collections::hash::map::Iter::base]", "value", "dfc-generated"]
+      - ["lang:std", "<crate::collections::hash::map::Keys as crate::clone::Clone>::clone", "Argument[self].Field[crate::collections::hash::map::Keys::inner].Reference", "ReturnValue.Field[crate::collections::hash::map::Keys::inner]", "value", "dfc-generated"]
+      - ["lang:std", "<crate::collections::hash::map::Keys as crate::clone::Clone>::clone", "Argument[self].Field[crate::collections::hash::map::Keys::inner]", "ReturnValue.Field[crate::collections::hash::map::Keys::inner]", "value", "dfc-generated"]
+      - ["lang:std", "<crate::collections::hash::map::Values as crate::clone::Clone>::clone", "Argument[self].Field[crate::collections::hash::map::Values::inner].Field[crate::collections::hash::map::Iter::base]", "ReturnValue.Field[crate::collections::hash::map::Values::inner].Field[crate::collections::hash::map::Iter::base]", "value", "dfc-generated"]
+      - ["lang:std", "<crate::collections::hash::map::Values as crate::clone::Clone>::clone", "Argument[self].Field[crate::collections::hash::map::Values::inner].Reference", "ReturnValue.Field[crate::collections::hash::map::Values::inner]", "value", "dfc-generated"]
+      - ["lang:std", "<crate::collections::hash::map::Values as crate::clone::Clone>::clone", "Argument[self].Field[crate::collections::hash::map::Values::inner]", "ReturnValue.Field[crate::collections::hash::map::Values::inner]", "value", "dfc-generated"]
+      - ["lang:std", "<crate::collections::hash::set::Difference as crate::clone::Clone>::clone", "Argument[self].Field[crate::collections::hash::set::Difference::iter].Field[crate::collections::hash::set::Iter::base]", "ReturnValue.Field[crate::collections::hash::set::Difference::iter].Field[crate::collections::hash::set::Iter::base]", "value", "dfc-generated"]
+      - ["lang:std", "<crate::collections::hash::set::Difference as crate::clone::Clone>::clone", "Argument[self].Field[crate::collections::hash::set::Difference::iter].Reference", "ReturnValue.Field[crate::collections::hash::set::Difference::iter]", "value", "dfc-generated"]
+      - ["lang:std", "<crate::collections::hash::set::Difference as crate::clone::Clone>::clone", "Argument[self].Field[crate::collections::hash::set::Difference::iter]", "ReturnValue.Field[crate::collections::hash::set::Difference::iter]", "value", "dfc-generated"]
       - ["lang:std", "<crate::collections::hash::set::Entry>::insert", "Argument[self].Field[crate::collections::hash::set::Entry::Occupied(0)]", "ReturnValue", "value", "dfc-generated"]
       - ["lang:std", "<crate::collections::hash::set::HashSet as crate::clone::Clone>::clone", "Argument[self].Field[crate::collections::hash::set::HashSet::base].Reference", "ReturnValue.Field[crate::collections::hash::set::HashSet::base]", "value", "dfc-generated"]
-      - ["lang:std", "<crate::collections::hash::set::HashSet as crate::clone::Clone>::clone", "Argument[self].Field[crate::collections::hash::set::HashSet::base]", "ReturnValue.Field[crate::collections::hash::set::HashSet::base].Reference", "value", "dfc-generated"]
       - ["lang:std", "<crate::collections::hash::set::HashSet as crate::clone::Clone>::clone", "Argument[self].Field[crate::collections::hash::set::HashSet::base]", "ReturnValue.Field[crate::collections::hash::set::HashSet::base]", "value", "dfc-generated"]
       - ["lang:std", "<crate::collections::hash::set::HashSet>::difference", "Argument[0]", "ReturnValue.Field[crate::collections::hash::set::Difference::other]", "value", "dfc-generated"]
       - ["lang:std", "<crate::collections::hash::set::HashSet>::intersection", "Argument[0]", "ReturnValue.Field[crate::collections::hash::set::Intersection::other]", "value", "dfc-generated"]
       - ["lang:std", "<crate::collections::hash::set::HashSet>::intersection", "Argument[self]", "ReturnValue.Field[crate::collections::hash::set::Intersection::other]", "value", "dfc-generated"]
-      - ["lang:std", "<crate::collections::hash::set::Intersection as crate::clone::Clone>::clone", "Argument[self]", "ReturnValue", "taint", "df-generated"]
-      - ["lang:std", "<crate::collections::hash::set::Intersection as crate::iter::traits::iterator::Iterator>::fold", "Argument[0]", "ReturnValue", "value", "dfc-generated"]
-      - ["lang:std", "<crate::collections::hash::set::Intersection as crate::iter::traits::iterator::Iterator>::fold", "Argument[1].ReturnValue", "ReturnValue", "value", "dfc-generated"]
-      - ["lang:std", "<crate::collections::hash::set::IntoIter as crate::iter::traits::iterator::Iterator>::fold", "Argument[0]", "ReturnValue", "value", "dfc-generated"]
-      - ["lang:std", "<crate::collections::hash::set::IntoIter as crate::iter::traits::iterator::Iterator>::fold", "Argument[1].ReturnValue", "ReturnValue", "value", "dfc-generated"]
+      - ["lang:std", "<crate::collections::hash::set::Intersection as crate::clone::Clone>::clone", "Argument[self].Field[crate::collections::hash::set::Intersection::iter].Field[crate::collections::hash::set::Iter::base]", "ReturnValue.Field[crate::collections::hash::set::Intersection::iter].Field[crate::collections::hash::set::Iter::base]", "value", "dfc-generated"]
+      - ["lang:std", "<crate::collections::hash::set::Intersection as crate::clone::Clone>::clone", "Argument[self].Field[crate::collections::hash::set::Intersection::iter].Reference", "ReturnValue.Field[crate::collections::hash::set::Intersection::iter]", "value", "dfc-generated"]
+      - ["lang:std", "<crate::collections::hash::set::Intersection as crate::clone::Clone>::clone", "Argument[self].Field[crate::collections::hash::set::Intersection::iter]", "ReturnValue.Field[crate::collections::hash::set::Intersection::iter]", "value", "dfc-generated"]
       - ["lang:std", "<crate::collections::hash::set::Iter as crate::clone::Clone>::clone", "Argument[self].Field[crate::collections::hash::set::Iter::base].Reference", "ReturnValue.Field[crate::collections::hash::set::Iter::base]", "value", "dfc-generated"]
-      - ["lang:std", "<crate::collections::hash::set::Iter as crate::clone::Clone>::clone", "Argument[self].Field[crate::collections::hash::set::Iter::base]", "ReturnValue.Field[crate::collections::hash::set::Iter::base].Reference", "value", "dfc-generated"]
       - ["lang:std", "<crate::collections::hash::set::Iter as crate::clone::Clone>::clone", "Argument[self].Field[crate::collections::hash::set::Iter::base]", "ReturnValue.Field[crate::collections::hash::set::Iter::base]", "value", "dfc-generated"]
-      - ["lang:std", "<crate::collections::hash::set::Iter as crate::iter::traits::iterator::Iterator>::fold", "Argument[0]", "ReturnValue", "value", "dfc-generated"]
-      - ["lang:std", "<crate::collections::hash::set::Iter as crate::iter::traits::iterator::Iterator>::fold", "Argument[1].ReturnValue", "ReturnValue", "value", "dfc-generated"]
       - ["lang:std", "<crate::collections::hash::set::SymmetricDifference as crate::clone::Clone>::clone", "Argument[self].Field[crate::collections::hash::set::SymmetricDifference::iter].Reference", "ReturnValue.Field[crate::collections::hash::set::SymmetricDifference::iter]", "value", "dfc-generated"]
-      - ["lang:std", "<crate::collections::hash::set::SymmetricDifference as crate::clone::Clone>::clone", "Argument[self].Field[crate::collections::hash::set::SymmetricDifference::iter]", "ReturnValue.Field[crate::collections::hash::set::SymmetricDifference::iter].Reference", "value", "dfc-generated"]
-      - ["lang:std", "<crate::collections::hash::set::SymmetricDifference as crate::clone::Clone>::clone", "Argument[self].Field[crate::collections::hash::set::SymmetricDifference::iter]", "ReturnValue.Field[crate::collections::hash::set::SymmetricDifference::iter]", "value", "dfc-generated"]
       - ["lang:std", "<crate::collections::hash::set::SymmetricDifference as crate::iter::traits::iterator::Iterator>::fold", "Argument[0]", "ReturnValue", "value", "dfc-generated"]
-      - ["lang:std", "<crate::collections::hash::set::SymmetricDifference as crate::iter::traits::iterator::Iterator>::fold", "Argument[1].ReturnValue", "ReturnValue", "value", "dfc-generated"]
       - ["lang:std", "<crate::collections::hash::set::Union as crate::clone::Clone>::clone", "Argument[self].Field[crate::collections::hash::set::Union::iter].Reference", "ReturnValue.Field[crate::collections::hash::set::Union::iter]", "value", "dfc-generated"]
-      - ["lang:std", "<crate::collections::hash::set::Union as crate::clone::Clone>::clone", "Argument[self].Field[crate::collections::hash::set::Union::iter]", "ReturnValue.Field[crate::collections::hash::set::Union::iter].Reference", "value", "dfc-generated"]
-      - ["lang:std", "<crate::collections::hash::set::Union as crate::clone::Clone>::clone", "Argument[self].Field[crate::collections::hash::set::Union::iter]", "ReturnValue.Field[crate::collections::hash::set::Union::iter]", "value", "dfc-generated"]
       - ["lang:std", "<crate::collections::hash::set::Union as crate::iter::traits::iterator::Iterator>::fold", "Argument[0]", "ReturnValue", "value", "dfc-generated"]
-      - ["lang:std", "<crate::collections::hash::set::Union as crate::iter::traits::iterator::Iterator>::fold", "Argument[1].ReturnValue", "ReturnValue", "value", "dfc-generated"]
       - ["lang:std", "<crate::error::Report as crate::convert::From>::from", "Argument[0]", "ReturnValue.Field[crate::error::Report::error]", "value", "dfc-generated"]
       - ["lang:std", "<crate::error::Report>::pretty", "Argument[0]", "Argument[self].Field[crate::error::Report::pretty]", "value", "dfc-generated"]
       - ["lang:std", "<crate::error::Report>::pretty", "Argument[0]", "ReturnValue.Field[crate::error::Report::pretty]", "value", "dfc-generated"]
@@ -108,12 +77,14 @@ extensions:
       - ["lang:std", "<crate::ffi::os_str::OsStr>::as_encoded_bytes", "Argument[self].Field[crate::ffi::os_str::OsStr::inner].Field[crate::sys::os_str::bytes::Slice::inner]", "ReturnValue.Reference", "value", "dfc-generated"]
       - ["lang:std", "<crate::ffi::os_str::OsStr>::display", "Argument[self]", "ReturnValue.Field[crate::ffi::os_str::Display::os_str]", "value", "dfc-generated"]
       - ["lang:std", "<crate::ffi::os_str::OsString as crate::borrow::Borrow>::borrow", "Argument[self].Element", "ReturnValue.Reference", "value", "dfc-generated"]
-      - ["lang:std", "<crate::ffi::os_str::OsString as crate::clone::Clone>::clone", "Argument[self]", "ReturnValue", "taint", "df-generated"]
+      - ["lang:std", "<crate::ffi::os_str::OsString as crate::clone::Clone>::clone", "Argument[self].Field[crate::ffi::os_str::OsString::inner].Reference", "ReturnValue.Field[crate::ffi::os_str::OsString::inner]", "value", "dfc-generated"]
+      - ["lang:std", "<crate::ffi::os_str::OsString as crate::clone::Clone>::clone", "Argument[self].Field[crate::ffi::os_str::OsString::inner]", "ReturnValue.Field[crate::ffi::os_str::OsString::inner]", "value", "dfc-generated"]
       - ["lang:std", "<crate::ffi::os_str::OsString as crate::convert::AsRef>::as_ref", "Argument[self]", "ReturnValue", "value", "dfc-generated"]
       - ["lang:std", "<crate::ffi::os_str::OsString as crate::convert::From>::from", "Argument[0].Field[crate::path::PathBuf::inner]", "ReturnValue", "value", "dfc-generated"]
       - ["lang:std", "<crate::ffi::os_str::OsString as crate::ops::deref::Deref>::deref", "Argument[self].Element", "ReturnValue.Reference", "value", "dfc-generated"]
       - ["lang:std", "<crate::ffi::os_str::OsString as crate::ops::deref::DerefMut>::deref_mut", "Argument[self].Element", "ReturnValue.Reference", "value", "dfc-generated"]
       - ["lang:std", "<crate::ffi::os_str::OsString as crate::os::unix::ffi::os_str::OsStringExt>::into_vec", "Argument[self].Field[crate::ffi::os_str::OsString::inner].Field[crate::sys::os_str::bytes::Buf::inner]", "ReturnValue", "value", "dfc-generated"]
+      - ["lang:std", "<crate::ffi::os_str::OsString as crate::str::traits::FromStr>::from_str", "Argument[0].Field[crate::path::PathBuf::inner]", "ReturnValue.Field[crate::result::Result::Ok(0)]", "value", "dfc-generated"]
       - ["lang:std", "<crate::ffi::os_str::OsString as crate::sys_common::FromInner>::from_inner", "Argument[0]", "ReturnValue.Field[crate::ffi::os_str::OsString::inner]", "value", "dfc-generated"]
       - ["lang:std", "<crate::ffi::os_str::OsString as crate::sys_common::IntoInner>::into_inner", "Argument[self].Field[crate::ffi::os_str::OsString::inner]", "ReturnValue", "value", "dfc-generated"]
       - ["lang:std", "<crate::ffi::os_str::OsString>::as_os_str", "Argument[self]", "ReturnValue", "value", "dfc-generated"]
@@ -129,7 +100,6 @@ extensions:
       - ["lang:std", "<crate::fs::File as crate::sys_common::AsInner>::as_inner", "Argument[self].Field[crate::fs::File::inner]", "ReturnValue.Reference", "value", "dfc-generated"]
       - ["lang:std", "<crate::fs::File as crate::sys_common::FromInner>::from_inner", "Argument[0]", "ReturnValue.Field[crate::fs::File::inner]", "value", "dfc-generated"]
       - ["lang:std", "<crate::fs::File as crate::sys_common::IntoInner>::into_inner", "Argument[self].Field[crate::fs::File::inner]", "ReturnValue", "value", "dfc-generated"]
-      - ["lang:std", "<crate::fs::FileTimes as crate::os::darwin::fs::FileTimesExt>::set_created", "Argument[self]", "ReturnValue", "value", "dfc-generated"]
       - ["lang:std", "<crate::fs::FileTimes as crate::sys_common::AsInnerMut>::as_inner_mut", "Argument[self].Field[0]", "ReturnValue.Reference", "value", "dfc-generated"]
       - ["lang:std", "<crate::fs::FileTimes as crate::sys_common::AsInnerMut>::as_inner_mut", "Argument[self].Field[crate::fs::FileTimes(0)]", "ReturnValue.Reference", "value", "dfc-generated"]
       - ["lang:std", "<crate::fs::FileTimes>::set_accessed", "Argument[self]", "ReturnValue", "value", "dfc-generated"]
@@ -164,19 +134,22 @@ extensions:
       - ["lang:std", "<crate::io::Chain>::get_ref", "Argument[self].Field[crate::io::Chain::second]", "ReturnValue.Field[1].Reference", "value", "dfc-generated"]
       - ["lang:std", "<crate::io::Chain>::into_inner", "Argument[self].Field[crate::io::Chain::first]", "ReturnValue.Field[0]", "value", "dfc-generated"]
       - ["lang:std", "<crate::io::Chain>::into_inner", "Argument[self].Field[crate::io::Chain::second]", "ReturnValue.Field[1]", "value", "dfc-generated"]
-      - ["lang:std", "<crate::io::IoSlice>::advance_slices", "Argument[0].Reference.Element", "Argument[0].Reference.Reference", "value", "dfc-generated"]
-      - ["lang:std", "<crate::io::IoSliceMut>::advance_slices", "Argument[0].Reference.Element", "Argument[0].Reference.Reference", "value", "dfc-generated"]
       - ["lang:std", "<crate::io::Lines as crate::iter::traits::iterator::Iterator>::next", "Argument[self]", "ReturnValue", "taint", "df-generated"]
       - ["lang:std", "<crate::io::Split as crate::iter::traits::iterator::Iterator>::next", "Argument[self]", "ReturnValue", "taint", "df-generated"]
       - ["lang:std", "<crate::io::Take as crate::io::Read>::read", "Argument[self]", "Argument[0]", "taint", "df-generated"]
       - ["lang:std", "<crate::io::Take as crate::io::SizeHint>::lower_bound", "Argument[self]", "ReturnValue", "taint", "df-generated"]
       - ["lang:std", "<crate::io::Take as crate::io::SizeHint>::upper_bound", "Argument[self]", "ReturnValue", "taint", "df-generated"]
+      - ["lang:std", "<crate::io::Take as crate::sys::pal::unix::kernel_copy::CopyRead>::min_limit", "Argument[self].Field[crate::io::Take::limit]", "ReturnValue", "value", "dfc-generated"]
+      - ["lang:std", "<crate::io::Take as crate::sys::pal::unix::kernel_copy::CopyRead>::taken", "Argument[0]", "Argument[self]", "taint", "df-generated"]
       - ["lang:std", "<crate::io::Take>::get_mut", "Argument[self].Field[crate::io::Take::inner]", "ReturnValue.Reference", "value", "dfc-generated"]
       - ["lang:std", "<crate::io::Take>::get_ref", "Argument[self].Field[crate::io::Take::inner]", "ReturnValue.Reference", "value", "dfc-generated"]
       - ["lang:std", "<crate::io::Take>::into_inner", "Argument[self].Field[crate::io::Take::inner]", "ReturnValue", "value", "dfc-generated"]
       - ["lang:std", "<crate::io::Take>::limit", "Argument[self].Field[crate::io::Take::limit]", "ReturnValue", "value", "dfc-generated"]
       - ["lang:std", "<crate::io::Take>::set_limit", "Argument[0]", "Argument[self].Field[crate::io::Take::limit]", "value", "dfc-generated"]
       - ["lang:std", "<crate::io::borrowed_buf::BorrowedCursor as crate::io::Write>::write", "Argument[self]", "ReturnValue", "taint", "df-generated"]
+      - ["lang:std", "<crate::io::borrowed_buf::BorrowedCursor as crate::io::Write>::write_all", "Argument[self]", "ReturnValue", "taint", "df-generated"]
+      - ["lang:std", "<crate::io::borrowed_buf::BorrowedCursor as crate::io::Write>::write_all_vectored", "Argument[self]", "ReturnValue", "taint", "df-generated"]
+      - ["lang:std", "<crate::io::borrowed_buf::BorrowedCursor as crate::io::Write>::write_vectored", "Argument[self]", "ReturnValue", "taint", "df-generated"]
       - ["lang:std", "<crate::io::buffered::IntoInnerError>::error", "Argument[self].Field[1]", "ReturnValue.Reference", "value", "dfc-generated"]
       - ["lang:std", "<crate::io::buffered::IntoInnerError>::error", "Argument[self].Field[crate::io::buffered::IntoInnerError(1)]", "ReturnValue.Reference", "value", "dfc-generated"]
       - ["lang:std", "<crate::io::buffered::IntoInnerError>::into_error", "Argument[self].Field[1]", "ReturnValue", "value", "dfc-generated"]
@@ -187,10 +160,12 @@ extensions:
       - ["lang:std", "<crate::io::buffered::bufreader::BufReader as crate::io::BufRead>::consume", "Argument[0]", "Argument[self]", "taint", "df-generated"]
       - ["lang:std", "<crate::io::buffered::bufreader::BufReader as crate::io::Read>::read", "Argument[self]", "Argument[0]", "taint", "df-generated"]
       - ["lang:std", "<crate::io::buffered::bufreader::BufReader as crate::io::Read>::read", "Argument[self]", "ReturnValue", "taint", "df-generated"]
+      - ["lang:std", "<crate::io::buffered::bufreader::BufReader as crate::io::Read>::read_buf", "Argument[0]", "Argument[self]", "taint", "df-generated"]
       - ["lang:std", "<crate::io::buffered::bufreader::BufReader as crate::io::Read>::read_buf", "Argument[self]", "ReturnValue", "taint", "df-generated"]
       - ["lang:std", "<crate::io::buffered::bufreader::BufReader as crate::io::Read>::read_exact", "Argument[self]", "Argument[0]", "taint", "df-generated"]
       - ["lang:std", "<crate::io::buffered::bufreader::BufReader as crate::io::Read>::read_to_end", "Argument[self]", "Argument[0]", "taint", "df-generated"]
       - ["lang:std", "<crate::io::buffered::bufreader::BufReader as crate::io::Read>::read_vectored", "Argument[self]", "ReturnValue", "taint", "df-generated"]
+      - ["lang:std", "<crate::io::buffered::bufreader::BufReader as crate::io::Seek>::seek_relative", "Argument[0]", "Argument[self]", "taint", "df-generated"]
       - ["lang:std", "<crate::io::buffered::bufreader::BufReader>::get_mut", "Argument[self].Field[crate::io::buffered::bufreader::BufReader::inner]", "ReturnValue.Reference", "value", "dfc-generated"]
       - ["lang:std", "<crate::io::buffered::bufreader::BufReader>::get_ref", "Argument[self].Field[crate::io::buffered::bufreader::BufReader::inner]", "ReturnValue.Reference", "value", "dfc-generated"]
       - ["lang:std", "<crate::io::buffered::bufreader::BufReader>::into_inner", "Argument[self].Field[crate::io::buffered::bufreader::BufReader::inner]", "ReturnValue", "value", "dfc-generated"]
@@ -211,10 +186,14 @@ extensions:
       - ["lang:std", "<crate::io::buffered::bufwriter::BufWriter>::with_buffer", "Argument[1]", "ReturnValue.Field[crate::io::buffered::bufwriter::BufWriter::buf]", "value", "dfc-generated"]
       - ["lang:std", "<crate::io::buffered::bufwriter::BufWriter>::with_capacity", "Argument[1]", "ReturnValue.Field[crate::io::buffered::bufwriter::BufWriter::inner]", "value", "dfc-generated"]
       - ["lang:std", "<crate::io::buffered::bufwriter::WriterPanicked>::into_inner", "Argument[self].Field[crate::io::buffered::bufwriter::WriterPanicked::buf]", "ReturnValue", "value", "dfc-generated"]
+      - ["lang:std", "<crate::io::buffered::linewriter::LineWriter>::get_mut", "Argument[self].Field[crate::io::buffered::linewriter::LineWriter::inner].Field[crate::io::buffered::bufwriter::BufWriter::inner]", "ReturnValue.Reference", "value", "dfc-generated"]
+      - ["lang:std", "<crate::io::buffered::linewriter::LineWriter>::get_ref", "Argument[self].Field[crate::io::buffered::linewriter::LineWriter::inner].Field[crate::io::buffered::bufwriter::BufWriter::inner]", "ReturnValue.Reference", "value", "dfc-generated"]
       - ["lang:std", "<crate::io::buffered::linewriter::LineWriter>::new", "Argument[0]", "ReturnValue.Field[crate::io::buffered::linewriter::LineWriter::inner].Field[crate::io::buffered::bufwriter::BufWriter::inner]", "value", "dfc-generated"]
       - ["lang:std", "<crate::io::buffered::linewriter::LineWriter>::with_capacity", "Argument[1]", "ReturnValue.Field[crate::io::buffered::linewriter::LineWriter::inner].Field[crate::io::buffered::bufwriter::BufWriter::inner]", "value", "dfc-generated"]
       - ["lang:std", "<crate::io::buffered::linewritershim::LineWriterShim>::new", "Argument[0]", "ReturnValue.Field[crate::io::buffered::linewritershim::LineWriterShim::buffer]", "value", "dfc-generated"]
-      - ["lang:std", "<crate::io::cursor::Cursor as crate::clone::Clone>::clone", "Argument[self]", "ReturnValue", "taint", "df-generated"]
+      - ["lang:std", "<crate::io::cursor::Cursor as crate::clone::Clone>::clone", "Argument[self].Field[crate::io::cursor::Cursor::inner].Reference", "ReturnValue.Field[crate::io::cursor::Cursor::inner]", "value", "dfc-generated"]
+      - ["lang:std", "<crate::io::cursor::Cursor as crate::clone::Clone>::clone", "Argument[self].Field[crate::io::cursor::Cursor::inner]", "ReturnValue.Field[crate::io::cursor::Cursor::inner]", "value", "dfc-generated"]
+      - ["lang:std", "<crate::io::cursor::Cursor as crate::clone::Clone>::clone", "Argument[self].Field[crate::io::cursor::Cursor::pos]", "ReturnValue.Field[crate::io::cursor::Cursor::pos]", "value", "dfc-generated"]
       - ["lang:std", "<crate::io::cursor::Cursor as crate::clone::Clone>::clone_from", "Argument[0].Field[crate::io::cursor::Cursor::inner]", "Argument[self].Field[crate::io::cursor::Cursor::inner].Reference", "value", "dfc-generated"]
       - ["lang:std", "<crate::io::cursor::Cursor as crate::clone::Clone>::clone_from", "Argument[0].Field[crate::io::cursor::Cursor::inner]", "Argument[self].Field[crate::io::cursor::Cursor::inner]", "value", "dfc-generated"]
       - ["lang:std", "<crate::io::cursor::Cursor as crate::clone::Clone>::clone_from", "Argument[0].Field[crate::io::cursor::Cursor::pos]", "Argument[self].Field[crate::io::cursor::Cursor::pos]", "value", "dfc-generated"]
@@ -231,16 +210,25 @@ extensions:
       - ["lang:std", "<crate::io::error::Error as crate::convert::From>::from", "Argument[0].Field[1]", "ReturnValue", "value", "dfc-generated"]
       - ["lang:std", "<crate::io::error::Error as crate::convert::From>::from", "Argument[0].Field[crate::io::buffered::IntoInnerError(1)]", "ReturnValue", "value", "dfc-generated"]
       - ["lang:std", "<crate::io::pipe::PipeReader as crate::io::Read>::read_to_end", "Argument[self]", "Argument[0]", "taint", "df-generated"]
+      - ["lang:std", "<crate::io::pipe::PipeReader as crate::sys_common::IntoInner>::into_inner", "Argument[self].Field[0]", "ReturnValue", "value", "dfc-generated"]
+      - ["lang:std", "<crate::io::pipe::PipeReader as crate::sys_common::IntoInner>::into_inner", "Argument[self].Field[crate::io::pipe::PipeReader(0)]", "ReturnValue", "value", "dfc-generated"]
+      - ["lang:std", "<crate::io::pipe::PipeWriter as crate::sys_common::IntoInner>::into_inner", "Argument[self].Field[0]", "ReturnValue", "value", "dfc-generated"]
+      - ["lang:std", "<crate::io::pipe::PipeWriter as crate::sys_common::IntoInner>::into_inner", "Argument[self].Field[crate::io::pipe::PipeWriter(0)]", "ReturnValue", "value", "dfc-generated"]
+      - ["lang:std", "<crate::io::stdio::Stderr>::lock", "Argument[self].Field[crate::io::stdio::Stderr::inner]", "ReturnValue.Field[crate::io::stdio::StderrLock::inner].Field[crate::sync::reentrant_lock::ReentrantLockGuard::lock]", "value", "dfc-generated"]
       - ["lang:std", "<crate::io::stdio::Stdin as crate::io::Read>::read", "Argument[self]", "Argument[0]", "taint", "df-generated"]
       - ["lang:std", "<crate::io::stdio::Stdin as crate::io::Read>::read_exact", "Argument[self]", "Argument[0]", "taint", "df-generated"]
       - ["lang:std", "<crate::io::stdio::Stdin as crate::io::Read>::read_to_string", "Argument[self]", "Argument[0]", "taint", "df-generated"]
       - ["lang:std", "<crate::io::stdio::Stdin>::lines", "Argument[self]", "ReturnValue", "taint", "df-generated"]
+      - ["lang:std", "<crate::io::stdio::Stdin>::lock", "Argument[self].Field[crate::io::stdio::Stdin::inner]", "ReturnValue.Field[crate::io::stdio::StdinLock::inner].Field[crate::sync::poison::mutex::MutexGuard::lock]", "value", "dfc-generated"]
       - ["lang:std", "<crate::io::stdio::Stdin>::read_line", "Argument[self]", "Argument[0]", "taint", "df-generated"]
       - ["lang:std", "<crate::io::stdio::StdinLock as crate::io::BufRead>::fill_buf", "Argument[self]", "ReturnValue", "taint", "df-generated"]
       - ["lang:std", "<crate::io::stdio::StdinLock as crate::io::BufRead>::read_line", "Argument[self]", "Argument[0]", "taint", "df-generated"]
       - ["lang:std", "<crate::io::stdio::StdinLock as crate::io::BufRead>::read_until", "Argument[self]", "Argument[1]", "taint", "df-generated"]
+      - ["lang:std", "<crate::io::stdio::StdinLock>::as_mut_buf", "Argument[self].Field[crate::io::stdio::StdinLock::inner]", "ReturnValue.Reference", "value", "dfc-generated"]
+      - ["lang:std", "<crate::io::stdio::StdinRaw as crate::io::Read>::read_exact", "Argument[self]", "Argument[0]", "taint", "df-generated"]
       - ["lang:std", "<crate::io::stdio::StdinRaw as crate::io::Read>::read_to_end", "Argument[self]", "Argument[0]", "taint", "df-generated"]
       - ["lang:std", "<crate::io::stdio::StdinRaw as crate::io::Read>::read_to_string", "Argument[self]", "Argument[0]", "taint", "df-generated"]
+      - ["lang:std", "<crate::io::stdio::Stdout>::lock", "Argument[self].Field[crate::io::stdio::Stdout::inner]", "ReturnValue.Field[crate::io::stdio::StdoutLock::inner].Field[crate::sync::reentrant_lock::ReentrantLockGuard::lock]", "value", "dfc-generated"]
       - ["lang:std", "<crate::net::tcp::TcpListener as crate::sys_common::AsInner>::as_inner", "Argument[self].Field[0]", "ReturnValue.Reference", "value", "dfc-generated"]
       - ["lang:std", "<crate::net::tcp::TcpListener as crate::sys_common::AsInner>::as_inner", "Argument[self].Field[crate::net::tcp::TcpListener(0)]", "ReturnValue.Reference", "value", "dfc-generated"]
       - ["lang:std", "<crate::net::tcp::TcpListener as crate::sys_common::FromInner>::from_inner", "Argument[0]", "ReturnValue.Field[crate::net::tcp::TcpListener(0)]", "value", "dfc-generated"]
@@ -259,11 +247,36 @@ extensions:
       - ["lang:std", "<crate::net::udp::UdpSocket as crate::sys_common::IntoInner>::into_inner", "Argument[self].Field[0]", "ReturnValue", "value", "dfc-generated"]
       - ["lang:std", "<crate::net::udp::UdpSocket as crate::sys_common::IntoInner>::into_inner", "Argument[self].Field[crate::net::udp::UdpSocket(0)]", "ReturnValue", "value", "dfc-generated"]
       - ["lang:std", "<crate::os::fd::owned::BorrowedFd as crate::os::fd::owned::AsFd>::as_fd", "Argument[self].Reference", "ReturnValue", "value", "dfc-generated"]
+      - ["lang:std", "<crate::os::fd::owned::OwnedFd as crate::convert::From>::from", "Argument[0]", "ReturnValue", "taint", "df-generated"]
+      - ["lang:std", "<crate::os::linux::process::PidFd as crate::sys_common::AsInner>::as_inner", "Argument[self].Field[crate::os::linux::process::PidFd::inner]", "ReturnValue.Reference", "value", "dfc-generated"]
+      - ["lang:std", "<crate::os::linux::process::PidFd as crate::sys_common::FromInner>::from_inner", "Argument[0]", "ReturnValue.Field[crate::os::linux::process::PidFd::inner]", "value", "dfc-generated"]
+      - ["lang:std", "<crate::os::linux::process::PidFd as crate::sys_common::IntoInner>::into_inner", "Argument[self].Field[crate::os::linux::process::PidFd::inner]", "ReturnValue", "value", "dfc-generated"]
       - ["lang:std", "<crate::os::unix::net::addr::SocketAddr>::from_parts", "Argument[0]", "ReturnValue.Field[crate::result::Result::Ok(0)].Field[crate::os::unix::net::addr::SocketAddr::addr]", "value", "dfc-generated"]
       - ["lang:std", "<crate::os::unix::net::addr::SocketAddr>::from_parts", "Argument[1]", "ReturnValue.Field[crate::result::Result::Ok(0)].Field[crate::os::unix::net::addr::SocketAddr::len]", "value", "dfc-generated"]
+      - ["lang:std", "<crate::os::unix::net::addr::SocketAddr>::new", "Argument[0].ReturnValue", "ReturnValue", "value", "dfc-generated"]
+      - ["lang:std", "<crate::os::unix::net::ancillary::AncillaryDataIter as crate::iter::traits::iterator::Iterator>::next", "Argument[self].Field[crate::os::unix::net::ancillary::AncillaryDataIter::data].Element", "Argument[self].Field[crate::os::unix::net::ancillary::AncillaryDataIter::data].Reference", "value", "dfc-generated"]
+      - ["lang:std", "<crate::os::unix::net::ancillary::ScmRights as crate::iter::traits::iterator::Iterator>::next", "Argument[self].Field[0].Element", "ReturnValue.Field[crate::option::Option::Some(0)]", "value", "dfc-generated"]
+      - ["lang:std", "<crate::os::unix::net::ancillary::ScmRights as crate::iter::traits::iterator::Iterator>::next", "Argument[self].Field[crate::os::unix::net::ancillary::ScmRights(0)].Element", "ReturnValue.Field[crate::option::Option::Some(0)]", "value", "dfc-generated"]
+      - ["lang:std", "<crate::os::unix::net::ancillary::SocketAncillary>::len", "Argument[self].Field[crate::os::unix::net::ancillary::SocketAncillary::length]", "ReturnValue", "value", "dfc-generated"]
+      - ["lang:std", "<crate::os::unix::net::ancillary::SocketAncillary>::messages", "Argument[self].Field[crate::os::unix::net::ancillary::SocketAncillary::buffer].Element", "ReturnValue.Field[crate::os::unix::net::ancillary::Messages::buffer].Reference", "value", "dfc-generated"]
+      - ["lang:std", "<crate::os::unix::net::ancillary::SocketAncillary>::new", "Argument[0]", "ReturnValue.Field[crate::os::unix::net::ancillary::SocketAncillary::buffer]", "value", "dfc-generated"]
+      - ["lang:std", "<crate::os::unix::net::ancillary::SocketAncillary>::truncated", "Argument[self].Field[crate::os::unix::net::ancillary::SocketAncillary::truncated]", "ReturnValue", "value", "dfc-generated"]
+      - ["lang:std", "<crate::os::unix::net::ancillary::SocketCred>::get_gid", "Argument[self].Field[0]", "ReturnValue", "value", "dfc-generated"]
+      - ["lang:std", "<crate::os::unix::net::ancillary::SocketCred>::get_gid", "Argument[self].Field[crate::os::unix::net::ancillary::SocketCred(0)]", "ReturnValue", "value", "dfc-generated"]
+      - ["lang:std", "<crate::os::unix::net::ancillary::SocketCred>::get_pid", "Argument[self].Field[0]", "ReturnValue", "value", "dfc-generated"]
+      - ["lang:std", "<crate::os::unix::net::ancillary::SocketCred>::get_pid", "Argument[self].Field[crate::os::unix::net::ancillary::SocketCred(0)]", "ReturnValue", "value", "dfc-generated"]
+      - ["lang:std", "<crate::os::unix::net::ancillary::SocketCred>::get_uid", "Argument[self].Field[0]", "ReturnValue", "value", "dfc-generated"]
+      - ["lang:std", "<crate::os::unix::net::ancillary::SocketCred>::get_uid", "Argument[self].Field[crate::os::unix::net::ancillary::SocketCred(0)]", "ReturnValue", "value", "dfc-generated"]
+      - ["lang:std", "<crate::os::unix::net::ancillary::SocketCred>::set_gid", "Argument[0]", "Argument[self].Field[0]", "value", "dfc-generated"]
+      - ["lang:std", "<crate::os::unix::net::ancillary::SocketCred>::set_gid", "Argument[0]", "Argument[self].Field[crate::os::unix::net::ancillary::SocketCred(0)]", "value", "dfc-generated"]
+      - ["lang:std", "<crate::os::unix::net::ancillary::SocketCred>::set_pid", "Argument[0]", "Argument[self].Field[0]", "value", "dfc-generated"]
+      - ["lang:std", "<crate::os::unix::net::ancillary::SocketCred>::set_pid", "Argument[0]", "Argument[self].Field[crate::os::unix::net::ancillary::SocketCred(0)]", "value", "dfc-generated"]
+      - ["lang:std", "<crate::os::unix::net::ancillary::SocketCred>::set_uid", "Argument[0]", "Argument[self].Field[0]", "value", "dfc-generated"]
+      - ["lang:std", "<crate::os::unix::net::ancillary::SocketCred>::set_uid", "Argument[0]", "Argument[self].Field[crate::os::unix::net::ancillary::SocketCred(0)]", "value", "dfc-generated"]
       - ["lang:std", "<crate::os::unix::net::datagram::UnixDatagram as crate::sys_common::AsInner>::as_inner", "Argument[self].Field[0]", "ReturnValue.Reference", "value", "dfc-generated"]
       - ["lang:std", "<crate::os::unix::net::datagram::UnixDatagram as crate::sys_common::AsInner>::as_inner", "Argument[self].Field[crate::os::unix::net::datagram::UnixDatagram(0)]", "ReturnValue.Reference", "value", "dfc-generated"]
       - ["lang:std", "<crate::os::unix::net::listener::UnixListener>::incoming", "Argument[self]", "ReturnValue.Field[crate::os::unix::net::listener::Incoming::listener]", "value", "dfc-generated"]
+      - ["lang:std", "<crate::os::unix::net::stream::UnixStream as crate::io::Read>::read", "Argument[self]", "Argument[0]", "taint", "df-generated"]
       - ["lang:std", "<crate::os::unix::net::stream::UnixStream as crate::sys_common::AsInner>::as_inner", "Argument[self].Field[0]", "ReturnValue.Reference", "value", "dfc-generated"]
       - ["lang:std", "<crate::os::unix::net::stream::UnixStream as crate::sys_common::AsInner>::as_inner", "Argument[self].Field[crate::os::unix::net::stream::UnixStream(0)]", "ReturnValue.Reference", "value", "dfc-generated"]
       - ["lang:std", "<crate::panic::PanicHookInfo>::can_unwind", "Argument[self].Field[crate::panic::PanicHookInfo::can_unwind]", "ReturnValue", "value", "dfc-generated"]
@@ -286,7 +299,9 @@ extensions:
       - ["lang:std", "<crate::path::Path>::as_mut_os_str", "Argument[self].Field[crate::path::Path::inner]", "ReturnValue.Reference", "value", "dfc-generated"]
       - ["lang:std", "<crate::path::Path>::as_os_str", "Argument[self].Field[crate::path::Path::inner]", "ReturnValue.Reference", "value", "dfc-generated"]
       - ["lang:std", "<crate::path::Path>::display", "Argument[self].Field[crate::path::Path::inner]", "ReturnValue.Field[crate::path::Display::inner].Field[crate::ffi::os_str::Display::os_str]", "value", "dfc-generated"]
-      - ["lang:std", "<crate::path::PathBuf as crate::clone::Clone>::clone", "Argument[self]", "ReturnValue", "taint", "df-generated"]
+      - ["lang:std", "<crate::path::PathBuf as crate::clone::Clone>::clone", "Argument[self].Field[crate::path::PathBuf::inner].Field[crate::ffi::os_str::OsString::inner]", "ReturnValue.Field[crate::path::PathBuf::inner].Field[crate::ffi::os_str::OsString::inner]", "value", "dfc-generated"]
+      - ["lang:std", "<crate::path::PathBuf as crate::clone::Clone>::clone", "Argument[self].Field[crate::path::PathBuf::inner].Reference", "ReturnValue.Field[crate::path::PathBuf::inner]", "value", "dfc-generated"]
+      - ["lang:std", "<crate::path::PathBuf as crate::clone::Clone>::clone", "Argument[self].Field[crate::path::PathBuf::inner]", "ReturnValue.Field[crate::path::PathBuf::inner]", "value", "dfc-generated"]
       - ["lang:std", "<crate::path::PathBuf as crate::convert::AsRef>::as_ref", "Argument[self].Field[crate::path::PathBuf::inner].Element", "ReturnValue.Reference", "value", "dfc-generated"]
       - ["lang:std", "<crate::path::PathBuf as crate::convert::AsRef>::as_ref", "Argument[self]", "ReturnValue", "value", "dfc-generated"]
       - ["lang:std", "<crate::path::PathBuf as crate::convert::From>::from", "Argument[0].Field[crate::path::PathBuf::inner].Field[crate::path::PathBuf::inner]", "ReturnValue.Field[crate::path::PathBuf::inner]", "value", "dfc-generated"]
@@ -300,6 +315,8 @@ extensions:
       - ["lang:std", "<crate::path::PathBuf>::into_os_string", "Argument[self].Field[crate::path::PathBuf::inner]", "ReturnValue", "value", "dfc-generated"]
       - ["lang:std", "<crate::path::PrefixComponent>::as_os_str", "Argument[self].Field[crate::path::PrefixComponent::raw]", "ReturnValue", "value", "dfc-generated"]
       - ["lang:std", "<crate::path::PrefixComponent>::kind", "Argument[self].Field[crate::path::PrefixComponent::parsed]", "ReturnValue", "value", "dfc-generated"]
+      - ["lang:std", "<crate::path::StripPrefixError as crate::fmt::Display>::fmt", "Argument[0]", "ReturnValue", "taint", "df-generated"]
+      - ["lang:std", "<crate::process::Child as crate::os::linux::process::ChildExt>::into_pidfd", "Argument[self]", "ReturnValue.Field[crate::result::Result::Err(0)]", "value", "dfc-generated"]
       - ["lang:std", "<crate::process::Child as crate::sys_common::AsInner>::as_inner", "Argument[self].Field[crate::process::Child::handle]", "ReturnValue.Reference", "value", "dfc-generated"]
       - ["lang:std", "<crate::process::Child as crate::sys_common::FromInner>::from_inner", "Argument[0].Field[0]", "ReturnValue.Field[crate::process::Child::handle]", "value", "dfc-generated"]
       - ["lang:std", "<crate::process::Child as crate::sys_common::IntoInner>::into_inner", "Argument[self].Field[crate::process::Child::handle]", "ReturnValue", "value", "dfc-generated"]
@@ -315,6 +332,7 @@ extensions:
       - ["lang:std", "<crate::process::ChildStdout as crate::sys_common::AsInner>::as_inner", "Argument[self].Field[crate::process::ChildStdout::inner]", "ReturnValue.Reference", "value", "dfc-generated"]
       - ["lang:std", "<crate::process::ChildStdout as crate::sys_common::FromInner>::from_inner", "Argument[0]", "ReturnValue.Field[crate::process::ChildStdout::inner]", "value", "dfc-generated"]
       - ["lang:std", "<crate::process::ChildStdout as crate::sys_common::IntoInner>::into_inner", "Argument[self].Field[crate::process::ChildStdout::inner]", "ReturnValue", "value", "dfc-generated"]
+      - ["lang:std", "<crate::process::Command as crate::os::linux::process::CommandExt>::create_pidfd", "Argument[self]", "ReturnValue", "value", "dfc-generated"]
       - ["lang:std", "<crate::process::Command as crate::os::unix::process::CommandExt>::arg0", "Argument[self]", "ReturnValue", "value", "dfc-generated"]
       - ["lang:std", "<crate::process::Command as crate::os::unix::process::CommandExt>::gid", "Argument[self]", "ReturnValue", "value", "dfc-generated"]
       - ["lang:std", "<crate::process::Command as crate::os::unix::process::CommandExt>::groups", "Argument[self]", "ReturnValue", "value", "dfc-generated"]
@@ -338,9 +356,12 @@ extensions:
       - ["lang:std", "<crate::process::ExitCode as crate::sys_common::AsInner>::as_inner", "Argument[self].Field[crate::process::ExitCode(0)]", "ReturnValue.Reference", "value", "dfc-generated"]
       - ["lang:std", "<crate::process::ExitCode as crate::sys_common::FromInner>::from_inner", "Argument[0]", "ReturnValue.Field[crate::process::ExitCode(0)]", "value", "dfc-generated"]
       - ["lang:std", "<crate::process::ExitCode>::to_i32", "Argument[self]", "ReturnValue", "taint", "df-generated"]
+      - ["lang:std", "<crate::process::ExitStatus as crate::os::unix::process::ExitStatusExt>::signal", "Argument[self]", "ReturnValue", "taint", "df-generated"]
+      - ["lang:std", "<crate::process::ExitStatus as crate::os::unix::process::ExitStatusExt>::stopped_signal", "Argument[self]", "ReturnValue", "taint", "df-generated"]
       - ["lang:std", "<crate::process::ExitStatus as crate::sys_common::AsInner>::as_inner", "Argument[self].Field[0]", "ReturnValue.Reference", "value", "dfc-generated"]
       - ["lang:std", "<crate::process::ExitStatus as crate::sys_common::AsInner>::as_inner", "Argument[self].Field[crate::process::ExitStatus(0)]", "ReturnValue.Reference", "value", "dfc-generated"]
       - ["lang:std", "<crate::process::ExitStatus as crate::sys_common::FromInner>::from_inner", "Argument[0]", "ReturnValue.Field[crate::process::ExitStatus(0)]", "value", "dfc-generated"]
+      - ["lang:std", "<crate::process::ExitStatus>::code", "Argument[self]", "ReturnValue", "taint", "df-generated"]
       - ["lang:std", "<crate::process::Stdio as crate::sys_common::FromInner>::from_inner", "Argument[0]", "ReturnValue.Field[crate::process::Stdio(0)]", "value", "dfc-generated"]
       - ["lang:std", "<crate::sync::barrier::Barrier>::new", "Argument[0]", "ReturnValue.Field[crate::sync::barrier::Barrier::num_threads]", "value", "dfc-generated"]
       - ["lang:std", "<crate::sync::barrier::BarrierWaitResult>::is_leader", "Argument[self].Field[0]", "ReturnValue", "value", "dfc-generated"]
@@ -356,6 +377,8 @@ extensions:
       - ["lang:std", "<crate::sync::mpmc::counter::Receiver>::acquire", "Argument[self].Field[crate::sync::mpmc::counter::Receiver::counter]", "ReturnValue.Field[crate::sync::mpmc::counter::Receiver::counter]", "value", "dfc-generated"]
       - ["lang:std", "<crate::sync::mpmc::counter::Sender>::acquire", "Argument[self].Field[crate::sync::mpmc::counter::Sender::counter]", "ReturnValue.Field[crate::sync::mpmc::counter::Sender::counter]", "value", "dfc-generated"]
       - ["lang:std", "<crate::sync::mpmc::error::SendTimeoutError as crate::convert::From>::from", "Argument[0].Field[crate::sync::mpsc::SendError(0)]", "ReturnValue.Field[crate::sync::mpmc::error::SendTimeoutError::Disconnected(0)]", "value", "dfc-generated"]
+      - ["lang:std", "<crate::sync::mpmc::error::SendTimeoutError as crate::fmt::Debug>::fmt", "Argument[0]", "ReturnValue", "taint", "df-generated"]
+      - ["lang:std", "<crate::sync::mpmc::error::SendTimeoutError as crate::fmt::Display>::fmt", "Argument[0]", "ReturnValue", "taint", "df-generated"]
       - ["lang:std", "<crate::sync::mpmc::list::Channel>::write", "Argument[1]", "ReturnValue.Field[crate::result::Result::Err(0)]", "value", "dfc-generated"]
       - ["lang:std", "<crate::sync::mpmc::select::Operation>::hook", "Argument[0]", "ReturnValue", "taint", "df-generated"]
       - ["lang:std", "<crate::sync::mpmc::select::Selected as crate::convert::From>::from", "Argument[0]", "ReturnValue.Field[crate::sync::mpmc::select::Selected::Operation(0)].Field[crate::sync::mpmc::select::Operation(0)]", "value", "dfc-generated"]
@@ -369,21 +392,28 @@ extensions:
       - ["lang:std", "<crate::sync::mpmc::zero::Channel>::write", "Argument[1]", "ReturnValue.Field[crate::result::Result::Err(0)]", "value", "dfc-generated"]
       - ["lang:std", "<crate::sync::mpsc::Receiver>::iter", "Argument[self]", "ReturnValue.Field[crate::sync::mpsc::Iter::rx]", "value", "dfc-generated"]
       - ["lang:std", "<crate::sync::mpsc::Receiver>::try_iter", "Argument[self]", "ReturnValue.Field[crate::sync::mpsc::TryIter::rx]", "value", "dfc-generated"]
+      - ["lang:std", "<crate::sync::mpsc::RecvError as crate::fmt::Display>::fmt", "Argument[0]", "ReturnValue", "taint", "df-generated"]
+      - ["lang:std", "<crate::sync::mpsc::RecvTimeoutError as crate::fmt::Display>::fmt", "Argument[0]", "ReturnValue", "taint", "df-generated"]
+      - ["lang:std", "<crate::sync::mpsc::SendError as crate::fmt::Display>::fmt", "Argument[0]", "ReturnValue", "taint", "df-generated"]
       - ["lang:std", "<crate::sync::mpsc::Sender as crate::clone::Clone>::clone", "Argument[self].Field[crate::sync::mpsc::Sender::inner].Reference", "ReturnValue.Field[crate::sync::mpsc::Sender::inner]", "value", "dfc-generated"]
-      - ["lang:std", "<crate::sync::mpsc::Sender as crate::clone::Clone>::clone", "Argument[self].Field[crate::sync::mpsc::Sender::inner]", "ReturnValue.Field[crate::sync::mpsc::Sender::inner].Reference", "value", "dfc-generated"]
       - ["lang:std", "<crate::sync::mpsc::Sender as crate::clone::Clone>::clone", "Argument[self].Field[crate::sync::mpsc::Sender::inner]", "ReturnValue.Field[crate::sync::mpsc::Sender::inner]", "value", "dfc-generated"]
       - ["lang:std", "<crate::sync::mpsc::SyncSender as crate::clone::Clone>::clone", "Argument[self].Field[crate::sync::mpsc::SyncSender::inner].Reference", "ReturnValue.Field[crate::sync::mpsc::SyncSender::inner]", "value", "dfc-generated"]
-      - ["lang:std", "<crate::sync::mpsc::SyncSender as crate::clone::Clone>::clone", "Argument[self].Field[crate::sync::mpsc::SyncSender::inner]", "ReturnValue.Field[crate::sync::mpsc::SyncSender::inner].Reference", "value", "dfc-generated"]
       - ["lang:std", "<crate::sync::mpsc::SyncSender as crate::clone::Clone>::clone", "Argument[self].Field[crate::sync::mpsc::SyncSender::inner]", "ReturnValue.Field[crate::sync::mpsc::SyncSender::inner]", "value", "dfc-generated"]
+      - ["lang:std", "<crate::sync::mpsc::TryRecvError as crate::fmt::Display>::fmt", "Argument[0]", "ReturnValue", "taint", "df-generated"]
       - ["lang:std", "<crate::sync::mpsc::TrySendError as crate::convert::From>::from", "Argument[0].Field[crate::sync::mpsc::SendError(0)]", "ReturnValue.Field[crate::sync::mpsc::TrySendError::Disconnected(0)]", "value", "dfc-generated"]
+      - ["lang:std", "<crate::sync::mpsc::TrySendError as crate::fmt::Debug>::fmt", "Argument[0]", "ReturnValue", "taint", "df-generated"]
+      - ["lang:std", "<crate::sync::mpsc::TrySendError as crate::fmt::Display>::fmt", "Argument[0]", "ReturnValue", "taint", "df-generated"]
       - ["lang:std", "<crate::sync::once_lock::OnceLock>::set", "Argument[0]", "ReturnValue.Field[crate::result::Result::Err(0)]", "value", "dfc-generated"]
       - ["lang:std", "<crate::sync::once_lock::OnceLock>::try_insert", "Argument[0]", "ReturnValue.Field[crate::result::Result::Err(0)].Field[1]", "value", "dfc-generated"]
+      - ["lang:std", "<crate::sync::poison::PoisonError as crate::fmt::Display>::fmt", "Argument[0]", "ReturnValue", "taint", "df-generated"]
       - ["lang:std", "<crate::sync::poison::PoisonError>::get_mut", "Argument[self].Field[crate::sync::poison::PoisonError::data]", "ReturnValue.Reference", "value", "dfc-generated"]
       - ["lang:std", "<crate::sync::poison::PoisonError>::get_ref", "Argument[self].Field[crate::sync::poison::PoisonError::data]", "ReturnValue.Reference", "value", "dfc-generated"]
       - ["lang:std", "<crate::sync::poison::PoisonError>::into_inner", "Argument[self].Field[crate::sync::poison::PoisonError::data]", "ReturnValue", "value", "dfc-generated"]
       - ["lang:std", "<crate::sync::poison::PoisonError>::new", "Argument[0]", "ReturnValue.Field[crate::sync::poison::PoisonError::data]", "value", "dfc-generated"]
       - ["lang:std", "<crate::sync::poison::TryLockError as crate::convert::From>::from", "Argument[0]", "ReturnValue.Field[crate::sync::poison::TryLockError::Poisoned(0)]", "value", "dfc-generated"]
       - ["lang:std", "<crate::sync::poison::TryLockError as crate::error::Error>::cause", "Argument[self].Reference.Field[crate::sync::poison::TryLockError::Poisoned(0)]", "ReturnValue.Field[crate::option::Option::Some(0)].Reference", "value", "dfc-generated"]
+      - ["lang:std", "<crate::sync::poison::TryLockError as crate::fmt::Debug>::fmt", "Argument[0]", "ReturnValue", "taint", "df-generated"]
+      - ["lang:std", "<crate::sync::poison::TryLockError as crate::fmt::Display>::fmt", "Argument[0]", "ReturnValue", "taint", "df-generated"]
       - ["lang:std", "<crate::sync::poison::condvar::Condvar>::wait", "Argument[0]", "ReturnValue.Field[crate::result::Result::Err(0)].Field[crate::sync::poison::PoisonError::data]", "value", "dfc-generated"]
       - ["lang:std", "<crate::sync::poison::condvar::Condvar>::wait", "Argument[0]", "ReturnValue.Field[crate::result::Result::Ok(0)]", "value", "dfc-generated"]
       - ["lang:std", "<crate::sync::poison::condvar::Condvar>::wait_timeout", "Argument[0]", "ReturnValue.Field[crate::result::Result::Ok(0)].Field[0]", "value", "dfc-generated"]
@@ -394,28 +424,41 @@ extensions:
       - ["lang:std", "<crate::sync::poison::condvar::Condvar>::wait_while", "Argument[0]", "ReturnValue.Field[crate::result::Result::Ok(0)]", "value", "dfc-generated"]
       - ["lang:std", "<crate::sync::poison::condvar::WaitTimeoutResult>::timed_out", "Argument[self].Field[0]", "ReturnValue", "value", "dfc-generated"]
       - ["lang:std", "<crate::sync::poison::condvar::WaitTimeoutResult>::timed_out", "Argument[self].Field[crate::sync::poison::condvar::WaitTimeoutResult(0)]", "ReturnValue", "value", "dfc-generated"]
+      - ["lang:std", "<crate::sync::poison::mutex::MappedMutexGuard>::map", "Argument[1]", "ReturnValue", "taint", "df-generated"]
       - ["lang:std", "<crate::sync::poison::mutex::MappedMutexGuard>::try_map", "Argument[0]", "ReturnValue.Field[crate::result::Result::Err(0)]", "value", "dfc-generated"]
       - ["lang:std", "<crate::sync::poison::mutex::Mutex as crate::convert::From>::from", "Argument[0]", "ReturnValue.Field[crate::sync::poison::mutex::Mutex::data].Field[crate::cell::UnsafeCell::value]", "value", "dfc-generated"]
+      - ["lang:std", "<crate::sync::poison::mutex::Mutex>::get_mut", "Argument[self].Field[crate::sync::poison::mutex::Mutex::data].Field[crate::cell::UnsafeCell::value]", "ReturnValue.Field[crate::result::Result::Ok(0)].Reference", "value", "dfc-generated"]
       - ["lang:std", "<crate::sync::poison::mutex::Mutex>::into_inner", "Argument[self].Field[crate::sync::poison::mutex::Mutex::data].Field[crate::cell::UnsafeCell::value]", "ReturnValue.Field[crate::result::Result::Err(0)].Field[crate::sync::poison::PoisonError::data]", "value", "dfc-generated"]
       - ["lang:std", "<crate::sync::poison::mutex::Mutex>::into_inner", "Argument[self].Field[crate::sync::poison::mutex::Mutex::data].Field[crate::cell::UnsafeCell::value]", "ReturnValue.Field[crate::result::Result::Ok(0)]", "value", "dfc-generated"]
       - ["lang:std", "<crate::sync::poison::mutex::Mutex>::lock", "Argument[self]", "ReturnValue.Field[crate::result::Result::Ok(0)].Field[crate::sync::poison::mutex::MutexGuard::lock]", "value", "dfc-generated"]
       - ["lang:std", "<crate::sync::poison::mutex::Mutex>::new", "Argument[0]", "ReturnValue.Field[crate::sync::poison::mutex::Mutex::data].Field[crate::cell::UnsafeCell::value]", "value", "dfc-generated"]
       - ["lang:std", "<crate::sync::poison::mutex::Mutex>::replace", "Argument[0]", "ReturnValue.Field[crate::result::Result::Err(0)].Field[crate::sync::poison::PoisonError::data]", "value", "dfc-generated"]
       - ["lang:std", "<crate::sync::poison::mutex::Mutex>::set", "Argument[0]", "ReturnValue.Field[crate::result::Result::Err(0)].Field[crate::sync::poison::PoisonError::data]", "value", "dfc-generated"]
+      - ["lang:std", "<crate::sync::poison::mutex::Mutex>::try_lock", "Argument[self]", "ReturnValue.Field[crate::result::Result::Ok(0)].Field[crate::sync::poison::mutex::MutexGuard::lock]", "value", "dfc-generated"]
+      - ["lang:std", "<crate::sync::poison::mutex::Mutex>::try_lock", "Argument[self]", "ReturnValue.Field[crate::sync::poison::mutex::MutexGuard::lock]", "value", "dfc-generated"]
+      - ["lang:std", "<crate::sync::poison::mutex::MutexGuard>::map", "Argument[1]", "ReturnValue", "taint", "df-generated"]
       - ["lang:std", "<crate::sync::poison::mutex::MutexGuard>::try_map", "Argument[0]", "ReturnValue.Field[crate::result::Result::Err(0)]", "value", "dfc-generated"]
-      - ["lang:std", "<crate::sync::poison::once::OnceState>::is_poisoned", "Argument[self].Field[crate::sync::poison::once::OnceState::inner].Field[crate::sys::sync::once::queue::OnceState::poisoned]", "ReturnValue", "value", "dfc-generated"]
+      - ["lang:std", "<crate::sync::poison::once::OnceState>::is_poisoned", "Argument[self].Field[crate::sync::poison::once::OnceState::inner].Field[crate::sys::sync::once::futex::OnceState::poisoned]", "ReturnValue", "value", "dfc-generated"]
+      - ["lang:std", "<crate::sync::poison::rwlock::MappedRwLockReadGuard>::map", "Argument[1]", "ReturnValue", "taint", "df-generated"]
       - ["lang:std", "<crate::sync::poison::rwlock::MappedRwLockReadGuard>::try_map", "Argument[0]", "ReturnValue.Field[crate::result::Result::Err(0)]", "value", "dfc-generated"]
+      - ["lang:std", "<crate::sync::poison::rwlock::MappedRwLockWriteGuard>::map", "Argument[1]", "ReturnValue", "taint", "df-generated"]
       - ["lang:std", "<crate::sync::poison::rwlock::MappedRwLockWriteGuard>::try_map", "Argument[0]", "ReturnValue.Field[crate::result::Result::Err(0)]", "value", "dfc-generated"]
       - ["lang:std", "<crate::sync::poison::rwlock::RwLock as crate::convert::From>::from", "Argument[0]", "ReturnValue.Field[crate::sync::poison::rwlock::RwLock::data].Field[crate::cell::UnsafeCell::value]", "value", "dfc-generated"]
+      - ["lang:std", "<crate::sync::poison::rwlock::RwLock>::get_mut", "Argument[self].Field[crate::sync::poison::rwlock::RwLock::data].Field[crate::cell::UnsafeCell::value]", "ReturnValue.Field[crate::result::Result::Ok(0)].Reference", "value", "dfc-generated"]
       - ["lang:std", "<crate::sync::poison::rwlock::RwLock>::into_inner", "Argument[self].Field[crate::sync::poison::rwlock::RwLock::data].Field[crate::cell::UnsafeCell::value]", "ReturnValue.Field[crate::result::Result::Err(0)].Field[crate::sync::poison::PoisonError::data]", "value", "dfc-generated"]
       - ["lang:std", "<crate::sync::poison::rwlock::RwLock>::into_inner", "Argument[self].Field[crate::sync::poison::rwlock::RwLock::data].Field[crate::cell::UnsafeCell::value]", "ReturnValue.Field[crate::result::Result::Ok(0)]", "value", "dfc-generated"]
       - ["lang:std", "<crate::sync::poison::rwlock::RwLock>::new", "Argument[0]", "ReturnValue.Field[crate::sync::poison::rwlock::RwLock::data].Field[crate::cell::UnsafeCell::value]", "value", "dfc-generated"]
       - ["lang:std", "<crate::sync::poison::rwlock::RwLock>::read", "Argument[self]", "ReturnValue", "taint", "df-generated"]
       - ["lang:std", "<crate::sync::poison::rwlock::RwLock>::replace", "Argument[0]", "ReturnValue.Field[crate::result::Result::Err(0)].Field[crate::sync::poison::PoisonError::data]", "value", "dfc-generated"]
       - ["lang:std", "<crate::sync::poison::rwlock::RwLock>::set", "Argument[0]", "ReturnValue.Field[crate::result::Result::Err(0)].Field[crate::sync::poison::PoisonError::data]", "value", "dfc-generated"]
+      - ["lang:std", "<crate::sync::poison::rwlock::RwLock>::try_read", "Argument[self].Field[crate::sync::poison::rwlock::RwLock::inner]", "ReturnValue.Field[crate::sync::poison::rwlock::RwLockReadGuard::inner_lock].Reference", "value", "dfc-generated"]
+      - ["lang:std", "<crate::sync::poison::rwlock::RwLock>::try_write", "Argument[self]", "ReturnValue.Field[crate::result::Result::Ok(0)].Field[crate::sync::poison::rwlock::RwLockWriteGuard::lock]", "value", "dfc-generated"]
+      - ["lang:std", "<crate::sync::poison::rwlock::RwLock>::try_write", "Argument[self]", "ReturnValue.Field[crate::sync::poison::rwlock::RwLockWriteGuard::lock]", "value", "dfc-generated"]
       - ["lang:std", "<crate::sync::poison::rwlock::RwLock>::write", "Argument[self]", "ReturnValue.Field[crate::result::Result::Ok(0)].Field[crate::sync::poison::rwlock::RwLockWriteGuard::lock]", "value", "dfc-generated"]
+      - ["lang:std", "<crate::sync::poison::rwlock::RwLockReadGuard>::map", "Argument[1]", "ReturnValue", "taint", "df-generated"]
       - ["lang:std", "<crate::sync::poison::rwlock::RwLockReadGuard>::try_map", "Argument[0]", "ReturnValue.Field[crate::result::Result::Err(0)]", "value", "dfc-generated"]
       - ["lang:std", "<crate::sync::poison::rwlock::RwLockWriteGuard>::downgrade", "Argument[0].Field[crate::sync::poison::rwlock::RwLockWriteGuard::lock].Field[crate::sync::poison::rwlock::RwLock::inner]", "ReturnValue.Field[crate::sync::poison::rwlock::RwLockReadGuard::inner_lock].Reference", "value", "dfc-generated"]
+      - ["lang:std", "<crate::sync::poison::rwlock::RwLockWriteGuard>::map", "Argument[1]", "ReturnValue", "taint", "df-generated"]
       - ["lang:std", "<crate::sync::poison::rwlock::RwLockWriteGuard>::try_map", "Argument[0]", "ReturnValue.Field[crate::result::Result::Err(0)]", "value", "dfc-generated"]
       - ["lang:std", "<crate::sync::reentrant_lock::ReentrantLock>::get_mut", "Argument[self].Field[crate::sync::reentrant_lock::ReentrantLock::data]", "ReturnValue.Reference", "value", "dfc-generated"]
       - ["lang:std", "<crate::sync::reentrant_lock::ReentrantLock>::into_inner", "Argument[self].Field[crate::sync::reentrant_lock::ReentrantLock::data]", "ReturnValue", "value", "dfc-generated"]
@@ -423,6 +466,39 @@ extensions:
       - ["lang:std", "<crate::sync::reentrant_lock::ReentrantLock>::new", "Argument[0]", "ReturnValue.Field[crate::sync::reentrant_lock::ReentrantLock::data]", "value", "dfc-generated"]
       - ["lang:std", "<crate::sync::reentrant_lock::ReentrantLock>::try_lock", "Argument[self]", "ReturnValue.Field[crate::option::Option::Some(0)].Field[crate::sync::reentrant_lock::ReentrantLockGuard::lock]", "value", "dfc-generated"]
       - ["lang:std", "<crate::sync::reentrant_lock::ReentrantLockGuard as crate::ops::deref::Deref>::deref", "Argument[self].Field[crate::sync::reentrant_lock::ReentrantLockGuard::lock].Field[crate::sync::reentrant_lock::ReentrantLock::data]", "ReturnValue.Reference", "value", "dfc-generated"]
+      - ["lang:std", "<crate::sys::fs::unix::DirBuilder>::set_mode", "Argument[0]", "Argument[self]", "taint", "df-generated"]
+      - ["lang:std", "<crate::sys::fs::unix::DirEntry>::ino", "Argument[self]", "ReturnValue", "taint", "df-generated"]
+      - ["lang:std", "<crate::sys::fs::unix::File as crate::sys_common::AsInner>::as_inner", "Argument[self].Field[0]", "ReturnValue.Reference", "value", "dfc-generated"]
+      - ["lang:std", "<crate::sys::fs::unix::File as crate::sys_common::AsInner>::as_inner", "Argument[self].Field[crate::sys::fs::unix::File(0)]", "ReturnValue.Reference", "value", "dfc-generated"]
+      - ["lang:std", "<crate::sys::fs::unix::File as crate::sys_common::AsInnerMut>::as_inner_mut", "Argument[self].Field[0]", "ReturnValue.Reference", "value", "dfc-generated"]
+      - ["lang:std", "<crate::sys::fs::unix::File as crate::sys_common::AsInnerMut>::as_inner_mut", "Argument[self].Field[crate::sys::fs::unix::File(0)]", "ReturnValue.Reference", "value", "dfc-generated"]
+      - ["lang:std", "<crate::sys::fs::unix::File as crate::sys_common::IntoInner>::into_inner", "Argument[self].Field[0]", "ReturnValue", "value", "dfc-generated"]
+      - ["lang:std", "<crate::sys::fs::unix::File as crate::sys_common::IntoInner>::into_inner", "Argument[self].Field[crate::sys::fs::unix::File(0)]", "ReturnValue", "value", "dfc-generated"]
+      - ["lang:std", "<crate::sys::fs::unix::FileAttr as crate::sys_common::AsInner>::as_inner", "Argument[self].Field[crate::sys::fs::unix::FileAttr::stat]", "ReturnValue.Reference", "value", "dfc-generated"]
+      - ["lang:std", "<crate::sys::fs::unix::FileAttr>::accessed", "Argument[self]", "ReturnValue", "taint", "df-generated"]
+      - ["lang:std", "<crate::sys::fs::unix::FileAttr>::file_type", "Argument[self]", "ReturnValue", "taint", "df-generated"]
+      - ["lang:std", "<crate::sys::fs::unix::FileAttr>::modified", "Argument[self]", "ReturnValue", "taint", "df-generated"]
+      - ["lang:std", "<crate::sys::fs::unix::FileAttr>::perm", "Argument[self]", "ReturnValue", "taint", "df-generated"]
+      - ["lang:std", "<crate::sys::fs::unix::FileAttr>::size", "Argument[self]", "ReturnValue", "taint", "df-generated"]
+      - ["lang:std", "<crate::sys::fs::unix::FilePermissions as crate::sys_common::FromInner>::from_inner", "Argument[0]", "ReturnValue", "taint", "df-generated"]
+      - ["lang:std", "<crate::sys::fs::unix::FilePermissions>::mode", "Argument[self]", "ReturnValue", "taint", "df-generated"]
+      - ["lang:std", "<crate::sys::fs::unix::FileTimes>::set_accessed", "Argument[0]", "Argument[self].Field[crate::sys::fs::unix::FileTimes::accessed].Field[crate::option::Option::Some(0)]", "value", "dfc-generated"]
+      - ["lang:std", "<crate::sys::fs::unix::FileTimes>::set_modified", "Argument[0]", "Argument[self].Field[crate::sys::fs::unix::FileTimes::modified].Field[crate::option::Option::Some(0)]", "value", "dfc-generated"]
+      - ["lang:std", "<crate::sys::fs::unix::OpenOptions>::append", "Argument[0]", "Argument[self].Field[crate::sys::fs::unix::OpenOptions::append]", "value", "dfc-generated"]
+      - ["lang:std", "<crate::sys::fs::unix::OpenOptions>::create", "Argument[0]", "Argument[self].Field[crate::sys::fs::unix::OpenOptions::create]", "value", "dfc-generated"]
+      - ["lang:std", "<crate::sys::fs::unix::OpenOptions>::create_new", "Argument[0]", "Argument[self].Field[crate::sys::fs::unix::OpenOptions::create_new]", "value", "dfc-generated"]
+      - ["lang:std", "<crate::sys::fs::unix::OpenOptions>::custom_flags", "Argument[0]", "Argument[self].Field[crate::sys::fs::unix::OpenOptions::custom_flags]", "value", "dfc-generated"]
+      - ["lang:std", "<crate::sys::fs::unix::OpenOptions>::mode", "Argument[0]", "Argument[self]", "taint", "df-generated"]
+      - ["lang:std", "<crate::sys::fs::unix::OpenOptions>::read", "Argument[0]", "Argument[self].Field[crate::sys::fs::unix::OpenOptions::read]", "value", "dfc-generated"]
+      - ["lang:std", "<crate::sys::fs::unix::OpenOptions>::truncate", "Argument[0]", "Argument[self].Field[crate::sys::fs::unix::OpenOptions::truncate]", "value", "dfc-generated"]
+      - ["lang:std", "<crate::sys::fs::unix::OpenOptions>::write", "Argument[0]", "Argument[self].Field[crate::sys::fs::unix::OpenOptions::write]", "value", "dfc-generated"]
+      - ["lang:std", "<crate::sys::fs::unix::cfm::CachedFileMetadata as crate::io::Read>::read", "Argument[self]", "Argument[0]", "taint", "df-generated"]
+      - ["lang:std", "<crate::sys::fs::unix::cfm::CachedFileMetadata as crate::io::Read>::read_to_end", "Argument[self]", "Argument[0]", "taint", "df-generated"]
+      - ["lang:std", "<crate::sys::fs::unix::cfm::CachedFileMetadata as crate::io::Read>::read_to_string", "Argument[self]", "Argument[0]", "taint", "df-generated"]
+      - ["lang:std", "<crate::sys::fs::unix::cfm::CachedFileMetadata as crate::sys::pal::unix::kernel_copy::CopyRead>::properties", "Argument[self].Field[1].Reference", "ReturnValue.Field[crate::sys::pal::unix::kernel_copy::CopyParams(0)].Field[crate::sys::pal::unix::kernel_copy::FdMeta::Metadata(0)]", "value", "dfc-generated"]
+      - ["lang:std", "<crate::sys::fs::unix::cfm::CachedFileMetadata as crate::sys::pal::unix::kernel_copy::CopyRead>::properties", "Argument[self].Field[crate::sys::fs::unix::cfm::CachedFileMetadata(1)].Reference", "ReturnValue.Field[crate::sys::pal::unix::kernel_copy::CopyParams(0)].Field[crate::sys::pal::unix::kernel_copy::FdMeta::Metadata(0)]", "value", "dfc-generated"]
+      - ["lang:std", "<crate::sys::fs::unix::cfm::CachedFileMetadata as crate::sys::pal::unix::kernel_copy::CopyWrite>::properties", "Argument[self].Field[1].Reference", "ReturnValue.Field[crate::sys::pal::unix::kernel_copy::CopyParams(0)].Field[crate::sys::pal::unix::kernel_copy::FdMeta::Metadata(0)]", "value", "dfc-generated"]
+      - ["lang:std", "<crate::sys::fs::unix::cfm::CachedFileMetadata as crate::sys::pal::unix::kernel_copy::CopyWrite>::properties", "Argument[self].Field[crate::sys::fs::unix::cfm::CachedFileMetadata(1)].Reference", "ReturnValue.Field[crate::sys::pal::unix::kernel_copy::CopyParams(0)].Field[crate::sys::pal::unix::kernel_copy::FdMeta::Metadata(0)]", "value", "dfc-generated"]
       - ["lang:std", "<crate::sys::net::connection::socket::LookupHost>::port", "Argument[self].Field[crate::sys::net::connection::socket::LookupHost::port]", "ReturnValue", "value", "dfc-generated"]
       - ["lang:std", "<crate::sys::net::connection::socket::TcpListener as crate::sys_common::FromInner>::from_inner", "Argument[0]", "ReturnValue.Field[crate::sys::net::connection::socket::TcpListener::inner]", "value", "dfc-generated"]
       - ["lang:std", "<crate::sys::net::connection::socket::TcpListener>::bind", "Argument[0].Field[crate::option::Option::Some(0)]", "ReturnValue", "value", "dfc-generated"]
@@ -447,80 +523,31 @@ extensions:
       - ["lang:std", "<crate::sys::net::connection::socket::unix::Socket as crate::sys_common::IntoInner>::into_inner", "Argument[self].Field[0]", "ReturnValue", "value", "dfc-generated"]
       - ["lang:std", "<crate::sys::net::connection::socket::unix::Socket as crate::sys_common::IntoInner>::into_inner", "Argument[self].Field[crate::sys::net::connection::socket::unix::Socket(0)]", "ReturnValue", "value", "dfc-generated"]
       - ["lang:std", "<crate::sys::os_str::bytes::Buf as crate::clone::Clone>::clone", "Argument[self].Field[crate::sys::os_str::bytes::Buf::inner].Reference", "ReturnValue.Field[crate::sys::os_str::bytes::Buf::inner]", "value", "dfc-generated"]
-      - ["lang:std", "<crate::sys::os_str::bytes::Buf as crate::clone::Clone>::clone", "Argument[self].Field[crate::sys::os_str::bytes::Buf::inner]", "ReturnValue.Field[crate::sys::os_str::bytes::Buf::inner]", "value", "dfc-generated"]
       - ["lang:std", "<crate::sys::os_str::bytes::Buf as crate::sys_common::AsInner>::as_inner", "Argument[self].Field[crate::sys::os_str::bytes::Buf::inner]", "ReturnValue.Reference", "value", "dfc-generated"]
       - ["lang:std", "<crate::sys::os_str::bytes::Buf as crate::sys_common::FromInner>::from_inner", "Argument[0]", "ReturnValue.Field[crate::sys::os_str::bytes::Buf::inner]", "value", "dfc-generated"]
       - ["lang:std", "<crate::sys::os_str::bytes::Buf as crate::sys_common::IntoInner>::into_inner", "Argument[self].Field[crate::sys::os_str::bytes::Buf::inner]", "ReturnValue", "value", "dfc-generated"]
       - ["lang:std", "<crate::sys::os_str::bytes::Buf>::from_encoded_bytes_unchecked", "Argument[0]", "ReturnValue.Field[crate::sys::os_str::bytes::Buf::inner]", "value", "dfc-generated"]
       - ["lang:std", "<crate::sys::os_str::bytes::Buf>::into_encoded_bytes", "Argument[self].Field[crate::sys::os_str::bytes::Buf::inner]", "ReturnValue", "value", "dfc-generated"]
+      - ["lang:std", "<crate::sys::os_str::bytes::Slice as crate::fmt::Display>::fmt", "Argument[0]", "ReturnValue", "taint", "df-generated"]
       - ["lang:std", "<crate::sys::os_str::bytes::Slice>::as_encoded_bytes", "Argument[self].Field[crate::sys::os_str::bytes::Slice::inner]", "ReturnValue.Reference", "value", "dfc-generated"]
       - ["lang:std", "<crate::sys::pal::unix::fd::FileDesc as crate::sys_common::AsInner>::as_inner", "Argument[self].Field[0]", "ReturnValue.Reference", "value", "dfc-generated"]
       - ["lang:std", "<crate::sys::pal::unix::fd::FileDesc as crate::sys_common::AsInner>::as_inner", "Argument[self].Field[crate::sys::pal::unix::fd::FileDesc(0)]", "ReturnValue.Reference", "value", "dfc-generated"]
       - ["lang:std", "<crate::sys::pal::unix::fd::FileDesc as crate::sys_common::IntoInner>::into_inner", "Argument[self].Field[0]", "ReturnValue", "value", "dfc-generated"]
       - ["lang:std", "<crate::sys::pal::unix::fd::FileDesc as crate::sys_common::IntoInner>::into_inner", "Argument[self].Field[crate::sys::pal::unix::fd::FileDesc(0)]", "ReturnValue", "value", "dfc-generated"]
       - ["lang:std", "<crate::sys::pal::unix::fd::FileDesc>::read_to_end", "Argument[self]", "Argument[0]", "taint", "df-generated"]
-      - ["lang:std", "<crate::sys::pal::unix::fs::DirBuilder>::set_mode", "Argument[0]", "Argument[self]", "taint", "df-generated"]
-      - ["lang:std", "<crate::sys::pal::unix::fs::DirEntry>::ino", "Argument[self]", "ReturnValue", "taint", "df-generated"]
-      - ["lang:std", "<crate::sys::pal::unix::fs::File as crate::sys_common::AsInner>::as_inner", "Argument[self].Field[0]", "ReturnValue.Reference", "value", "dfc-generated"]
-      - ["lang:std", "<crate::sys::pal::unix::fs::File as crate::sys_common::AsInner>::as_inner", "Argument[self].Field[crate::sys::pal::unix::fs::File(0)]", "ReturnValue.Reference", "value", "dfc-generated"]
-      - ["lang:std", "<crate::sys::pal::unix::fs::File as crate::sys_common::AsInnerMut>::as_inner_mut", "Argument[self].Field[0]", "ReturnValue.Reference", "value", "dfc-generated"]
-      - ["lang:std", "<crate::sys::pal::unix::fs::File as crate::sys_common::AsInnerMut>::as_inner_mut", "Argument[self].Field[crate::sys::pal::unix::fs::File(0)]", "ReturnValue.Reference", "value", "dfc-generated"]
-      - ["lang:std", "<crate::sys::pal::unix::fs::File as crate::sys_common::IntoInner>::into_inner", "Argument[self].Field[0]", "ReturnValue", "value", "dfc-generated"]
-      - ["lang:std", "<crate::sys::pal::unix::fs::File as crate::sys_common::IntoInner>::into_inner", "Argument[self].Field[crate::sys::pal::unix::fs::File(0)]", "ReturnValue", "value", "dfc-generated"]
-      - ["lang:std", "<crate::sys::pal::unix::fs::FileAttr as crate::sys_common::AsInner>::as_inner", "Argument[self].Field[crate::sys::pal::unix::fs::FileAttr::stat]", "ReturnValue.Reference", "value", "dfc-generated"]
-      - ["lang:std", "<crate::sys::pal::unix::fs::FileAttr>::file_type", "Argument[self]", "ReturnValue", "taint", "df-generated"]
-      - ["lang:std", "<crate::sys::pal::unix::fs::FileAttr>::perm", "Argument[self]", "ReturnValue", "taint", "df-generated"]
-      - ["lang:std", "<crate::sys::pal::unix::fs::FileAttr>::size", "Argument[self]", "ReturnValue", "taint", "df-generated"]
-      - ["lang:std", "<crate::sys::pal::unix::fs::FilePermissions as crate::sys_common::FromInner>::from_inner", "Argument[0]", "ReturnValue", "taint", "df-generated"]
-      - ["lang:std", "<crate::sys::pal::unix::fs::FilePermissions>::mode", "Argument[self]", "ReturnValue", "taint", "df-generated"]
-      - ["lang:std", "<crate::sys::pal::unix::fs::FileTimes>::set_accessed", "Argument[0]", "Argument[self].Field[crate::sys::pal::unix::fs::FileTimes::accessed].Field[crate::option::Option::Some(0)]", "value", "dfc-generated"]
-      - ["lang:std", "<crate::sys::pal::unix::fs::FileTimes>::set_created", "Argument[0]", "Argument[self].Field[crate::sys::pal::unix::fs::FileTimes::created].Field[crate::option::Option::Some(0)]", "value", "dfc-generated"]
-      - ["lang:std", "<crate::sys::pal::unix::fs::FileTimes>::set_modified", "Argument[0]", "Argument[self].Field[crate::sys::pal::unix::fs::FileTimes::modified].Field[crate::option::Option::Some(0)]", "value", "dfc-generated"]
-      - ["lang:std", "<crate::sys::pal::unix::fs::OpenOptions>::append", "Argument[0]", "Argument[self].Field[crate::sys::pal::unix::fs::OpenOptions::append]", "value", "dfc-generated"]
-      - ["lang:std", "<crate::sys::pal::unix::fs::OpenOptions>::create", "Argument[0]", "Argument[self].Field[crate::sys::pal::unix::fs::OpenOptions::create]", "value", "dfc-generated"]
-      - ["lang:std", "<crate::sys::pal::unix::fs::OpenOptions>::create_new", "Argument[0]", "Argument[self].Field[crate::sys::pal::unix::fs::OpenOptions::create_new]", "value", "dfc-generated"]
-      - ["lang:std", "<crate::sys::pal::unix::fs::OpenOptions>::custom_flags", "Argument[0]", "Argument[self].Field[crate::sys::pal::unix::fs::OpenOptions::custom_flags]", "value", "dfc-generated"]
-      - ["lang:std", "<crate::sys::pal::unix::fs::OpenOptions>::mode", "Argument[0]", "Argument[self]", "taint", "df-generated"]
-      - ["lang:std", "<crate::sys::pal::unix::fs::OpenOptions>::read", "Argument[0]", "Argument[self].Field[crate::sys::pal::unix::fs::OpenOptions::read]", "value", "dfc-generated"]
-      - ["lang:std", "<crate::sys::pal::unix::fs::OpenOptions>::truncate", "Argument[0]", "Argument[self].Field[crate::sys::pal::unix::fs::OpenOptions::truncate]", "value", "dfc-generated"]
-      - ["lang:std", "<crate::sys::pal::unix::fs::OpenOptions>::write", "Argument[0]", "Argument[self].Field[crate::sys::pal::unix::fs::OpenOptions::write]", "value", "dfc-generated"]
-      - ["lang:std", "<crate::sys::pal::unix::fs::cfm::CachedFileMetadata as crate::io::Read>::read", "Argument[self]", "Argument[0]", "taint", "df-generated"]
-      - ["lang:std", "<crate::sys::pal::unix::fs::cfm::CachedFileMetadata as crate::io::Read>::read_to_end", "Argument[self]", "Argument[0]", "taint", "df-generated"]
-      - ["lang:std", "<crate::sys::pal::unix::fs::cfm::CachedFileMetadata as crate::io::Read>::read_to_string", "Argument[self]", "Argument[0]", "taint", "df-generated"]
+      - ["lang:std", "<crate::sys::pal::unix::linux::pidfd::PidFd as crate::sys_common::AsInner>::as_inner", "Argument[self].Field[0]", "ReturnValue.Reference", "value", "dfc-generated"]
+      - ["lang:std", "<crate::sys::pal::unix::linux::pidfd::PidFd as crate::sys_common::AsInner>::as_inner", "Argument[self].Field[crate::sys::pal::unix::linux::pidfd::PidFd(0)]", "ReturnValue.Reference", "value", "dfc-generated"]
+      - ["lang:std", "<crate::sys::pal::unix::linux::pidfd::PidFd as crate::sys_common::IntoInner>::into_inner", "Argument[self].Field[0]", "ReturnValue", "value", "dfc-generated"]
+      - ["lang:std", "<crate::sys::pal::unix::linux::pidfd::PidFd as crate::sys_common::IntoInner>::into_inner", "Argument[self].Field[crate::sys::pal::unix::linux::pidfd::PidFd(0)]", "ReturnValue", "value", "dfc-generated"]
       - ["lang:std", "<crate::sys::pal::unix::pipe::AnonPipe as crate::sys_common::IntoInner>::into_inner", "Argument[self].Field[0]", "ReturnValue", "value", "dfc-generated"]
       - ["lang:std", "<crate::sys::pal::unix::pipe::AnonPipe as crate::sys_common::IntoInner>::into_inner", "Argument[self].Field[crate::sys::pal::unix::pipe::AnonPipe(0)]", "ReturnValue", "value", "dfc-generated"]
       - ["lang:std", "<crate::sys::pal::unix::pipe::AnonPipe>::as_file_desc", "Argument[self].Field[0]", "ReturnValue.Reference", "value", "dfc-generated"]
       - ["lang:std", "<crate::sys::pal::unix::pipe::AnonPipe>::as_file_desc", "Argument[self].Field[crate::sys::pal::unix::pipe::AnonPipe(0)]", "ReturnValue.Reference", "value", "dfc-generated"]
       - ["lang:std", "<crate::sys::pal::unix::pipe::AnonPipe>::read_to_end", "Argument[self]", "Argument[0]", "taint", "df-generated"]
-      - ["lang:std", "<crate::sys::pal::unix::process::process_common::ChildStdio>::fd", "Argument[self].Reference.Field[crate::sys::pal::unix::process::process_common::ChildStdio::Explicit(0)]", "ReturnValue.Field[crate::option::Option::Some(0)]", "value", "dfc-generated"]
-      - ["lang:std", "<crate::sys::pal::unix::process::process_common::Command>::env_mut", "Argument[self].Field[crate::sys::pal::unix::process::process_common::Command::env]", "ReturnValue.Reference", "value", "dfc-generated"]
-      - ["lang:std", "<crate::sys::pal::unix::process::process_common::Command>::get_argv", "Argument[self].Field[crate::sys::pal::unix::process::process_common::Command::argv].Field[0]", "ReturnValue.Reference", "value", "dfc-generated"]
-      - ["lang:std", "<crate::sys::pal::unix::process::process_common::Command>::get_argv", "Argument[self].Field[crate::sys::pal::unix::process::process_common::Command::argv].Field[crate::sys::pal::unix::process::process_common::Argv(0)]", "ReturnValue.Reference", "value", "dfc-generated"]
-      - ["lang:std", "<crate::sys::pal::unix::process::process_common::Command>::get_closures", "Argument[self].Field[crate::sys::pal::unix::process::process_common::Command::closures]", "ReturnValue.Reference", "value", "dfc-generated"]
-      - ["lang:std", "<crate::sys::pal::unix::process::process_common::Command>::get_gid", "Argument[self].Field[crate::sys::pal::unix::process::process_common::Command::gid]", "ReturnValue", "value", "dfc-generated"]
-      - ["lang:std", "<crate::sys::pal::unix::process::process_common::Command>::get_pgroup", "Argument[self].Field[crate::sys::pal::unix::process::process_common::Command::pgroup]", "ReturnValue", "value", "dfc-generated"]
-      - ["lang:std", "<crate::sys::pal::unix::process::process_common::Command>::get_program_cstr", "Argument[self].Field[crate::sys::pal::unix::process::process_common::Command::program].Reference", "ReturnValue.Reference", "value", "dfc-generated"]
-      - ["lang:std", "<crate::sys::pal::unix::process::process_common::Command>::get_program_kind", "Argument[self].Field[crate::sys::pal::unix::process::process_common::Command::program_kind]", "ReturnValue", "value", "dfc-generated"]
-      - ["lang:std", "<crate::sys::pal::unix::process::process_common::Command>::get_uid", "Argument[self].Field[crate::sys::pal::unix::process::process_common::Command::uid]", "ReturnValue", "value", "dfc-generated"]
-      - ["lang:std", "<crate::sys::pal::unix::process::process_common::Command>::gid", "Argument[0]", "Argument[self].Field[crate::sys::pal::unix::process::process_common::Command::gid].Field[crate::option::Option::Some(0)]", "value", "dfc-generated"]
-      - ["lang:std", "<crate::sys::pal::unix::process::process_common::Command>::pgroup", "Argument[0]", "Argument[self].Field[crate::sys::pal::unix::process::process_common::Command::pgroup].Field[crate::option::Option::Some(0)]", "value", "dfc-generated"]
-      - ["lang:std", "<crate::sys::pal::unix::process::process_common::Command>::saw_nul", "Argument[self].Field[crate::sys::pal::unix::process::process_common::Command::saw_nul]", "ReturnValue", "value", "dfc-generated"]
-      - ["lang:std", "<crate::sys::pal::unix::process::process_common::Command>::stderr", "Argument[0]", "Argument[self].Field[crate::sys::pal::unix::process::process_common::Command::stderr].Field[crate::option::Option::Some(0)]", "value", "dfc-generated"]
-      - ["lang:std", "<crate::sys::pal::unix::process::process_common::Command>::stdin", "Argument[0]", "Argument[self].Field[crate::sys::pal::unix::process::process_common::Command::stdin].Field[crate::option::Option::Some(0)]", "value", "dfc-generated"]
-      - ["lang:std", "<crate::sys::pal::unix::process::process_common::Command>::stdout", "Argument[0]", "Argument[self].Field[crate::sys::pal::unix::process::process_common::Command::stdout].Field[crate::option::Option::Some(0)]", "value", "dfc-generated"]
-      - ["lang:std", "<crate::sys::pal::unix::process::process_common::Command>::uid", "Argument[0]", "Argument[self].Field[crate::sys::pal::unix::process::process_common::Command::uid].Field[crate::option::Option::Some(0)]", "value", "dfc-generated"]
-      - ["lang:std", "<crate::sys::pal::unix::process::process_common::ExitCode>::as_i32", "Argument[self]", "ReturnValue", "taint", "df-generated"]
-      - ["lang:std", "<crate::sys::pal::unix::process::process_common::Stdio as crate::convert::From>::from", "Argument[0].Field[0]", "ReturnValue.Field[crate::sys::pal::unix::process::process_common::Stdio::Fd(0)]", "value", "dfc-generated"]
-      - ["lang:std", "<crate::sys::pal::unix::process::process_common::Stdio as crate::convert::From>::from", "Argument[0].Field[crate::sys::pal::unix::fs::File(0)]", "ReturnValue.Field[crate::sys::pal::unix::process::process_common::Stdio::Fd(0)]", "value", "dfc-generated"]
-      - ["lang:std", "<crate::sys::pal::unix::process::process_common::Stdio as crate::convert::From>::from", "Argument[0].Field[crate::sys::pal::unix::pipe::AnonPipe(0)]", "ReturnValue.Field[crate::sys::pal::unix::process::process_common::Stdio::Fd(0)]", "value", "dfc-generated"]
-      - ["lang:std", "<crate::sys::pal::unix::process::process_inner::ExitStatus as crate::convert::From>::from", "Argument[0]", "ReturnValue.Field[crate::sys::pal::unix::process::process_inner::ExitStatus(0)]", "value", "dfc-generated"]
-      - ["lang:std", "<crate::sys::pal::unix::process::process_inner::ExitStatus>::into_raw", "Argument[self].Field[0]", "ReturnValue", "value", "dfc-generated"]
-      - ["lang:std", "<crate::sys::pal::unix::process::process_inner::ExitStatus>::into_raw", "Argument[self].Field[crate::sys::pal::unix::process::process_inner::ExitStatus(0)]", "ReturnValue", "value", "dfc-generated"]
-      - ["lang:std", "<crate::sys::pal::unix::process::process_inner::ExitStatus>::new", "Argument[0]", "ReturnValue.Field[crate::sys::pal::unix::process::process_inner::ExitStatus(0)]", "value", "dfc-generated"]
-      - ["lang:std", "<crate::sys::pal::unix::process::process_inner::Process>::id", "Argument[self]", "ReturnValue", "taint", "df-generated"]
       - ["lang:std", "<crate::sys::pal::unix::thread::Thread>::id", "Argument[self].Field[crate::sys::pal::unix::thread::Thread::id]", "ReturnValue", "value", "dfc-generated"]
       - ["lang:std", "<crate::sys::pal::unix::time::Instant>::checked_sub_instant", "Argument[0]", "ReturnValue", "taint", "df-generated"]
       - ["lang:std", "<crate::sys::pal::unix::time::Instant>::checked_sub_instant", "Argument[self]", "ReturnValue", "taint", "df-generated"]
+      - ["lang:std", "<crate::sys::pal::unix::time::SystemTime>::new", "Argument[0]", "ReturnValue.Field[crate::sys::pal::unix::time::Timespec::tv_sec]", "value", "dfc-generated"]
       - ["lang:std", "<crate::sys::pal::unix::time::SystemTime>::sub_time", "Argument[0]", "ReturnValue", "taint", "df-generated"]
       - ["lang:std", "<crate::sys::pal::unix::time::SystemTime>::sub_time", "Argument[self]", "ReturnValue", "taint", "df-generated"]
       - ["lang:std", "<crate::sys::pal::unix::time::Timespec>::sub_timespec", "Argument[0]", "ReturnValue", "taint", "df-generated"]
@@ -529,9 +556,44 @@ extensions:
       - ["lang:std", "<crate::sys::pal::unix::weak::ExternWeak>::get", "Argument[self].Field[crate::sys::pal::unix::weak::ExternWeak::weak_ptr]", "ReturnValue", "value", "dfc-generated"]
       - ["lang:std", "<crate::sys::pal::unix::weak::ExternWeak>::new", "Argument[0]", "ReturnValue.Field[crate::sys::pal::unix::weak::ExternWeak::weak_ptr]", "value", "dfc-generated"]
       - ["lang:std", "<crate::sys::personality::dwarf::DwarfReader>::new", "Argument[0]", "ReturnValue.Field[crate::sys::personality::dwarf::DwarfReader::ptr]", "value", "dfc-generated"]
-      - ["lang:std", "<crate::sys::sync::once::queue::OnceState>::is_poisoned", "Argument[self].Field[crate::sys::sync::once::queue::OnceState::poisoned]", "ReturnValue", "value", "dfc-generated"]
+      - ["lang:std", "<crate::sys::process::unix::common::ChildStdio>::fd", "Argument[self].Reference.Field[crate::sys::process::unix::common::ChildStdio::Explicit(0)]", "ReturnValue.Field[crate::option::Option::Some(0)]", "value", "dfc-generated"]
+      - ["lang:std", "<crate::sys::process::unix::common::Command>::create_pidfd", "Argument[0]", "Argument[self].Field[crate::sys::process::unix::common::Command::create_pidfd]", "value", "dfc-generated"]
+      - ["lang:std", "<crate::sys::process::unix::common::Command>::env_mut", "Argument[self].Field[crate::sys::process::unix::common::Command::env]", "ReturnValue.Reference", "value", "dfc-generated"]
+      - ["lang:std", "<crate::sys::process::unix::common::Command>::get_argv", "Argument[self].Field[crate::sys::process::unix::common::Command::argv].Field[0]", "ReturnValue.Reference", "value", "dfc-generated"]
+      - ["lang:std", "<crate::sys::process::unix::common::Command>::get_argv", "Argument[self].Field[crate::sys::process::unix::common::Command::argv].Field[crate::sys::process::unix::common::Argv(0)]", "ReturnValue.Reference", "value", "dfc-generated"]
+      - ["lang:std", "<crate::sys::process::unix::common::Command>::get_closures", "Argument[self].Field[crate::sys::process::unix::common::Command::closures]", "ReturnValue.Reference", "value", "dfc-generated"]
+      - ["lang:std", "<crate::sys::process::unix::common::Command>::get_create_pidfd", "Argument[self].Field[crate::sys::process::unix::common::Command::create_pidfd]", "ReturnValue", "value", "dfc-generated"]
+      - ["lang:std", "<crate::sys::process::unix::common::Command>::get_gid", "Argument[self].Field[crate::sys::process::unix::common::Command::gid]", "ReturnValue", "value", "dfc-generated"]
+      - ["lang:std", "<crate::sys::process::unix::common::Command>::get_pgroup", "Argument[self].Field[crate::sys::process::unix::common::Command::pgroup]", "ReturnValue", "value", "dfc-generated"]
+      - ["lang:std", "<crate::sys::process::unix::common::Command>::get_program_cstr", "Argument[self].Field[crate::sys::process::unix::common::Command::program].Reference", "ReturnValue.Reference", "value", "dfc-generated"]
+      - ["lang:std", "<crate::sys::process::unix::common::Command>::get_program_kind", "Argument[self].Field[crate::sys::process::unix::common::Command::program_kind]", "ReturnValue", "value", "dfc-generated"]
+      - ["lang:std", "<crate::sys::process::unix::common::Command>::get_uid", "Argument[self].Field[crate::sys::process::unix::common::Command::uid]", "ReturnValue", "value", "dfc-generated"]
+      - ["lang:std", "<crate::sys::process::unix::common::Command>::gid", "Argument[0]", "Argument[self].Field[crate::sys::process::unix::common::Command::gid].Field[crate::option::Option::Some(0)]", "value", "dfc-generated"]
+      - ["lang:std", "<crate::sys::process::unix::common::Command>::pgroup", "Argument[0]", "Argument[self].Field[crate::sys::process::unix::common::Command::pgroup].Field[crate::option::Option::Some(0)]", "value", "dfc-generated"]
+      - ["lang:std", "<crate::sys::process::unix::common::Command>::saw_nul", "Argument[self].Field[crate::sys::process::unix::common::Command::saw_nul]", "ReturnValue", "value", "dfc-generated"]
+      - ["lang:std", "<crate::sys::process::unix::common::Command>::stderr", "Argument[0]", "Argument[self].Field[crate::sys::process::unix::common::Command::stderr].Field[crate::option::Option::Some(0)]", "value", "dfc-generated"]
+      - ["lang:std", "<crate::sys::process::unix::common::Command>::stdin", "Argument[0]", "Argument[self].Field[crate::sys::process::unix::common::Command::stdin].Field[crate::option::Option::Some(0)]", "value", "dfc-generated"]
+      - ["lang:std", "<crate::sys::process::unix::common::Command>::stdout", "Argument[0]", "Argument[self].Field[crate::sys::process::unix::common::Command::stdout].Field[crate::option::Option::Some(0)]", "value", "dfc-generated"]
+      - ["lang:std", "<crate::sys::process::unix::common::Command>::uid", "Argument[0]", "Argument[self].Field[crate::sys::process::unix::common::Command::uid].Field[crate::option::Option::Some(0)]", "value", "dfc-generated"]
+      - ["lang:std", "<crate::sys::process::unix::common::ExitCode>::as_i32", "Argument[self]", "ReturnValue", "taint", "df-generated"]
+      - ["lang:std", "<crate::sys::process::unix::common::Stdio as crate::convert::From>::from", "Argument[0].Field[0]", "ReturnValue.Field[crate::sys::process::unix::common::Stdio::Fd(0)]", "value", "dfc-generated"]
+      - ["lang:std", "<crate::sys::process::unix::common::Stdio as crate::convert::From>::from", "Argument[0].Field[crate::sys::fs::unix::File(0)]", "ReturnValue.Field[crate::sys::process::unix::common::Stdio::Fd(0)]", "value", "dfc-generated"]
+      - ["lang:std", "<crate::sys::process::unix::common::Stdio as crate::convert::From>::from", "Argument[0].Field[crate::sys::pal::unix::pipe::AnonPipe(0)]", "ReturnValue.Field[crate::sys::process::unix::common::Stdio::Fd(0)]", "value", "dfc-generated"]
+      - ["lang:std", "<crate::sys::process::unix::common::Stdio as crate::convert::From>::from", "Argument[0]", "ReturnValue.Field[crate::sys::process::unix::common::Stdio::Fd(0)]", "value", "dfc-generated"]
+      - ["lang:std", "<crate::sys::process::unix::unix::ExitStatus as crate::convert::From>::from", "Argument[0]", "ReturnValue.Field[crate::sys::process::unix::unix::ExitStatus(0)]", "value", "dfc-generated"]
+      - ["lang:std", "<crate::sys::process::unix::unix::ExitStatus>::code", "Argument[self]", "ReturnValue", "taint", "df-generated"]
+      - ["lang:std", "<crate::sys::process::unix::unix::ExitStatus>::into_raw", "Argument[self].Field[0]", "ReturnValue", "value", "dfc-generated"]
+      - ["lang:std", "<crate::sys::process::unix::unix::ExitStatus>::into_raw", "Argument[self].Field[crate::sys::process::unix::unix::ExitStatus(0)]", "ReturnValue", "value", "dfc-generated"]
+      - ["lang:std", "<crate::sys::process::unix::unix::ExitStatus>::new", "Argument[0]", "ReturnValue.Field[crate::sys::process::unix::unix::ExitStatus(0)]", "value", "dfc-generated"]
+      - ["lang:std", "<crate::sys::process::unix::unix::ExitStatus>::signal", "Argument[self]", "ReturnValue", "taint", "df-generated"]
+      - ["lang:std", "<crate::sys::process::unix::unix::ExitStatus>::stopped_signal", "Argument[self]", "ReturnValue", "taint", "df-generated"]
+      - ["lang:std", "<crate::sys::process::unix::unix::Process>::id", "Argument[self]", "ReturnValue", "taint", "df-generated"]
+      - ["lang:std", "<crate::sys::sync::once::futex::OnceState>::is_poisoned", "Argument[self].Field[crate::sys::sync::once::futex::OnceState::poisoned]", "ReturnValue", "value", "dfc-generated"]
+      - ["lang:std", "<crate::sys::thread_local::key::racy::LazyKey>::new", "Argument[0]", "ReturnValue.Field[crate::sys::thread_local::key::racy::LazyKey::dtor]", "value", "dfc-generated"]
+      - ["lang:std", "<crate::sys::thread_local::native::eager::Storage>::get", "Argument[self]", "ReturnValue", "taint", "df-generated"]
       - ["lang:std", "<crate::sys::thread_local::native::eager::Storage>::new", "Argument[0]", "ReturnValue.Field[crate::sys::thread_local::native::eager::Storage::val].Field[crate::cell::UnsafeCell::value]", "value", "dfc-generated"]
       - ["lang:std", "<crate::sys_common::process::CommandEnv>::does_clear", "Argument[self].Field[crate::sys_common::process::CommandEnv::clear]", "ReturnValue", "value", "dfc-generated"]
+      - ["lang:std", "<crate::sys_common::wstr::WStrUnits>::new", "Argument[0]", "ReturnValue", "taint", "df-generated"]
       - ["lang:std", "<crate::sys_common::wtf8::CodePoint>::from_char", "Argument[0]", "ReturnValue", "taint", "df-generated"]
       - ["lang:std", "<crate::sys_common::wtf8::CodePoint>::from_u32", "Argument[0]", "ReturnValue.Field[crate::option::Option::Some(0)].Field[crate::sys_common::wtf8::CodePoint::value]", "value", "dfc-generated"]
       - ["lang:std", "<crate::sys_common::wtf8::CodePoint>::from_u32_unchecked", "Argument[0]", "ReturnValue.Field[crate::sys_common::wtf8::CodePoint::value]", "value", "dfc-generated"]
@@ -539,6 +601,7 @@ extensions:
       - ["lang:std", "<crate::sys_common::wtf8::CodePoint>::to_trail_surrogate", "Argument[self]", "ReturnValue", "taint", "df-generated"]
       - ["lang:std", "<crate::sys_common::wtf8::CodePoint>::to_u32", "Argument[self].Field[crate::sys_common::wtf8::CodePoint::value]", "ReturnValue", "value", "dfc-generated"]
       - ["lang:std", "<crate::sys_common::wtf8::EncodeWide as crate::iter::traits::iterator::Iterator>::next", "Argument[self].Field[crate::sys_common::wtf8::EncodeWide::extra]", "ReturnValue.Field[crate::option::Option::Some(0)]", "value", "dfc-generated"]
+      - ["lang:std", "<crate::sys_common::wtf8::Wtf8 as crate::fmt::Display>::fmt", "Argument[0]", "ReturnValue", "taint", "df-generated"]
       - ["lang:std", "<crate::sys_common::wtf8::Wtf8 as crate::ops::index::Index>::index", "Argument[self]", "ReturnValue", "value", "dfc-generated"]
       - ["lang:std", "<crate::sys_common::wtf8::Wtf8 as crate::sys_common::AsInner>::as_inner", "Argument[self].Field[crate::sys_common::wtf8::Wtf8::bytes]", "ReturnValue.Reference", "value", "dfc-generated"]
       - ["lang:std", "<crate::sys_common::wtf8::Wtf8>::as_bytes", "Argument[self].Field[crate::sys_common::wtf8::Wtf8::bytes]", "ReturnValue.Reference", "value", "dfc-generated"]
@@ -595,9 +658,6 @@ extensions:
       - ["lang:std", "<f64>::fract", "Argument[self]", "ReturnValue", "taint", "df-generated"]
       - ["lang:std", "<f64>::rem_euclid", "Argument[0]", "ReturnValue", "taint", "df-generated"]
       - ["lang:std", "<f64>::rem_euclid", "Argument[self]", "ReturnValue", "taint", "df-generated"]
-      - ["lang:std", "<i32 as crate::os::fd::raw::AsRawFd>::as_raw_fd", "Argument[self].Reference", "ReturnValue", "value", "dfc-generated"]
-      - ["lang:std", "<i32 as crate::os::fd::raw::FromRawFd>::from_raw_fd", "Argument[0]", "ReturnValue", "value", "dfc-generated"]
-      - ["lang:std", "<i32 as crate::os::fd::raw::IntoRawFd>::into_raw_fd", "Argument[self]", "ReturnValue", "value", "dfc-generated"]
       - ["lang:std", "crate::backtrace::helper::lazy_resolve", "Argument[0]", "ReturnValue", "value", "dfc-generated"]
       - ["lang:std", "crate::io::append_to_string", "Argument[1].ReturnValue", "ReturnValue", "value", "dfc-generated"]
       - ["lang:std", "crate::io::default_read_buf", "Argument[0]", "ReturnValue", "taint", "df-generated"]
@@ -625,3 +685,72 @@ extensions:
       - ["lang:std", "crate::thread::current::set_current", "Argument[0]", "ReturnValue.Field[crate::result::Result::Err(0)]", "value", "dfc-generated"]
       - ["lang:std", "crate::thread::current::try_with_current", "Argument[0].ReturnValue", "ReturnValue", "value", "dfc-generated"]
       - ["lang:std", "crate::thread::with_current_name", "Argument[0].ReturnValue", "ReturnValue", "value", "dfc-generated"]
+  - addsTo:
+      pack: codeql/rust-all
+      extensible: sinkModel
+    data:
+      - ["lang:std", "<&crate::io::stdio::Stderr as crate::io::Write>::write", "Argument[0]", "log-injection", "df-generated"]
+      - ["lang:std", "<&crate::io::stdio::Stderr as crate::io::Write>::write_all", "Argument[0]", "log-injection", "df-generated"]
+      - ["lang:std", "<&crate::io::stdio::Stdout as crate::io::Write>::write", "Argument[0]", "log-injection", "df-generated"]
+      - ["lang:std", "<&crate::io::stdio::Stdout as crate::io::Write>::write_all", "Argument[0]", "log-injection", "df-generated"]
+      - ["lang:std", "<crate::alloc::System as crate::alloc::Allocator>::allocate", "Argument[self]", "alloc-layout", "df-generated"]
+      - ["lang:std", "<crate::alloc::System as crate::alloc::Allocator>::allocate_zeroed", "Argument[self]", "alloc-layout", "df-generated"]
+      - ["lang:std", "<crate::alloc::System as crate::alloc::Allocator>::grow", "Argument[self]", "alloc-layout", "df-generated"]
+      - ["lang:std", "<crate::alloc::System as crate::alloc::Allocator>::grow_zeroed", "Argument[self]", "alloc-layout", "df-generated"]
+      - ["lang:std", "<crate::alloc::System as crate::alloc::Allocator>::shrink", "Argument[self]", "alloc-layout", "df-generated"]
+      - ["lang:std", "<crate::alloc::System as crate::alloc::global::GlobalAlloc>::alloc", "Argument[0]", "alloc-size", "df-generated"]
+      - ["lang:std", "<crate::alloc::System as crate::alloc::global::GlobalAlloc>::alloc_zeroed", "Argument[0]", "alloc-layout", "df-generated"]
+      - ["lang:std", "<crate::alloc::System as crate::alloc::global::GlobalAlloc>::alloc_zeroed", "Argument[0]", "alloc-size", "df-generated"]
+      - ["lang:std", "<crate::alloc::System as crate::alloc::global::GlobalAlloc>::realloc", "Argument[2]", "alloc-size", "df-generated"]
+      - ["lang:std", "<crate::alloc::System as crate::alloc::global::GlobalAlloc>::realloc", "Argument[self]", "alloc-layout", "df-generated"]
+      - ["lang:std", "<crate::ffi::os_str::OsString>::truncate", "Argument[0]", "log-injection", "df-generated"]
+      - ["lang:std", "<crate::fs::File>::create_buffered", "Argument[0]", "path-injection", "df-generated"]
+      - ["lang:std", "<crate::fs::File>::open_buffered", "Argument[0]", "path-injection", "df-generated"]
+      - ["lang:std", "<crate::io::error::Error as crate::convert::From>::from", "Argument[0]", "log-injection", "df-generated"]
+      - ["lang:std", "<crate::io::error::Error>::from_raw_os_error", "Argument[0]", "log-injection", "df-generated"]
+      - ["lang:std", "<crate::io::error::repr_bitpacked::Repr>::new", "Argument[0]", "log-injection", "df-generated"]
+      - ["lang:std", "<crate::io::error::repr_bitpacked::Repr>::new_os", "Argument[0]", "log-injection", "df-generated"]
+      - ["lang:std", "<crate::io::error::repr_bitpacked::Repr>::new_simple", "Argument[0]", "log-injection", "df-generated"]
+      - ["lang:std", "<crate::path::Path>::exists", "Argument[self]", "path-injection", "df-generated"]
+      - ["lang:std", "<crate::path::Path>::is_dir", "Argument[self]", "path-injection", "df-generated"]
+      - ["lang:std", "<crate::path::Path>::is_file", "Argument[self]", "path-injection", "df-generated"]
+      - ["lang:std", "<crate::path::Path>::is_symlink", "Argument[self]", "path-injection", "df-generated"]
+      - ["lang:std", "<crate::path::Path>::metadata", "Argument[self]", "path-injection", "df-generated"]
+      - ["lang:std", "<crate::path::Path>::read_dir", "Argument[self]", "path-injection", "df-generated"]
+      - ["lang:std", "<crate::path::Path>::read_link", "Argument[self]", "path-injection", "df-generated"]
+      - ["lang:std", "<crate::path::Path>::symlink_metadata", "Argument[self]", "path-injection", "df-generated"]
+      - ["lang:std", "<crate::sys::os_str::bytes::Slice>::check_public_boundary", "Argument[0]", "log-injection", "df-generated"]
+      - ["lang:std", "<crate::sys_common::wtf8::Wtf8 as crate::ops::index::Index>::index", "Argument[0]", "log-injection", "df-generated"]
+      - ["lang:std", "<crate::sys_common::wtf8::Wtf8 as crate::ops::index::Index>::index", "Argument[self]", "log-injection", "df-generated"]
+      - ["lang:std", "crate::alloc::__default_lib_allocator::__rdl_alloc", "Argument[0]", "alloc-layout", "df-generated"]
+      - ["lang:std", "crate::alloc::__default_lib_allocator::__rdl_alloc", "Argument[0]", "alloc-size", "df-generated"]
+      - ["lang:std", "crate::alloc::__default_lib_allocator::__rdl_alloc_zeroed", "Argument[0]", "alloc-layout", "df-generated"]
+      - ["lang:std", "crate::alloc::__default_lib_allocator::__rdl_alloc_zeroed", "Argument[0]", "alloc-size", "df-generated"]
+      - ["lang:std", "crate::alloc::__default_lib_allocator::__rdl_realloc", "Argument[3]", "alloc-size", "df-generated"]
+      - ["lang:std", "crate::sys::fs::common::copy", "Argument[0]", "path-injection", "df-generated"]
+      - ["lang:std", "crate::sys::fs::common::copy", "Argument[1]", "path-injection", "df-generated"]
+      - ["lang:std", "crate::sys::fs::common::exists", "Argument[0]", "path-injection", "df-generated"]
+      - ["lang:std", "crate::sys::fs::common::remove_dir_all", "Argument[0]", "path-injection", "df-generated"]
+      - ["lang:std", "crate::sys::fs::unix::copy", "Argument[0]", "path-injection", "df-generated"]
+      - ["lang:std", "crate::sys::pal::unix::cvt_nz", "Argument[0]", "log-injection", "df-generated"]
+      - ["lang:std", "crate::sys_common::wtf8::check_utf8_boundary", "Argument[1]", "log-injection", "df-generated"]
+      - ["lang:std", "crate::sys_common::wtf8::slice_error_fail", "Argument[0]", "log-injection", "df-generated"]
+      - ["lang:std", "crate::sys_common::wtf8::slice_error_fail", "Argument[1]", "log-injection", "df-generated"]
+      - ["lang:std", "crate::sys_common::wtf8::slice_error_fail", "Argument[2]", "log-injection", "df-generated"]
+  - addsTo:
+      pack: codeql/rust-all
+      extensible: sourceModel
+    data:
+      - ["lang:std", "<crate::alloc::System as crate::alloc::global::GlobalAlloc>::dealloc", "Argument[0]", "pointer-invalidate", "df-generated"]
+      - ["lang:std", "<crate::fs::File>::open_buffered", "ReturnValue", "file", "df-generated"]
+      - ["lang:std", "<crate::sys::thread_local::native::eager::Storage>::get", "ReturnValue", "pointer-invalidate", "df-generated"]
+      - ["lang:std", "<crate::sys::thread_local::native::lazy::Storage>::get_or_init", "ReturnValue", "pointer-invalidate", "df-generated"]
+      - ["lang:std", "crate::alloc::__default_lib_allocator::__rdl_dealloc", "Argument[0]", "pointer-invalidate", "df-generated"]
+      - ["lang:std", "crate::fs::copy", "ReturnValue", "file", "df-generated"]
+      - ["lang:std", "crate::fs::read", "ReturnValue", "file", "df-generated"]
+      - ["lang:std", "crate::fs::read_to_string", "ReturnValue", "file", "df-generated"]
+      - ["lang:std", "crate::path::absolute", "ReturnValue", "commandargs", "df-generated"]
+      - ["lang:std", "crate::sys::fs::common::copy", "ReturnValue", "file", "df-generated"]
+      - ["lang:std", "crate::sys::fs::unix::copy", "ReturnValue", "file", "df-generated"]
+      - ["lang:std", "crate::sys::pal::unix::thread::cgroups::quota", "ReturnValue", "file", "df-generated"]
+      - ["lang:std", "crate::sys::path::unix::absolute", "ReturnValue", "commandargs", "df-generated"]
diff --git a/rust/ql/lib/ext/generated/rust/repo-dylib-dep.model.yml b/rust/ql/lib/ext/generated/rust/repo-dylib-dep.model.yml
new file mode 100644
index 00000000000..38b672c31b2
--- /dev/null
+++ b/rust/ql/lib/ext/generated/rust/repo-dylib-dep.model.yml
@@ -0,0 +1,7 @@
+# THIS FILE IS AN AUTO-GENERATED MODELS AS DATA FILE. DO NOT EDIT.
+extensions:
+  - addsTo:
+      pack: codeql/rust-all
+      extensible: summaryModel
+    data:
+      - ["repo::dylib-dep", "crate::foo", "Argument[0]", "Argument[1].Parameter[0]", "value", "dfc-generated"]
diff --git a/rust/ql/lib/ext/generated/rust/repo-https-github.com-rust-lang-backtrace-rs-backtrace.model.yml b/rust/ql/lib/ext/generated/rust/repo-https-github.com-rust-lang-backtrace-rs-backtrace.model.yml
new file mode 100644
index 00000000000..c3d95d1525d
--- /dev/null
+++ b/rust/ql/lib/ext/generated/rust/repo-https-github.com-rust-lang-backtrace-rs-backtrace.model.yml
@@ -0,0 +1,36 @@
+# THIS FILE IS AN AUTO-GENERATED MODELS AS DATA FILE. DO NOT EDIT.
+extensions:
+  - addsTo:
+      pack: codeql/rust-all
+      extensible: summaryModel
+    data:
+      - ["repo:https://github.com/rust-lang/backtrace-rs:backtrace", "<crate::backtrace::Frame>::sp", "Argument[self].Field[crate::backtrace::Frame::inner].Field[crate::backtrace::libunwind::Frame::Cloned::sp]", "ReturnValue", "value", "dfc-generated"]
+      - ["repo:https://github.com/rust-lang/backtrace-rs:backtrace", "<crate::backtrace::libunwind::Frame as crate::clone::Clone>::clone", "Argument[self].Reference.Field[crate::backtrace::libunwind::Frame::Cloned::sp]", "ReturnValue.Field[crate::backtrace::libunwind::Frame::Cloned::sp]", "value", "dfc-generated"]
+      - ["repo:https://github.com/rust-lang/backtrace-rs:backtrace", "<crate::backtrace::libunwind::Frame>::sp", "Argument[self].Reference.Field[crate::backtrace::libunwind::Frame::Cloned::sp]", "ReturnValue", "value", "dfc-generated"]
+      - ["repo:https://github.com/rust-lang/backtrace-rs:backtrace", "<crate::capture::Backtrace as crate::convert::From>::from", "Argument[0]", "ReturnValue.Field[crate::capture::Backtrace::frames]", "value", "dfc-generated"]
+      - ["repo:https://github.com/rust-lang/backtrace-rs:backtrace", "<crate::capture::Backtrace as crate::convert::Into>::into", "Argument[self].Field[crate::capture::Backtrace::frames]", "ReturnValue", "value", "dfc-generated"]
+      - ["repo:https://github.com/rust-lang/backtrace-rs:backtrace", "<crate::capture::BacktraceFrame as crate::convert::From>::from", "Argument[0]", "ReturnValue.Field[crate::capture::BacktraceFrame::frame].Field[crate::capture::Frame::Raw(0)]", "value", "dfc-generated"]
+      - ["repo:https://github.com/rust-lang/backtrace-rs:backtrace", "<crate::capture::BacktraceFrame>::symbols", "Argument[self]", "ReturnValue", "taint", "df-generated"]
+      - ["repo:https://github.com/rust-lang/backtrace-rs:backtrace", "<crate::capture::BacktraceSymbol>::colno", "Argument[self].Field[crate::capture::BacktraceSymbol::colno]", "ReturnValue", "value", "dfc-generated"]
+      - ["repo:https://github.com/rust-lang/backtrace-rs:backtrace", "<crate::capture::BacktraceSymbol>::lineno", "Argument[self].Field[crate::capture::BacktraceSymbol::lineno]", "ReturnValue", "value", "dfc-generated"]
+      - ["repo:https://github.com/rust-lang/backtrace-rs:backtrace", "<crate::capture::BacktraceSymbol>::name", "Argument[self]", "ReturnValue", "taint", "df-generated"]
+      - ["repo:https://github.com/rust-lang/backtrace-rs:backtrace", "<crate::print::BacktraceFmt>::formatter", "Argument[self].Field[crate::print::BacktraceFmt::fmt]", "ReturnValue", "value", "dfc-generated"]
+      - ["repo:https://github.com/rust-lang/backtrace-rs:backtrace", "<crate::print::BacktraceFmt>::frame", "Argument[self]", "ReturnValue.Field[crate::print::BacktraceFrameFmt::fmt]", "value", "dfc-generated"]
+      - ["repo:https://github.com/rust-lang/backtrace-rs:backtrace", "<crate::print::BacktraceFmt>::new", "Argument[0]", "ReturnValue.Field[crate::print::BacktraceFmt::fmt]", "value", "dfc-generated"]
+      - ["repo:https://github.com/rust-lang/backtrace-rs:backtrace", "<crate::print::BacktraceFmt>::new", "Argument[1]", "ReturnValue.Field[crate::print::BacktraceFmt::format]", "value", "dfc-generated"]
+      - ["repo:https://github.com/rust-lang/backtrace-rs:backtrace", "<crate::print::BacktraceFmt>::new", "Argument[2]", "ReturnValue.Field[crate::print::BacktraceFmt::print_path]", "value", "dfc-generated"]
+      - ["repo:https://github.com/rust-lang/backtrace-rs:backtrace", "<crate::symbolize::Symbol>::name", "Argument[self].Field[crate::symbolize::Symbol::inner].Field[crate::symbolize::gimli::Symbol::Symtab::name]", "ReturnValue.Field[crate::option::Option::Some(0)].Field[crate::symbolize::SymbolName::bytes]", "value", "dfc-generated"]
+      - ["repo:https://github.com/rust-lang/backtrace-rs:backtrace", "<crate::symbolize::SymbolName>::as_bytes", "Argument[self].Field[crate::symbolize::SymbolName::bytes]", "ReturnValue", "value", "dfc-generated"]
+      - ["repo:https://github.com/rust-lang/backtrace-rs:backtrace", "<crate::symbolize::SymbolName>::new", "Argument[0]", "ReturnValue.Field[crate::symbolize::SymbolName::bytes]", "value", "dfc-generated"]
+      - ["repo:https://github.com/rust-lang/backtrace-rs:backtrace", "<crate::symbolize::gimli::Symbol>::addr", "Argument[self].Field[crate::symbolize::gimli::Symbol::Frame::addr].Reference", "ReturnValue.Field[crate::option::Option::Some(0)]", "value", "dfc-generated"]
+      - ["repo:https://github.com/rust-lang/backtrace-rs:backtrace", "<crate::symbolize::gimli::Symbol>::name", "Argument[self].Field[crate::symbolize::gimli::Symbol::Symtab::name]", "ReturnValue.Field[crate::option::Option::Some(0)].Field[crate::symbolize::SymbolName::bytes]", "value", "dfc-generated"]
+      - ["repo:https://github.com/rust-lang/backtrace-rs:backtrace", "<crate::symbolize::gimli::elf::Object>::section", "Argument[0]", "ReturnValue", "taint", "df-generated"]
+      - ["repo:https://github.com/rust-lang/backtrace-rs:backtrace", "<crate::symbolize::gimli::mmap::Mmap>::map", "Argument[1]", "ReturnValue.Field[crate::option::Option::Some(0)].Field[crate::symbolize::gimli::mmap::Mmap::len]", "value", "dfc-generated"]
+      - ["repo:https://github.com/rust-lang/backtrace-rs:backtrace", "<crate::symbolize::gimli::parse_running_mmaps::MapsEntry>::pathname", "Argument[self].Field[crate::symbolize::gimli::parse_running_mmaps::MapsEntry::pathname]", "ReturnValue.Reference", "value", "dfc-generated"]
+      - ["repo:https://github.com/rust-lang/backtrace-rs:backtrace", "<crate::symbolize::gimli::stash::Stash>::allocate", "Argument[self]", "ReturnValue", "taint", "df-generated"]
+      - ["repo:https://github.com/rust-lang/backtrace-rs:backtrace", "crate::symbolize::gimli::elf::handle_split_dwarf", "Argument[2].Field[crate::option::Option::Some(0)]", "ReturnValue.Reference", "value", "dfc-generated"]
+  - addsTo:
+      pack: codeql/rust-all
+      extensible: sinkModel
+    data:
+      - ["repo:https://github.com/rust-lang/backtrace-rs:backtrace", "<crate::symbolize::gimli::Mapping>::new", "Argument[0]", "path-injection", "df-generated"]
diff --git a/rust/ql/lib/ext/generated/rust/repo-https-github.com-rust-lang-portable-simd-core_simd.model.yml b/rust/ql/lib/ext/generated/rust/repo-https-github.com-rust-lang-portable-simd-core_simd.model.yml
new file mode 100644
index 00000000000..c06c77cff2c
--- /dev/null
+++ b/rust/ql/lib/ext/generated/rust/repo-https-github.com-rust-lang-portable-simd-core_simd.model.yml
@@ -0,0 +1,48 @@
+# THIS FILE IS AN AUTO-GENERATED MODELS AS DATA FILE. DO NOT EDIT.
+extensions:
+  - addsTo:
+      pack: codeql/rust-all
+      extensible: summaryModel
+    data:
+      - ["repo:https://github.com/rust-lang/portable-simd:core_simd", "<bool as crate::ops::bit::BitAnd>::bitand", "Argument[0]", "ReturnValue", "taint", "df-generated"]
+      - ["repo:https://github.com/rust-lang/portable-simd:core_simd", "<bool as crate::ops::bit::BitOr>::bitor", "Argument[0]", "ReturnValue", "taint", "df-generated"]
+      - ["repo:https://github.com/rust-lang/portable-simd:core_simd", "<bool as crate::ops::bit::BitXor>::bitxor", "Argument[0]", "ReturnValue", "taint", "df-generated"]
+      - ["repo:https://github.com/rust-lang/portable-simd:core_simd", "<crate::core_simd::masks::Mask as crate::clone::Clone>::clone", "Argument[self].Reference", "ReturnValue", "value", "dfc-generated"]
+      - ["repo:https://github.com/rust-lang/portable-simd:core_simd", "<crate::core_simd::masks::Mask as crate::ops::bit::BitAnd>::bitand", "Argument[self]", "ReturnValue", "taint", "df-generated"]
+      - ["repo:https://github.com/rust-lang/portable-simd:core_simd", "<crate::core_simd::masks::Mask as crate::ops::bit::BitAndAssign>::bitand_assign", "Argument[0]", "Argument[self]", "taint", "df-generated"]
+      - ["repo:https://github.com/rust-lang/portable-simd:core_simd", "<crate::core_simd::masks::Mask as crate::ops::bit::BitOr>::bitor", "Argument[self]", "ReturnValue", "taint", "df-generated"]
+      - ["repo:https://github.com/rust-lang/portable-simd:core_simd", "<crate::core_simd::masks::Mask as crate::ops::bit::BitOrAssign>::bitor_assign", "Argument[0]", "Argument[self]", "taint", "df-generated"]
+      - ["repo:https://github.com/rust-lang/portable-simd:core_simd", "<crate::core_simd::masks::Mask as crate::ops::bit::BitXor>::bitxor", "Argument[self]", "ReturnValue", "taint", "df-generated"]
+      - ["repo:https://github.com/rust-lang/portable-simd:core_simd", "<crate::core_simd::masks::Mask as crate::ops::bit::BitXorAssign>::bitxor_assign", "Argument[0]", "Argument[self]", "taint", "df-generated"]
+      - ["repo:https://github.com/rust-lang/portable-simd:core_simd", "<crate::core_simd::masks::Mask>::select_mask", "Argument[0]", "ReturnValue", "taint", "df-generated"]
+      - ["repo:https://github.com/rust-lang/portable-simd:core_simd", "<crate::core_simd::masks::Mask>::select_mask", "Argument[1]", "ReturnValue", "taint", "df-generated"]
+      - ["repo:https://github.com/rust-lang/portable-simd:core_simd", "<crate::core_simd::masks::Mask>::select_mask", "Argument[self]", "ReturnValue", "taint", "df-generated"]
+      - ["repo:https://github.com/rust-lang/portable-simd:core_simd", "<crate::core_simd::masks::mask_impl::Mask as crate::clone::Clone>::clone", "Argument[self].Reference", "ReturnValue", "value", "dfc-generated"]
+      - ["repo:https://github.com/rust-lang/portable-simd:core_simd", "<crate::core_simd::masks::mask_impl::Mask as crate::ops::bit::Not>::not", "Argument[self]", "ReturnValue", "taint", "df-generated"]
+      - ["repo:https://github.com/rust-lang/portable-simd:core_simd", "<crate::core_simd::masks::mask_impl::Mask>::to_int", "Argument[self].Field[0]", "ReturnValue", "value", "dfc-generated"]
+      - ["repo:https://github.com/rust-lang/portable-simd:core_simd", "<crate::core_simd::masks::mask_impl::Mask>::to_int", "Argument[self].Field[crate::core_simd::masks::mask_impl::Mask(0)]", "ReturnValue", "value", "dfc-generated"]
+      - ["repo:https://github.com/rust-lang/portable-simd:core_simd", "<crate::core_simd::vector::Simd as crate::clone::Clone>::clone", "Argument[self].Reference", "ReturnValue", "value", "dfc-generated"]
+      - ["repo:https://github.com/rust-lang/portable-simd:core_simd", "<crate::core_simd::vector::Simd as crate::convert::AsMut>::as_mut", "Argument[self]", "ReturnValue", "taint", "df-generated"]
+      - ["repo:https://github.com/rust-lang/portable-simd:core_simd", "<crate::core_simd::vector::Simd as crate::convert::AsRef>::as_ref", "Argument[self]", "ReturnValue", "taint", "df-generated"]
+      - ["repo:https://github.com/rust-lang/portable-simd:core_simd", "<crate::core_simd::vector::Simd as crate::convert::From>::from", "Argument[0].Field[0]", "ReturnValue", "value", "dfc-generated"]
+      - ["repo:https://github.com/rust-lang/portable-simd:core_simd", "<crate::core_simd::vector::Simd as crate::convert::From>::from", "Argument[0].Field[crate::core_simd::masks::mask_impl::Mask(0)]", "ReturnValue", "value", "dfc-generated"]
+      - ["repo:https://github.com/rust-lang/portable-simd:core_simd", "<crate::core_simd::vector::Simd as crate::core_simd::simd::num::float::SimdFloat>::recip", "Argument[self]", "ReturnValue", "taint", "df-generated"]
+      - ["repo:https://github.com/rust-lang/portable-simd:core_simd", "<crate::core_simd::vector::Simd as crate::core_simd::simd::num::float::SimdFloat>::to_degrees", "Argument[self]", "ReturnValue", "taint", "df-generated"]
+      - ["repo:https://github.com/rust-lang/portable-simd:core_simd", "<crate::core_simd::vector::Simd as crate::core_simd::simd::num::float::SimdFloat>::to_radians", "Argument[self]", "ReturnValue", "taint", "df-generated"]
+      - ["repo:https://github.com/rust-lang/portable-simd:core_simd", "<crate::core_simd::vector::Simd as crate::core_simd::simd::num::int::SimdInt>::abs", "Argument[self]", "ReturnValue", "taint", "df-generated"]
+      - ["repo:https://github.com/rust-lang/portable-simd:core_simd", "<crate::core_simd::vector::Simd as crate::ops::bit::Not>::not", "Argument[self]", "ReturnValue", "taint", "df-generated"]
+      - ["repo:https://github.com/rust-lang/portable-simd:core_simd", "<crate::core_simd::vector::Simd as crate::ops::index::Index>::index", "Argument[self]", "ReturnValue", "taint", "df-generated"]
+      - ["repo:https://github.com/rust-lang/portable-simd:core_simd", "<crate::core_simd::vector::Simd as crate::ops::index::IndexMut>::index_mut", "Argument[self]", "ReturnValue", "taint", "df-generated"]
+      - ["repo:https://github.com/rust-lang/portable-simd:core_simd", "<crate::core_simd::vector::Simd>::as_array", "Argument[self]", "ReturnValue", "taint", "df-generated"]
+      - ["repo:https://github.com/rust-lang/portable-simd:core_simd", "<crate::core_simd::vector::Simd>::as_mut_array", "Argument[self]", "ReturnValue", "taint", "df-generated"]
+      - ["repo:https://github.com/rust-lang/portable-simd:core_simd", "<i16 as crate::core_simd::masks::sealed::Sealed>::to_usize", "Argument[self]", "ReturnValue", "taint", "df-generated"]
+      - ["repo:https://github.com/rust-lang/portable-simd:core_simd", "<i32 as crate::core_simd::masks::sealed::Sealed>::to_usize", "Argument[self]", "ReturnValue", "taint", "df-generated"]
+      - ["repo:https://github.com/rust-lang/portable-simd:core_simd", "<i64 as crate::core_simd::masks::sealed::Sealed>::to_usize", "Argument[self]", "ReturnValue", "taint", "df-generated"]
+      - ["repo:https://github.com/rust-lang/portable-simd:core_simd", "<i8 as crate::core_simd::masks::sealed::Sealed>::to_usize", "Argument[self]", "ReturnValue", "taint", "df-generated"]
+      - ["repo:https://github.com/rust-lang/portable-simd:core_simd", "<isize as crate::core_simd::masks::sealed::Sealed>::to_usize", "Argument[self]", "ReturnValue", "taint", "df-generated"]
+      - ["repo:https://github.com/rust-lang/portable-simd:core_simd", "<u16 as crate::core_simd::masks::mask_impl::ReverseBits>::reverse_bits", "Argument[0]", "ReturnValue", "taint", "df-generated"]
+      - ["repo:https://github.com/rust-lang/portable-simd:core_simd", "<u32 as crate::core_simd::masks::mask_impl::ReverseBits>::reverse_bits", "Argument[0]", "ReturnValue", "taint", "df-generated"]
+      - ["repo:https://github.com/rust-lang/portable-simd:core_simd", "<u64 as crate::core_simd::masks::mask_impl::ReverseBits>::reverse_bits", "Argument[0]", "ReturnValue", "taint", "df-generated"]
+      - ["repo:https://github.com/rust-lang/portable-simd:core_simd", "<u8 as crate::core_simd::masks::mask_impl::ReverseBits>::reverse_bits", "Argument[0]", "ReturnValue", "taint", "df-generated"]
+      - ["repo:https://github.com/rust-lang/portable-simd:core_simd", "crate::simd_inv4x4", "Argument[0].Field[0]", "ReturnValue.Field[crate::option::Option::Some(0)].Field[crate::Matrix4x4(0)]", "value", "dfc-generated"]
+      - ["repo:https://github.com/rust-lang/portable-simd:core_simd", "crate::simd_inv4x4", "Argument[0].Field[crate::Matrix4x4(0)]", "ReturnValue.Field[crate::option::Option::Some(0)].Field[crate::Matrix4x4(0)]", "value", "dfc-generated"]
diff --git a/rust/ql/lib/ext/generated/rust/repo-https-github.com-rust-lang-stdarch-core_arch.model.yml b/rust/ql/lib/ext/generated/rust/repo-https-github.com-rust-lang-stdarch-core_arch.model.yml
new file mode 100644
index 00000000000..f54a86498d3
--- /dev/null
+++ b/rust/ql/lib/ext/generated/rust/repo-https-github.com-rust-lang-stdarch-core_arch.model.yml
@@ -0,0 +1,1195 @@
+# THIS FILE IS AN AUTO-GENERATED MODELS AS DATA FILE. DO NOT EDIT.
+extensions:
+  - addsTo:
+      pack: codeql/rust-all
+      extensible: summaryModel
+    data:
+      - ["repo:https://github.com/rust-lang/stdarch:core_arch", "<crate::core_arch::simd::f16x16>::from_array", "Argument[0]", "ReturnValue.Field[crate::core_arch::simd::f16x16(0)]", "value", "dfc-generated"]
+      - ["repo:https://github.com/rust-lang/stdarch:core_arch", "<crate::core_arch::simd::f16x16>::new", "Argument[0]", "ReturnValue.Field[crate::core_arch::simd::f16x16(0)].Element", "value", "dfc-generated"]
+      - ["repo:https://github.com/rust-lang/stdarch:core_arch", "<crate::core_arch::simd::f16x16>::new", "Argument[10]", "ReturnValue.Field[crate::core_arch::simd::f16x16(0)].Element", "value", "dfc-generated"]
+      - ["repo:https://github.com/rust-lang/stdarch:core_arch", "<crate::core_arch::simd::f16x16>::new", "Argument[11]", "ReturnValue.Field[crate::core_arch::simd::f16x16(0)].Element", "value", "dfc-generated"]
+      - ["repo:https://github.com/rust-lang/stdarch:core_arch", "<crate::core_arch::simd::f16x16>::new", "Argument[12]", "ReturnValue.Field[crate::core_arch::simd::f16x16(0)].Element", "value", "dfc-generated"]
+      - ["repo:https://github.com/rust-lang/stdarch:core_arch", "<crate::core_arch::simd::f16x16>::new", "Argument[13]", "ReturnValue.Field[crate::core_arch::simd::f16x16(0)].Element", "value", "dfc-generated"]
+      - ["repo:https://github.com/rust-lang/stdarch:core_arch", "<crate::core_arch::simd::f16x16>::new", "Argument[14]", "ReturnValue.Field[crate::core_arch::simd::f16x16(0)].Element", "value", "dfc-generated"]
+      - ["repo:https://github.com/rust-lang/stdarch:core_arch", "<crate::core_arch::simd::f16x16>::new", "Argument[15]", "ReturnValue.Field[crate::core_arch::simd::f16x16(0)].Element", "value", "dfc-generated"]
+      - ["repo:https://github.com/rust-lang/stdarch:core_arch", "<crate::core_arch::simd::f16x16>::new", "Argument[1]", "ReturnValue.Field[crate::core_arch::simd::f16x16(0)].Element", "value", "dfc-generated"]
+      - ["repo:https://github.com/rust-lang/stdarch:core_arch", "<crate::core_arch::simd::f16x16>::new", "Argument[2]", "ReturnValue.Field[crate::core_arch::simd::f16x16(0)].Element", "value", "dfc-generated"]
+      - ["repo:https://github.com/rust-lang/stdarch:core_arch", "<crate::core_arch::simd::f16x16>::new", "Argument[3]", "ReturnValue.Field[crate::core_arch::simd::f16x16(0)].Element", "value", "dfc-generated"]
+      - ["repo:https://github.com/rust-lang/stdarch:core_arch", "<crate::core_arch::simd::f16x16>::new", "Argument[4]", "ReturnValue.Field[crate::core_arch::simd::f16x16(0)].Element", "value", "dfc-generated"]
+      - ["repo:https://github.com/rust-lang/stdarch:core_arch", "<crate::core_arch::simd::f16x16>::new", "Argument[5]", "ReturnValue.Field[crate::core_arch::simd::f16x16(0)].Element", "value", "dfc-generated"]
+      - ["repo:https://github.com/rust-lang/stdarch:core_arch", "<crate::core_arch::simd::f16x16>::new", "Argument[6]", "ReturnValue.Field[crate::core_arch::simd::f16x16(0)].Element", "value", "dfc-generated"]
+      - ["repo:https://github.com/rust-lang/stdarch:core_arch", "<crate::core_arch::simd::f16x16>::new", "Argument[7]", "ReturnValue.Field[crate::core_arch::simd::f16x16(0)].Element", "value", "dfc-generated"]
+      - ["repo:https://github.com/rust-lang/stdarch:core_arch", "<crate::core_arch::simd::f16x16>::new", "Argument[8]", "ReturnValue.Field[crate::core_arch::simd::f16x16(0)].Element", "value", "dfc-generated"]
+      - ["repo:https://github.com/rust-lang/stdarch:core_arch", "<crate::core_arch::simd::f16x16>::new", "Argument[9]", "ReturnValue.Field[crate::core_arch::simd::f16x16(0)].Element", "value", "dfc-generated"]
+      - ["repo:https://github.com/rust-lang/stdarch:core_arch", "<crate::core_arch::simd::f16x32>::from_array", "Argument[0]", "ReturnValue.Field[crate::core_arch::simd::f16x32(0)]", "value", "dfc-generated"]
+      - ["repo:https://github.com/rust-lang/stdarch:core_arch", "<crate::core_arch::simd::f16x32>::new", "Argument[0]", "ReturnValue.Field[crate::core_arch::simd::f16x32(0)].Element", "value", "dfc-generated"]
+      - ["repo:https://github.com/rust-lang/stdarch:core_arch", "<crate::core_arch::simd::f16x32>::new", "Argument[10]", "ReturnValue.Field[crate::core_arch::simd::f16x32(0)].Element", "value", "dfc-generated"]
+      - ["repo:https://github.com/rust-lang/stdarch:core_arch", "<crate::core_arch::simd::f16x32>::new", "Argument[11]", "ReturnValue.Field[crate::core_arch::simd::f16x32(0)].Element", "value", "dfc-generated"]
+      - ["repo:https://github.com/rust-lang/stdarch:core_arch", "<crate::core_arch::simd::f16x32>::new", "Argument[12]", "ReturnValue.Field[crate::core_arch::simd::f16x32(0)].Element", "value", "dfc-generated"]
+      - ["repo:https://github.com/rust-lang/stdarch:core_arch", "<crate::core_arch::simd::f16x32>::new", "Argument[13]", "ReturnValue.Field[crate::core_arch::simd::f16x32(0)].Element", "value", "dfc-generated"]
+      - ["repo:https://github.com/rust-lang/stdarch:core_arch", "<crate::core_arch::simd::f16x32>::new", "Argument[14]", "ReturnValue.Field[crate::core_arch::simd::f16x32(0)].Element", "value", "dfc-generated"]
+      - ["repo:https://github.com/rust-lang/stdarch:core_arch", "<crate::core_arch::simd::f16x32>::new", "Argument[15]", "ReturnValue.Field[crate::core_arch::simd::f16x32(0)].Element", "value", "dfc-generated"]
+      - ["repo:https://github.com/rust-lang/stdarch:core_arch", "<crate::core_arch::simd::f16x32>::new", "Argument[16]", "ReturnValue.Field[crate::core_arch::simd::f16x32(0)].Element", "value", "dfc-generated"]
+      - ["repo:https://github.com/rust-lang/stdarch:core_arch", "<crate::core_arch::simd::f16x32>::new", "Argument[17]", "ReturnValue.Field[crate::core_arch::simd::f16x32(0)].Element", "value", "dfc-generated"]
+      - ["repo:https://github.com/rust-lang/stdarch:core_arch", "<crate::core_arch::simd::f16x32>::new", "Argument[18]", "ReturnValue.Field[crate::core_arch::simd::f16x32(0)].Element", "value", "dfc-generated"]
+      - ["repo:https://github.com/rust-lang/stdarch:core_arch", "<crate::core_arch::simd::f16x32>::new", "Argument[19]", "ReturnValue.Field[crate::core_arch::simd::f16x32(0)].Element", "value", "dfc-generated"]
+      - ["repo:https://github.com/rust-lang/stdarch:core_arch", "<crate::core_arch::simd::f16x32>::new", "Argument[1]", "ReturnValue.Field[crate::core_arch::simd::f16x32(0)].Element", "value", "dfc-generated"]
+      - ["repo:https://github.com/rust-lang/stdarch:core_arch", "<crate::core_arch::simd::f16x32>::new", "Argument[20]", "ReturnValue.Field[crate::core_arch::simd::f16x32(0)].Element", "value", "dfc-generated"]
+      - ["repo:https://github.com/rust-lang/stdarch:core_arch", "<crate::core_arch::simd::f16x32>::new", "Argument[21]", "ReturnValue.Field[crate::core_arch::simd::f16x32(0)].Element", "value", "dfc-generated"]
+      - ["repo:https://github.com/rust-lang/stdarch:core_arch", "<crate::core_arch::simd::f16x32>::new", "Argument[22]", "ReturnValue.Field[crate::core_arch::simd::f16x32(0)].Element", "value", "dfc-generated"]
+      - ["repo:https://github.com/rust-lang/stdarch:core_arch", "<crate::core_arch::simd::f16x32>::new", "Argument[23]", "ReturnValue.Field[crate::core_arch::simd::f16x32(0)].Element", "value", "dfc-generated"]
+      - ["repo:https://github.com/rust-lang/stdarch:core_arch", "<crate::core_arch::simd::f16x32>::new", "Argument[24]", "ReturnValue.Field[crate::core_arch::simd::f16x32(0)].Element", "value", "dfc-generated"]
+      - ["repo:https://github.com/rust-lang/stdarch:core_arch", "<crate::core_arch::simd::f16x32>::new", "Argument[25]", "ReturnValue.Field[crate::core_arch::simd::f16x32(0)].Element", "value", "dfc-generated"]
+      - ["repo:https://github.com/rust-lang/stdarch:core_arch", "<crate::core_arch::simd::f16x32>::new", "Argument[26]", "ReturnValue.Field[crate::core_arch::simd::f16x32(0)].Element", "value", "dfc-generated"]
+      - ["repo:https://github.com/rust-lang/stdarch:core_arch", "<crate::core_arch::simd::f16x32>::new", "Argument[27]", "ReturnValue.Field[crate::core_arch::simd::f16x32(0)].Element", "value", "dfc-generated"]
+      - ["repo:https://github.com/rust-lang/stdarch:core_arch", "<crate::core_arch::simd::f16x32>::new", "Argument[28]", "ReturnValue.Field[crate::core_arch::simd::f16x32(0)].Element", "value", "dfc-generated"]
+      - ["repo:https://github.com/rust-lang/stdarch:core_arch", "<crate::core_arch::simd::f16x32>::new", "Argument[29]", "ReturnValue.Field[crate::core_arch::simd::f16x32(0)].Element", "value", "dfc-generated"]
+      - ["repo:https://github.com/rust-lang/stdarch:core_arch", "<crate::core_arch::simd::f16x32>::new", "Argument[2]", "ReturnValue.Field[crate::core_arch::simd::f16x32(0)].Element", "value", "dfc-generated"]
+      - ["repo:https://github.com/rust-lang/stdarch:core_arch", "<crate::core_arch::simd::f16x32>::new", "Argument[30]", "ReturnValue.Field[crate::core_arch::simd::f16x32(0)].Element", "value", "dfc-generated"]
+      - ["repo:https://github.com/rust-lang/stdarch:core_arch", "<crate::core_arch::simd::f16x32>::new", "Argument[31]", "ReturnValue.Field[crate::core_arch::simd::f16x32(0)].Element", "value", "dfc-generated"]
+      - ["repo:https://github.com/rust-lang/stdarch:core_arch", "<crate::core_arch::simd::f16x32>::new", "Argument[3]", "ReturnValue.Field[crate::core_arch::simd::f16x32(0)].Element", "value", "dfc-generated"]
+      - ["repo:https://github.com/rust-lang/stdarch:core_arch", "<crate::core_arch::simd::f16x32>::new", "Argument[4]", "ReturnValue.Field[crate::core_arch::simd::f16x32(0)].Element", "value", "dfc-generated"]
+      - ["repo:https://github.com/rust-lang/stdarch:core_arch", "<crate::core_arch::simd::f16x32>::new", "Argument[5]", "ReturnValue.Field[crate::core_arch::simd::f16x32(0)].Element", "value", "dfc-generated"]
+      - ["repo:https://github.com/rust-lang/stdarch:core_arch", "<crate::core_arch::simd::f16x32>::new", "Argument[6]", "ReturnValue.Field[crate::core_arch::simd::f16x32(0)].Element", "value", "dfc-generated"]
+      - ["repo:https://github.com/rust-lang/stdarch:core_arch", "<crate::core_arch::simd::f16x32>::new", "Argument[7]", "ReturnValue.Field[crate::core_arch::simd::f16x32(0)].Element", "value", "dfc-generated"]
+      - ["repo:https://github.com/rust-lang/stdarch:core_arch", "<crate::core_arch::simd::f16x32>::new", "Argument[8]", "ReturnValue.Field[crate::core_arch::simd::f16x32(0)].Element", "value", "dfc-generated"]
+      - ["repo:https://github.com/rust-lang/stdarch:core_arch", "<crate::core_arch::simd::f16x32>::new", "Argument[9]", "ReturnValue.Field[crate::core_arch::simd::f16x32(0)].Element", "value", "dfc-generated"]
+      - ["repo:https://github.com/rust-lang/stdarch:core_arch", "<crate::core_arch::simd::f16x4>::from_array", "Argument[0]", "ReturnValue.Field[crate::core_arch::simd::f16x4(0)]", "value", "dfc-generated"]
+      - ["repo:https://github.com/rust-lang/stdarch:core_arch", "<crate::core_arch::simd::f16x4>::new", "Argument[0]", "ReturnValue.Field[crate::core_arch::simd::f16x4(0)].Element", "value", "dfc-generated"]
+      - ["repo:https://github.com/rust-lang/stdarch:core_arch", "<crate::core_arch::simd::f16x4>::new", "Argument[1]", "ReturnValue.Field[crate::core_arch::simd::f16x4(0)].Element", "value", "dfc-generated"]
+      - ["repo:https://github.com/rust-lang/stdarch:core_arch", "<crate::core_arch::simd::f16x4>::new", "Argument[2]", "ReturnValue.Field[crate::core_arch::simd::f16x4(0)].Element", "value", "dfc-generated"]
+      - ["repo:https://github.com/rust-lang/stdarch:core_arch", "<crate::core_arch::simd::f16x4>::new", "Argument[3]", "ReturnValue.Field[crate::core_arch::simd::f16x4(0)].Element", "value", "dfc-generated"]
+      - ["repo:https://github.com/rust-lang/stdarch:core_arch", "<crate::core_arch::simd::f16x8>::from_array", "Argument[0]", "ReturnValue.Field[crate::core_arch::simd::f16x8(0)]", "value", "dfc-generated"]
+      - ["repo:https://github.com/rust-lang/stdarch:core_arch", "<crate::core_arch::simd::f16x8>::new", "Argument[0]", "ReturnValue.Field[crate::core_arch::simd::f16x8(0)].Element", "value", "dfc-generated"]
+      - ["repo:https://github.com/rust-lang/stdarch:core_arch", "<crate::core_arch::simd::f16x8>::new", "Argument[1]", "ReturnValue.Field[crate::core_arch::simd::f16x8(0)].Element", "value", "dfc-generated"]
+      - ["repo:https://github.com/rust-lang/stdarch:core_arch", "<crate::core_arch::simd::f16x8>::new", "Argument[2]", "ReturnValue.Field[crate::core_arch::simd::f16x8(0)].Element", "value", "dfc-generated"]
+      - ["repo:https://github.com/rust-lang/stdarch:core_arch", "<crate::core_arch::simd::f16x8>::new", "Argument[3]", "ReturnValue.Field[crate::core_arch::simd::f16x8(0)].Element", "value", "dfc-generated"]
+      - ["repo:https://github.com/rust-lang/stdarch:core_arch", "<crate::core_arch::simd::f16x8>::new", "Argument[4]", "ReturnValue.Field[crate::core_arch::simd::f16x8(0)].Element", "value", "dfc-generated"]
+      - ["repo:https://github.com/rust-lang/stdarch:core_arch", "<crate::core_arch::simd::f16x8>::new", "Argument[5]", "ReturnValue.Field[crate::core_arch::simd::f16x8(0)].Element", "value", "dfc-generated"]
+      - ["repo:https://github.com/rust-lang/stdarch:core_arch", "<crate::core_arch::simd::f16x8>::new", "Argument[6]", "ReturnValue.Field[crate::core_arch::simd::f16x8(0)].Element", "value", "dfc-generated"]
+      - ["repo:https://github.com/rust-lang/stdarch:core_arch", "<crate::core_arch::simd::f16x8>::new", "Argument[7]", "ReturnValue.Field[crate::core_arch::simd::f16x8(0)].Element", "value", "dfc-generated"]
+      - ["repo:https://github.com/rust-lang/stdarch:core_arch", "<crate::core_arch::simd::f32x16>::from_array", "Argument[0]", "ReturnValue.Field[crate::core_arch::simd::f32x16(0)]", "value", "dfc-generated"]
+      - ["repo:https://github.com/rust-lang/stdarch:core_arch", "<crate::core_arch::simd::f32x16>::new", "Argument[0]", "ReturnValue.Field[crate::core_arch::simd::f32x16(0)].Element", "value", "dfc-generated"]
+      - ["repo:https://github.com/rust-lang/stdarch:core_arch", "<crate::core_arch::simd::f32x16>::new", "Argument[10]", "ReturnValue.Field[crate::core_arch::simd::f32x16(0)].Element", "value", "dfc-generated"]
+      - ["repo:https://github.com/rust-lang/stdarch:core_arch", "<crate::core_arch::simd::f32x16>::new", "Argument[11]", "ReturnValue.Field[crate::core_arch::simd::f32x16(0)].Element", "value", "dfc-generated"]
+      - ["repo:https://github.com/rust-lang/stdarch:core_arch", "<crate::core_arch::simd::f32x16>::new", "Argument[12]", "ReturnValue.Field[crate::core_arch::simd::f32x16(0)].Element", "value", "dfc-generated"]
+      - ["repo:https://github.com/rust-lang/stdarch:core_arch", "<crate::core_arch::simd::f32x16>::new", "Argument[13]", "ReturnValue.Field[crate::core_arch::simd::f32x16(0)].Element", "value", "dfc-generated"]
+      - ["repo:https://github.com/rust-lang/stdarch:core_arch", "<crate::core_arch::simd::f32x16>::new", "Argument[14]", "ReturnValue.Field[crate::core_arch::simd::f32x16(0)].Element", "value", "dfc-generated"]
+      - ["repo:https://github.com/rust-lang/stdarch:core_arch", "<crate::core_arch::simd::f32x16>::new", "Argument[15]", "ReturnValue.Field[crate::core_arch::simd::f32x16(0)].Element", "value", "dfc-generated"]
+      - ["repo:https://github.com/rust-lang/stdarch:core_arch", "<crate::core_arch::simd::f32x16>::new", "Argument[1]", "ReturnValue.Field[crate::core_arch::simd::f32x16(0)].Element", "value", "dfc-generated"]
+      - ["repo:https://github.com/rust-lang/stdarch:core_arch", "<crate::core_arch::simd::f32x16>::new", "Argument[2]", "ReturnValue.Field[crate::core_arch::simd::f32x16(0)].Element", "value", "dfc-generated"]
+      - ["repo:https://github.com/rust-lang/stdarch:core_arch", "<crate::core_arch::simd::f32x16>::new", "Argument[3]", "ReturnValue.Field[crate::core_arch::simd::f32x16(0)].Element", "value", "dfc-generated"]
+      - ["repo:https://github.com/rust-lang/stdarch:core_arch", "<crate::core_arch::simd::f32x16>::new", "Argument[4]", "ReturnValue.Field[crate::core_arch::simd::f32x16(0)].Element", "value", "dfc-generated"]
+      - ["repo:https://github.com/rust-lang/stdarch:core_arch", "<crate::core_arch::simd::f32x16>::new", "Argument[5]", "ReturnValue.Field[crate::core_arch::simd::f32x16(0)].Element", "value", "dfc-generated"]
+      - ["repo:https://github.com/rust-lang/stdarch:core_arch", "<crate::core_arch::simd::f32x16>::new", "Argument[6]", "ReturnValue.Field[crate::core_arch::simd::f32x16(0)].Element", "value", "dfc-generated"]
+      - ["repo:https://github.com/rust-lang/stdarch:core_arch", "<crate::core_arch::simd::f32x16>::new", "Argument[7]", "ReturnValue.Field[crate::core_arch::simd::f32x16(0)].Element", "value", "dfc-generated"]
+      - ["repo:https://github.com/rust-lang/stdarch:core_arch", "<crate::core_arch::simd::f32x16>::new", "Argument[8]", "ReturnValue.Field[crate::core_arch::simd::f32x16(0)].Element", "value", "dfc-generated"]
+      - ["repo:https://github.com/rust-lang/stdarch:core_arch", "<crate::core_arch::simd::f32x16>::new", "Argument[9]", "ReturnValue.Field[crate::core_arch::simd::f32x16(0)].Element", "value", "dfc-generated"]
+      - ["repo:https://github.com/rust-lang/stdarch:core_arch", "<crate::core_arch::simd::f32x2>::from_array", "Argument[0]", "ReturnValue.Field[crate::core_arch::simd::f32x2(0)]", "value", "dfc-generated"]
+      - ["repo:https://github.com/rust-lang/stdarch:core_arch", "<crate::core_arch::simd::f32x2>::new", "Argument[0]", "ReturnValue.Field[crate::core_arch::simd::f32x2(0)].Element", "value", "dfc-generated"]
+      - ["repo:https://github.com/rust-lang/stdarch:core_arch", "<crate::core_arch::simd::f32x2>::new", "Argument[1]", "ReturnValue.Field[crate::core_arch::simd::f32x2(0)].Element", "value", "dfc-generated"]
+      - ["repo:https://github.com/rust-lang/stdarch:core_arch", "<crate::core_arch::simd::f32x4>::from_array", "Argument[0]", "ReturnValue.Field[crate::core_arch::simd::f32x4(0)]", "value", "dfc-generated"]
+      - ["repo:https://github.com/rust-lang/stdarch:core_arch", "<crate::core_arch::simd::f32x4>::new", "Argument[0]", "ReturnValue.Field[crate::core_arch::simd::f32x4(0)].Element", "value", "dfc-generated"]
+      - ["repo:https://github.com/rust-lang/stdarch:core_arch", "<crate::core_arch::simd::f32x4>::new", "Argument[1]", "ReturnValue.Field[crate::core_arch::simd::f32x4(0)].Element", "value", "dfc-generated"]
+      - ["repo:https://github.com/rust-lang/stdarch:core_arch", "<crate::core_arch::simd::f32x4>::new", "Argument[2]", "ReturnValue.Field[crate::core_arch::simd::f32x4(0)].Element", "value", "dfc-generated"]
+      - ["repo:https://github.com/rust-lang/stdarch:core_arch", "<crate::core_arch::simd::f32x4>::new", "Argument[3]", "ReturnValue.Field[crate::core_arch::simd::f32x4(0)].Element", "value", "dfc-generated"]
+      - ["repo:https://github.com/rust-lang/stdarch:core_arch", "<crate::core_arch::simd::f32x8>::from_array", "Argument[0]", "ReturnValue.Field[crate::core_arch::simd::f32x8(0)]", "value", "dfc-generated"]
+      - ["repo:https://github.com/rust-lang/stdarch:core_arch", "<crate::core_arch::simd::f32x8>::new", "Argument[0]", "ReturnValue.Field[crate::core_arch::simd::f32x8(0)].Element", "value", "dfc-generated"]
+      - ["repo:https://github.com/rust-lang/stdarch:core_arch", "<crate::core_arch::simd::f32x8>::new", "Argument[1]", "ReturnValue.Field[crate::core_arch::simd::f32x8(0)].Element", "value", "dfc-generated"]
+      - ["repo:https://github.com/rust-lang/stdarch:core_arch", "<crate::core_arch::simd::f32x8>::new", "Argument[2]", "ReturnValue.Field[crate::core_arch::simd::f32x8(0)].Element", "value", "dfc-generated"]
+      - ["repo:https://github.com/rust-lang/stdarch:core_arch", "<crate::core_arch::simd::f32x8>::new", "Argument[3]", "ReturnValue.Field[crate::core_arch::simd::f32x8(0)].Element", "value", "dfc-generated"]
+      - ["repo:https://github.com/rust-lang/stdarch:core_arch", "<crate::core_arch::simd::f32x8>::new", "Argument[4]", "ReturnValue.Field[crate::core_arch::simd::f32x8(0)].Element", "value", "dfc-generated"]
+      - ["repo:https://github.com/rust-lang/stdarch:core_arch", "<crate::core_arch::simd::f32x8>::new", "Argument[5]", "ReturnValue.Field[crate::core_arch::simd::f32x8(0)].Element", "value", "dfc-generated"]
+      - ["repo:https://github.com/rust-lang/stdarch:core_arch", "<crate::core_arch::simd::f32x8>::new", "Argument[6]", "ReturnValue.Field[crate::core_arch::simd::f32x8(0)].Element", "value", "dfc-generated"]
+      - ["repo:https://github.com/rust-lang/stdarch:core_arch", "<crate::core_arch::simd::f32x8>::new", "Argument[7]", "ReturnValue.Field[crate::core_arch::simd::f32x8(0)].Element", "value", "dfc-generated"]
+      - ["repo:https://github.com/rust-lang/stdarch:core_arch", "<crate::core_arch::simd::f64x1>::from_array", "Argument[0]", "ReturnValue.Field[crate::core_arch::simd::f64x1(0)]", "value", "dfc-generated"]
+      - ["repo:https://github.com/rust-lang/stdarch:core_arch", "<crate::core_arch::simd::f64x1>::new", "Argument[0]", "ReturnValue.Field[crate::core_arch::simd::f64x1(0)].Element", "value", "dfc-generated"]
+      - ["repo:https://github.com/rust-lang/stdarch:core_arch", "<crate::core_arch::simd::f64x2>::from_array", "Argument[0]", "ReturnValue.Field[crate::core_arch::simd::f64x2(0)]", "value", "dfc-generated"]
+      - ["repo:https://github.com/rust-lang/stdarch:core_arch", "<crate::core_arch::simd::f64x2>::new", "Argument[0]", "ReturnValue.Field[crate::core_arch::simd::f64x2(0)].Element", "value", "dfc-generated"]
+      - ["repo:https://github.com/rust-lang/stdarch:core_arch", "<crate::core_arch::simd::f64x2>::new", "Argument[1]", "ReturnValue.Field[crate::core_arch::simd::f64x2(0)].Element", "value", "dfc-generated"]
+      - ["repo:https://github.com/rust-lang/stdarch:core_arch", "<crate::core_arch::simd::f64x4>::from_array", "Argument[0]", "ReturnValue.Field[crate::core_arch::simd::f64x4(0)]", "value", "dfc-generated"]
+      - ["repo:https://github.com/rust-lang/stdarch:core_arch", "<crate::core_arch::simd::f64x4>::new", "Argument[0]", "ReturnValue.Field[crate::core_arch::simd::f64x4(0)].Element", "value", "dfc-generated"]
+      - ["repo:https://github.com/rust-lang/stdarch:core_arch", "<crate::core_arch::simd::f64x4>::new", "Argument[1]", "ReturnValue.Field[crate::core_arch::simd::f64x4(0)].Element", "value", "dfc-generated"]
+      - ["repo:https://github.com/rust-lang/stdarch:core_arch", "<crate::core_arch::simd::f64x4>::new", "Argument[2]", "ReturnValue.Field[crate::core_arch::simd::f64x4(0)].Element", "value", "dfc-generated"]
+      - ["repo:https://github.com/rust-lang/stdarch:core_arch", "<crate::core_arch::simd::f64x4>::new", "Argument[3]", "ReturnValue.Field[crate::core_arch::simd::f64x4(0)].Element", "value", "dfc-generated"]
+      - ["repo:https://github.com/rust-lang/stdarch:core_arch", "<crate::core_arch::simd::f64x8>::from_array", "Argument[0]", "ReturnValue.Field[crate::core_arch::simd::f64x8(0)]", "value", "dfc-generated"]
+      - ["repo:https://github.com/rust-lang/stdarch:core_arch", "<crate::core_arch::simd::f64x8>::new", "Argument[0]", "ReturnValue.Field[crate::core_arch::simd::f64x8(0)].Element", "value", "dfc-generated"]
+      - ["repo:https://github.com/rust-lang/stdarch:core_arch", "<crate::core_arch::simd::f64x8>::new", "Argument[1]", "ReturnValue.Field[crate::core_arch::simd::f64x8(0)].Element", "value", "dfc-generated"]
+      - ["repo:https://github.com/rust-lang/stdarch:core_arch", "<crate::core_arch::simd::f64x8>::new", "Argument[2]", "ReturnValue.Field[crate::core_arch::simd::f64x8(0)].Element", "value", "dfc-generated"]
+      - ["repo:https://github.com/rust-lang/stdarch:core_arch", "<crate::core_arch::simd::f64x8>::new", "Argument[3]", "ReturnValue.Field[crate::core_arch::simd::f64x8(0)].Element", "value", "dfc-generated"]
+      - ["repo:https://github.com/rust-lang/stdarch:core_arch", "<crate::core_arch::simd::f64x8>::new", "Argument[4]", "ReturnValue.Field[crate::core_arch::simd::f64x8(0)].Element", "value", "dfc-generated"]
+      - ["repo:https://github.com/rust-lang/stdarch:core_arch", "<crate::core_arch::simd::f64x8>::new", "Argument[5]", "ReturnValue.Field[crate::core_arch::simd::f64x8(0)].Element", "value", "dfc-generated"]
+      - ["repo:https://github.com/rust-lang/stdarch:core_arch", "<crate::core_arch::simd::f64x8>::new", "Argument[6]", "ReturnValue.Field[crate::core_arch::simd::f64x8(0)].Element", "value", "dfc-generated"]
+      - ["repo:https://github.com/rust-lang/stdarch:core_arch", "<crate::core_arch::simd::f64x8>::new", "Argument[7]", "ReturnValue.Field[crate::core_arch::simd::f64x8(0)].Element", "value", "dfc-generated"]
+      - ["repo:https://github.com/rust-lang/stdarch:core_arch", "<crate::core_arch::simd::i16x16>::from_array", "Argument[0]", "ReturnValue.Field[crate::core_arch::simd::i16x16(0)]", "value", "dfc-generated"]
+      - ["repo:https://github.com/rust-lang/stdarch:core_arch", "<crate::core_arch::simd::i16x16>::new", "Argument[0]", "ReturnValue.Field[crate::core_arch::simd::i16x16(0)].Element", "value", "dfc-generated"]
+      - ["repo:https://github.com/rust-lang/stdarch:core_arch", "<crate::core_arch::simd::i16x16>::new", "Argument[10]", "ReturnValue.Field[crate::core_arch::simd::i16x16(0)].Element", "value", "dfc-generated"]
+      - ["repo:https://github.com/rust-lang/stdarch:core_arch", "<crate::core_arch::simd::i16x16>::new", "Argument[11]", "ReturnValue.Field[crate::core_arch::simd::i16x16(0)].Element", "value", "dfc-generated"]
+      - ["repo:https://github.com/rust-lang/stdarch:core_arch", "<crate::core_arch::simd::i16x16>::new", "Argument[12]", "ReturnValue.Field[crate::core_arch::simd::i16x16(0)].Element", "value", "dfc-generated"]
+      - ["repo:https://github.com/rust-lang/stdarch:core_arch", "<crate::core_arch::simd::i16x16>::new", "Argument[13]", "ReturnValue.Field[crate::core_arch::simd::i16x16(0)].Element", "value", "dfc-generated"]
+      - ["repo:https://github.com/rust-lang/stdarch:core_arch", "<crate::core_arch::simd::i16x16>::new", "Argument[14]", "ReturnValue.Field[crate::core_arch::simd::i16x16(0)].Element", "value", "dfc-generated"]
+      - ["repo:https://github.com/rust-lang/stdarch:core_arch", "<crate::core_arch::simd::i16x16>::new", "Argument[15]", "ReturnValue.Field[crate::core_arch::simd::i16x16(0)].Element", "value", "dfc-generated"]
+      - ["repo:https://github.com/rust-lang/stdarch:core_arch", "<crate::core_arch::simd::i16x16>::new", "Argument[1]", "ReturnValue.Field[crate::core_arch::simd::i16x16(0)].Element", "value", "dfc-generated"]
+      - ["repo:https://github.com/rust-lang/stdarch:core_arch", "<crate::core_arch::simd::i16x16>::new", "Argument[2]", "ReturnValue.Field[crate::core_arch::simd::i16x16(0)].Element", "value", "dfc-generated"]
+      - ["repo:https://github.com/rust-lang/stdarch:core_arch", "<crate::core_arch::simd::i16x16>::new", "Argument[3]", "ReturnValue.Field[crate::core_arch::simd::i16x16(0)].Element", "value", "dfc-generated"]
+      - ["repo:https://github.com/rust-lang/stdarch:core_arch", "<crate::core_arch::simd::i16x16>::new", "Argument[4]", "ReturnValue.Field[crate::core_arch::simd::i16x16(0)].Element", "value", "dfc-generated"]
+      - ["repo:https://github.com/rust-lang/stdarch:core_arch", "<crate::core_arch::simd::i16x16>::new", "Argument[5]", "ReturnValue.Field[crate::core_arch::simd::i16x16(0)].Element", "value", "dfc-generated"]
+      - ["repo:https://github.com/rust-lang/stdarch:core_arch", "<crate::core_arch::simd::i16x16>::new", "Argument[6]", "ReturnValue.Field[crate::core_arch::simd::i16x16(0)].Element", "value", "dfc-generated"]
+      - ["repo:https://github.com/rust-lang/stdarch:core_arch", "<crate::core_arch::simd::i16x16>::new", "Argument[7]", "ReturnValue.Field[crate::core_arch::simd::i16x16(0)].Element", "value", "dfc-generated"]
+      - ["repo:https://github.com/rust-lang/stdarch:core_arch", "<crate::core_arch::simd::i16x16>::new", "Argument[8]", "ReturnValue.Field[crate::core_arch::simd::i16x16(0)].Element", "value", "dfc-generated"]
+      - ["repo:https://github.com/rust-lang/stdarch:core_arch", "<crate::core_arch::simd::i16x16>::new", "Argument[9]", "ReturnValue.Field[crate::core_arch::simd::i16x16(0)].Element", "value", "dfc-generated"]
+      - ["repo:https://github.com/rust-lang/stdarch:core_arch", "<crate::core_arch::simd::i16x2>::from_array", "Argument[0]", "ReturnValue.Field[crate::core_arch::simd::i16x2(0)]", "value", "dfc-generated"]
+      - ["repo:https://github.com/rust-lang/stdarch:core_arch", "<crate::core_arch::simd::i16x2>::new", "Argument[0]", "ReturnValue.Field[crate::core_arch::simd::i16x2(0)].Element", "value", "dfc-generated"]
+      - ["repo:https://github.com/rust-lang/stdarch:core_arch", "<crate::core_arch::simd::i16x2>::new", "Argument[1]", "ReturnValue.Field[crate::core_arch::simd::i16x2(0)].Element", "value", "dfc-generated"]
+      - ["repo:https://github.com/rust-lang/stdarch:core_arch", "<crate::core_arch::simd::i16x32>::from_array", "Argument[0]", "ReturnValue.Field[crate::core_arch::simd::i16x32(0)]", "value", "dfc-generated"]
+      - ["repo:https://github.com/rust-lang/stdarch:core_arch", "<crate::core_arch::simd::i16x32>::new", "Argument[0]", "ReturnValue.Field[crate::core_arch::simd::i16x32(0)].Element", "value", "dfc-generated"]
+      - ["repo:https://github.com/rust-lang/stdarch:core_arch", "<crate::core_arch::simd::i16x32>::new", "Argument[10]", "ReturnValue.Field[crate::core_arch::simd::i16x32(0)].Element", "value", "dfc-generated"]
+      - ["repo:https://github.com/rust-lang/stdarch:core_arch", "<crate::core_arch::simd::i16x32>::new", "Argument[11]", "ReturnValue.Field[crate::core_arch::simd::i16x32(0)].Element", "value", "dfc-generated"]
+      - ["repo:https://github.com/rust-lang/stdarch:core_arch", "<crate::core_arch::simd::i16x32>::new", "Argument[12]", "ReturnValue.Field[crate::core_arch::simd::i16x32(0)].Element", "value", "dfc-generated"]
+      - ["repo:https://github.com/rust-lang/stdarch:core_arch", "<crate::core_arch::simd::i16x32>::new", "Argument[13]", "ReturnValue.Field[crate::core_arch::simd::i16x32(0)].Element", "value", "dfc-generated"]
+      - ["repo:https://github.com/rust-lang/stdarch:core_arch", "<crate::core_arch::simd::i16x32>::new", "Argument[14]", "ReturnValue.Field[crate::core_arch::simd::i16x32(0)].Element", "value", "dfc-generated"]
+      - ["repo:https://github.com/rust-lang/stdarch:core_arch", "<crate::core_arch::simd::i16x32>::new", "Argument[15]", "ReturnValue.Field[crate::core_arch::simd::i16x32(0)].Element", "value", "dfc-generated"]
+      - ["repo:https://github.com/rust-lang/stdarch:core_arch", "<crate::core_arch::simd::i16x32>::new", "Argument[16]", "ReturnValue.Field[crate::core_arch::simd::i16x32(0)].Element", "value", "dfc-generated"]
+      - ["repo:https://github.com/rust-lang/stdarch:core_arch", "<crate::core_arch::simd::i16x32>::new", "Argument[17]", "ReturnValue.Field[crate::core_arch::simd::i16x32(0)].Element", "value", "dfc-generated"]
+      - ["repo:https://github.com/rust-lang/stdarch:core_arch", "<crate::core_arch::simd::i16x32>::new", "Argument[18]", "ReturnValue.Field[crate::core_arch::simd::i16x32(0)].Element", "value", "dfc-generated"]
+      - ["repo:https://github.com/rust-lang/stdarch:core_arch", "<crate::core_arch::simd::i16x32>::new", "Argument[19]", "ReturnValue.Field[crate::core_arch::simd::i16x32(0)].Element", "value", "dfc-generated"]
+      - ["repo:https://github.com/rust-lang/stdarch:core_arch", "<crate::core_arch::simd::i16x32>::new", "Argument[1]", "ReturnValue.Field[crate::core_arch::simd::i16x32(0)].Element", "value", "dfc-generated"]
+      - ["repo:https://github.com/rust-lang/stdarch:core_arch", "<crate::core_arch::simd::i16x32>::new", "Argument[20]", "ReturnValue.Field[crate::core_arch::simd::i16x32(0)].Element", "value", "dfc-generated"]
+      - ["repo:https://github.com/rust-lang/stdarch:core_arch", "<crate::core_arch::simd::i16x32>::new", "Argument[21]", "ReturnValue.Field[crate::core_arch::simd::i16x32(0)].Element", "value", "dfc-generated"]
+      - ["repo:https://github.com/rust-lang/stdarch:core_arch", "<crate::core_arch::simd::i16x32>::new", "Argument[22]", "ReturnValue.Field[crate::core_arch::simd::i16x32(0)].Element", "value", "dfc-generated"]
+      - ["repo:https://github.com/rust-lang/stdarch:core_arch", "<crate::core_arch::simd::i16x32>::new", "Argument[23]", "ReturnValue.Field[crate::core_arch::simd::i16x32(0)].Element", "value", "dfc-generated"]
+      - ["repo:https://github.com/rust-lang/stdarch:core_arch", "<crate::core_arch::simd::i16x32>::new", "Argument[24]", "ReturnValue.Field[crate::core_arch::simd::i16x32(0)].Element", "value", "dfc-generated"]
+      - ["repo:https://github.com/rust-lang/stdarch:core_arch", "<crate::core_arch::simd::i16x32>::new", "Argument[25]", "ReturnValue.Field[crate::core_arch::simd::i16x32(0)].Element", "value", "dfc-generated"]
+      - ["repo:https://github.com/rust-lang/stdarch:core_arch", "<crate::core_arch::simd::i16x32>::new", "Argument[26]", "ReturnValue.Field[crate::core_arch::simd::i16x32(0)].Element", "value", "dfc-generated"]
+      - ["repo:https://github.com/rust-lang/stdarch:core_arch", "<crate::core_arch::simd::i16x32>::new", "Argument[27]", "ReturnValue.Field[crate::core_arch::simd::i16x32(0)].Element", "value", "dfc-generated"]
+      - ["repo:https://github.com/rust-lang/stdarch:core_arch", "<crate::core_arch::simd::i16x32>::new", "Argument[28]", "ReturnValue.Field[crate::core_arch::simd::i16x32(0)].Element", "value", "dfc-generated"]
+      - ["repo:https://github.com/rust-lang/stdarch:core_arch", "<crate::core_arch::simd::i16x32>::new", "Argument[29]", "ReturnValue.Field[crate::core_arch::simd::i16x32(0)].Element", "value", "dfc-generated"]
+      - ["repo:https://github.com/rust-lang/stdarch:core_arch", "<crate::core_arch::simd::i16x32>::new", "Argument[2]", "ReturnValue.Field[crate::core_arch::simd::i16x32(0)].Element", "value", "dfc-generated"]
+      - ["repo:https://github.com/rust-lang/stdarch:core_arch", "<crate::core_arch::simd::i16x32>::new", "Argument[30]", "ReturnValue.Field[crate::core_arch::simd::i16x32(0)].Element", "value", "dfc-generated"]
+      - ["repo:https://github.com/rust-lang/stdarch:core_arch", "<crate::core_arch::simd::i16x32>::new", "Argument[31]", "ReturnValue.Field[crate::core_arch::simd::i16x32(0)].Element", "value", "dfc-generated"]
+      - ["repo:https://github.com/rust-lang/stdarch:core_arch", "<crate::core_arch::simd::i16x32>::new", "Argument[3]", "ReturnValue.Field[crate::core_arch::simd::i16x32(0)].Element", "value", "dfc-generated"]
+      - ["repo:https://github.com/rust-lang/stdarch:core_arch", "<crate::core_arch::simd::i16x32>::new", "Argument[4]", "ReturnValue.Field[crate::core_arch::simd::i16x32(0)].Element", "value", "dfc-generated"]
+      - ["repo:https://github.com/rust-lang/stdarch:core_arch", "<crate::core_arch::simd::i16x32>::new", "Argument[5]", "ReturnValue.Field[crate::core_arch::simd::i16x32(0)].Element", "value", "dfc-generated"]
+      - ["repo:https://github.com/rust-lang/stdarch:core_arch", "<crate::core_arch::simd::i16x32>::new", "Argument[6]", "ReturnValue.Field[crate::core_arch::simd::i16x32(0)].Element", "value", "dfc-generated"]
+      - ["repo:https://github.com/rust-lang/stdarch:core_arch", "<crate::core_arch::simd::i16x32>::new", "Argument[7]", "ReturnValue.Field[crate::core_arch::simd::i16x32(0)].Element", "value", "dfc-generated"]
+      - ["repo:https://github.com/rust-lang/stdarch:core_arch", "<crate::core_arch::simd::i16x32>::new", "Argument[8]", "ReturnValue.Field[crate::core_arch::simd::i16x32(0)].Element", "value", "dfc-generated"]
+      - ["repo:https://github.com/rust-lang/stdarch:core_arch", "<crate::core_arch::simd::i16x32>::new", "Argument[9]", "ReturnValue.Field[crate::core_arch::simd::i16x32(0)].Element", "value", "dfc-generated"]
+      - ["repo:https://github.com/rust-lang/stdarch:core_arch", "<crate::core_arch::simd::i16x4>::from_array", "Argument[0]", "ReturnValue.Field[crate::core_arch::simd::i16x4(0)]", "value", "dfc-generated"]
+      - ["repo:https://github.com/rust-lang/stdarch:core_arch", "<crate::core_arch::simd::i16x4>::new", "Argument[0]", "ReturnValue.Field[crate::core_arch::simd::i16x4(0)].Element", "value", "dfc-generated"]
+      - ["repo:https://github.com/rust-lang/stdarch:core_arch", "<crate::core_arch::simd::i16x4>::new", "Argument[1]", "ReturnValue.Field[crate::core_arch::simd::i16x4(0)].Element", "value", "dfc-generated"]
+      - ["repo:https://github.com/rust-lang/stdarch:core_arch", "<crate::core_arch::simd::i16x4>::new", "Argument[2]", "ReturnValue.Field[crate::core_arch::simd::i16x4(0)].Element", "value", "dfc-generated"]
+      - ["repo:https://github.com/rust-lang/stdarch:core_arch", "<crate::core_arch::simd::i16x4>::new", "Argument[3]", "ReturnValue.Field[crate::core_arch::simd::i16x4(0)].Element", "value", "dfc-generated"]
+      - ["repo:https://github.com/rust-lang/stdarch:core_arch", "<crate::core_arch::simd::i16x8>::from_array", "Argument[0]", "ReturnValue.Field[crate::core_arch::simd::i16x8(0)]", "value", "dfc-generated"]
+      - ["repo:https://github.com/rust-lang/stdarch:core_arch", "<crate::core_arch::simd::i16x8>::new", "Argument[0]", "ReturnValue.Field[crate::core_arch::simd::i16x8(0)].Element", "value", "dfc-generated"]
+      - ["repo:https://github.com/rust-lang/stdarch:core_arch", "<crate::core_arch::simd::i16x8>::new", "Argument[1]", "ReturnValue.Field[crate::core_arch::simd::i16x8(0)].Element", "value", "dfc-generated"]
+      - ["repo:https://github.com/rust-lang/stdarch:core_arch", "<crate::core_arch::simd::i16x8>::new", "Argument[2]", "ReturnValue.Field[crate::core_arch::simd::i16x8(0)].Element", "value", "dfc-generated"]
+      - ["repo:https://github.com/rust-lang/stdarch:core_arch", "<crate::core_arch::simd::i16x8>::new", "Argument[3]", "ReturnValue.Field[crate::core_arch::simd::i16x8(0)].Element", "value", "dfc-generated"]
+      - ["repo:https://github.com/rust-lang/stdarch:core_arch", "<crate::core_arch::simd::i16x8>::new", "Argument[4]", "ReturnValue.Field[crate::core_arch::simd::i16x8(0)].Element", "value", "dfc-generated"]
+      - ["repo:https://github.com/rust-lang/stdarch:core_arch", "<crate::core_arch::simd::i16x8>::new", "Argument[5]", "ReturnValue.Field[crate::core_arch::simd::i16x8(0)].Element", "value", "dfc-generated"]
+      - ["repo:https://github.com/rust-lang/stdarch:core_arch", "<crate::core_arch::simd::i16x8>::new", "Argument[6]", "ReturnValue.Field[crate::core_arch::simd::i16x8(0)].Element", "value", "dfc-generated"]
+      - ["repo:https://github.com/rust-lang/stdarch:core_arch", "<crate::core_arch::simd::i16x8>::new", "Argument[7]", "ReturnValue.Field[crate::core_arch::simd::i16x8(0)].Element", "value", "dfc-generated"]
+      - ["repo:https://github.com/rust-lang/stdarch:core_arch", "<crate::core_arch::simd::i32x16>::from_array", "Argument[0]", "ReturnValue.Field[crate::core_arch::simd::i32x16(0)]", "value", "dfc-generated"]
+      - ["repo:https://github.com/rust-lang/stdarch:core_arch", "<crate::core_arch::simd::i32x16>::new", "Argument[0]", "ReturnValue.Field[crate::core_arch::simd::i32x16(0)].Element", "value", "dfc-generated"]
+      - ["repo:https://github.com/rust-lang/stdarch:core_arch", "<crate::core_arch::simd::i32x16>::new", "Argument[10]", "ReturnValue.Field[crate::core_arch::simd::i32x16(0)].Element", "value", "dfc-generated"]
+      - ["repo:https://github.com/rust-lang/stdarch:core_arch", "<crate::core_arch::simd::i32x16>::new", "Argument[11]", "ReturnValue.Field[crate::core_arch::simd::i32x16(0)].Element", "value", "dfc-generated"]
+      - ["repo:https://github.com/rust-lang/stdarch:core_arch", "<crate::core_arch::simd::i32x16>::new", "Argument[12]", "ReturnValue.Field[crate::core_arch::simd::i32x16(0)].Element", "value", "dfc-generated"]
+      - ["repo:https://github.com/rust-lang/stdarch:core_arch", "<crate::core_arch::simd::i32x16>::new", "Argument[13]", "ReturnValue.Field[crate::core_arch::simd::i32x16(0)].Element", "value", "dfc-generated"]
+      - ["repo:https://github.com/rust-lang/stdarch:core_arch", "<crate::core_arch::simd::i32x16>::new", "Argument[14]", "ReturnValue.Field[crate::core_arch::simd::i32x16(0)].Element", "value", "dfc-generated"]
+      - ["repo:https://github.com/rust-lang/stdarch:core_arch", "<crate::core_arch::simd::i32x16>::new", "Argument[15]", "ReturnValue.Field[crate::core_arch::simd::i32x16(0)].Element", "value", "dfc-generated"]
+      - ["repo:https://github.com/rust-lang/stdarch:core_arch", "<crate::core_arch::simd::i32x16>::new", "Argument[1]", "ReturnValue.Field[crate::core_arch::simd::i32x16(0)].Element", "value", "dfc-generated"]
+      - ["repo:https://github.com/rust-lang/stdarch:core_arch", "<crate::core_arch::simd::i32x16>::new", "Argument[2]", "ReturnValue.Field[crate::core_arch::simd::i32x16(0)].Element", "value", "dfc-generated"]
+      - ["repo:https://github.com/rust-lang/stdarch:core_arch", "<crate::core_arch::simd::i32x16>::new", "Argument[3]", "ReturnValue.Field[crate::core_arch::simd::i32x16(0)].Element", "value", "dfc-generated"]
+      - ["repo:https://github.com/rust-lang/stdarch:core_arch", "<crate::core_arch::simd::i32x16>::new", "Argument[4]", "ReturnValue.Field[crate::core_arch::simd::i32x16(0)].Element", "value", "dfc-generated"]
+      - ["repo:https://github.com/rust-lang/stdarch:core_arch", "<crate::core_arch::simd::i32x16>::new", "Argument[5]", "ReturnValue.Field[crate::core_arch::simd::i32x16(0)].Element", "value", "dfc-generated"]
+      - ["repo:https://github.com/rust-lang/stdarch:core_arch", "<crate::core_arch::simd::i32x16>::new", "Argument[6]", "ReturnValue.Field[crate::core_arch::simd::i32x16(0)].Element", "value", "dfc-generated"]
+      - ["repo:https://github.com/rust-lang/stdarch:core_arch", "<crate::core_arch::simd::i32x16>::new", "Argument[7]", "ReturnValue.Field[crate::core_arch::simd::i32x16(0)].Element", "value", "dfc-generated"]
+      - ["repo:https://github.com/rust-lang/stdarch:core_arch", "<crate::core_arch::simd::i32x16>::new", "Argument[8]", "ReturnValue.Field[crate::core_arch::simd::i32x16(0)].Element", "value", "dfc-generated"]
+      - ["repo:https://github.com/rust-lang/stdarch:core_arch", "<crate::core_arch::simd::i32x16>::new", "Argument[9]", "ReturnValue.Field[crate::core_arch::simd::i32x16(0)].Element", "value", "dfc-generated"]
+      - ["repo:https://github.com/rust-lang/stdarch:core_arch", "<crate::core_arch::simd::i32x2>::from_array", "Argument[0]", "ReturnValue.Field[crate::core_arch::simd::i32x2(0)]", "value", "dfc-generated"]
+      - ["repo:https://github.com/rust-lang/stdarch:core_arch", "<crate::core_arch::simd::i32x2>::new", "Argument[0]", "ReturnValue.Field[crate::core_arch::simd::i32x2(0)].Element", "value", "dfc-generated"]
+      - ["repo:https://github.com/rust-lang/stdarch:core_arch", "<crate::core_arch::simd::i32x2>::new", "Argument[1]", "ReturnValue.Field[crate::core_arch::simd::i32x2(0)].Element", "value", "dfc-generated"]
+      - ["repo:https://github.com/rust-lang/stdarch:core_arch", "<crate::core_arch::simd::i32x32>::from_array", "Argument[0]", "ReturnValue.Field[crate::core_arch::simd::i32x32(0)]", "value", "dfc-generated"]
+      - ["repo:https://github.com/rust-lang/stdarch:core_arch", "<crate::core_arch::simd::i32x32>::new", "Argument[0]", "ReturnValue.Field[crate::core_arch::simd::i32x32(0)].Element", "value", "dfc-generated"]
+      - ["repo:https://github.com/rust-lang/stdarch:core_arch", "<crate::core_arch::simd::i32x32>::new", "Argument[10]", "ReturnValue.Field[crate::core_arch::simd::i32x32(0)].Element", "value", "dfc-generated"]
+      - ["repo:https://github.com/rust-lang/stdarch:core_arch", "<crate::core_arch::simd::i32x32>::new", "Argument[11]", "ReturnValue.Field[crate::core_arch::simd::i32x32(0)].Element", "value", "dfc-generated"]
+      - ["repo:https://github.com/rust-lang/stdarch:core_arch", "<crate::core_arch::simd::i32x32>::new", "Argument[12]", "ReturnValue.Field[crate::core_arch::simd::i32x32(0)].Element", "value", "dfc-generated"]
+      - ["repo:https://github.com/rust-lang/stdarch:core_arch", "<crate::core_arch::simd::i32x32>::new", "Argument[13]", "ReturnValue.Field[crate::core_arch::simd::i32x32(0)].Element", "value", "dfc-generated"]
+      - ["repo:https://github.com/rust-lang/stdarch:core_arch", "<crate::core_arch::simd::i32x32>::new", "Argument[14]", "ReturnValue.Field[crate::core_arch::simd::i32x32(0)].Element", "value", "dfc-generated"]
+      - ["repo:https://github.com/rust-lang/stdarch:core_arch", "<crate::core_arch::simd::i32x32>::new", "Argument[15]", "ReturnValue.Field[crate::core_arch::simd::i32x32(0)].Element", "value", "dfc-generated"]
+      - ["repo:https://github.com/rust-lang/stdarch:core_arch", "<crate::core_arch::simd::i32x32>::new", "Argument[16]", "ReturnValue.Field[crate::core_arch::simd::i32x32(0)].Element", "value", "dfc-generated"]
+      - ["repo:https://github.com/rust-lang/stdarch:core_arch", "<crate::core_arch::simd::i32x32>::new", "Argument[17]", "ReturnValue.Field[crate::core_arch::simd::i32x32(0)].Element", "value", "dfc-generated"]
+      - ["repo:https://github.com/rust-lang/stdarch:core_arch", "<crate::core_arch::simd::i32x32>::new", "Argument[18]", "ReturnValue.Field[crate::core_arch::simd::i32x32(0)].Element", "value", "dfc-generated"]
+      - ["repo:https://github.com/rust-lang/stdarch:core_arch", "<crate::core_arch::simd::i32x32>::new", "Argument[19]", "ReturnValue.Field[crate::core_arch::simd::i32x32(0)].Element", "value", "dfc-generated"]
+      - ["repo:https://github.com/rust-lang/stdarch:core_arch", "<crate::core_arch::simd::i32x32>::new", "Argument[1]", "ReturnValue.Field[crate::core_arch::simd::i32x32(0)].Element", "value", "dfc-generated"]
+      - ["repo:https://github.com/rust-lang/stdarch:core_arch", "<crate::core_arch::simd::i32x32>::new", "Argument[20]", "ReturnValue.Field[crate::core_arch::simd::i32x32(0)].Element", "value", "dfc-generated"]
+      - ["repo:https://github.com/rust-lang/stdarch:core_arch", "<crate::core_arch::simd::i32x32>::new", "Argument[21]", "ReturnValue.Field[crate::core_arch::simd::i32x32(0)].Element", "value", "dfc-generated"]
+      - ["repo:https://github.com/rust-lang/stdarch:core_arch", "<crate::core_arch::simd::i32x32>::new", "Argument[22]", "ReturnValue.Field[crate::core_arch::simd::i32x32(0)].Element", "value", "dfc-generated"]
+      - ["repo:https://github.com/rust-lang/stdarch:core_arch", "<crate::core_arch::simd::i32x32>::new", "Argument[23]", "ReturnValue.Field[crate::core_arch::simd::i32x32(0)].Element", "value", "dfc-generated"]
+      - ["repo:https://github.com/rust-lang/stdarch:core_arch", "<crate::core_arch::simd::i32x32>::new", "Argument[24]", "ReturnValue.Field[crate::core_arch::simd::i32x32(0)].Element", "value", "dfc-generated"]
+      - ["repo:https://github.com/rust-lang/stdarch:core_arch", "<crate::core_arch::simd::i32x32>::new", "Argument[25]", "ReturnValue.Field[crate::core_arch::simd::i32x32(0)].Element", "value", "dfc-generated"]
+      - ["repo:https://github.com/rust-lang/stdarch:core_arch", "<crate::core_arch::simd::i32x32>::new", "Argument[26]", "ReturnValue.Field[crate::core_arch::simd::i32x32(0)].Element", "value", "dfc-generated"]
+      - ["repo:https://github.com/rust-lang/stdarch:core_arch", "<crate::core_arch::simd::i32x32>::new", "Argument[27]", "ReturnValue.Field[crate::core_arch::simd::i32x32(0)].Element", "value", "dfc-generated"]
+      - ["repo:https://github.com/rust-lang/stdarch:core_arch", "<crate::core_arch::simd::i32x32>::new", "Argument[28]", "ReturnValue.Field[crate::core_arch::simd::i32x32(0)].Element", "value", "dfc-generated"]
+      - ["repo:https://github.com/rust-lang/stdarch:core_arch", "<crate::core_arch::simd::i32x32>::new", "Argument[29]", "ReturnValue.Field[crate::core_arch::simd::i32x32(0)].Element", "value", "dfc-generated"]
+      - ["repo:https://github.com/rust-lang/stdarch:core_arch", "<crate::core_arch::simd::i32x32>::new", "Argument[2]", "ReturnValue.Field[crate::core_arch::simd::i32x32(0)].Element", "value", "dfc-generated"]
+      - ["repo:https://github.com/rust-lang/stdarch:core_arch", "<crate::core_arch::simd::i32x32>::new", "Argument[30]", "ReturnValue.Field[crate::core_arch::simd::i32x32(0)].Element", "value", "dfc-generated"]
+      - ["repo:https://github.com/rust-lang/stdarch:core_arch", "<crate::core_arch::simd::i32x32>::new", "Argument[31]", "ReturnValue.Field[crate::core_arch::simd::i32x32(0)].Element", "value", "dfc-generated"]
+      - ["repo:https://github.com/rust-lang/stdarch:core_arch", "<crate::core_arch::simd::i32x32>::new", "Argument[3]", "ReturnValue.Field[crate::core_arch::simd::i32x32(0)].Element", "value", "dfc-generated"]
+      - ["repo:https://github.com/rust-lang/stdarch:core_arch", "<crate::core_arch::simd::i32x32>::new", "Argument[4]", "ReturnValue.Field[crate::core_arch::simd::i32x32(0)].Element", "value", "dfc-generated"]
+      - ["repo:https://github.com/rust-lang/stdarch:core_arch", "<crate::core_arch::simd::i32x32>::new", "Argument[5]", "ReturnValue.Field[crate::core_arch::simd::i32x32(0)].Element", "value", "dfc-generated"]
+      - ["repo:https://github.com/rust-lang/stdarch:core_arch", "<crate::core_arch::simd::i32x32>::new", "Argument[6]", "ReturnValue.Field[crate::core_arch::simd::i32x32(0)].Element", "value", "dfc-generated"]
+      - ["repo:https://github.com/rust-lang/stdarch:core_arch", "<crate::core_arch::simd::i32x32>::new", "Argument[7]", "ReturnValue.Field[crate::core_arch::simd::i32x32(0)].Element", "value", "dfc-generated"]
+      - ["repo:https://github.com/rust-lang/stdarch:core_arch", "<crate::core_arch::simd::i32x32>::new", "Argument[8]", "ReturnValue.Field[crate::core_arch::simd::i32x32(0)].Element", "value", "dfc-generated"]
+      - ["repo:https://github.com/rust-lang/stdarch:core_arch", "<crate::core_arch::simd::i32x32>::new", "Argument[9]", "ReturnValue.Field[crate::core_arch::simd::i32x32(0)].Element", "value", "dfc-generated"]
+      - ["repo:https://github.com/rust-lang/stdarch:core_arch", "<crate::core_arch::simd::i32x4>::from_array", "Argument[0]", "ReturnValue.Field[crate::core_arch::simd::i32x4(0)]", "value", "dfc-generated"]
+      - ["repo:https://github.com/rust-lang/stdarch:core_arch", "<crate::core_arch::simd::i32x4>::new", "Argument[0]", "ReturnValue.Field[crate::core_arch::simd::i32x4(0)].Element", "value", "dfc-generated"]
+      - ["repo:https://github.com/rust-lang/stdarch:core_arch", "<crate::core_arch::simd::i32x4>::new", "Argument[1]", "ReturnValue.Field[crate::core_arch::simd::i32x4(0)].Element", "value", "dfc-generated"]
+      - ["repo:https://github.com/rust-lang/stdarch:core_arch", "<crate::core_arch::simd::i32x4>::new", "Argument[2]", "ReturnValue.Field[crate::core_arch::simd::i32x4(0)].Element", "value", "dfc-generated"]
+      - ["repo:https://github.com/rust-lang/stdarch:core_arch", "<crate::core_arch::simd::i32x4>::new", "Argument[3]", "ReturnValue.Field[crate::core_arch::simd::i32x4(0)].Element", "value", "dfc-generated"]
+      - ["repo:https://github.com/rust-lang/stdarch:core_arch", "<crate::core_arch::simd::i32x8>::from_array", "Argument[0]", "ReturnValue.Field[crate::core_arch::simd::i32x8(0)]", "value", "dfc-generated"]
+      - ["repo:https://github.com/rust-lang/stdarch:core_arch", "<crate::core_arch::simd::i32x8>::new", "Argument[0]", "ReturnValue.Field[crate::core_arch::simd::i32x8(0)].Element", "value", "dfc-generated"]
+      - ["repo:https://github.com/rust-lang/stdarch:core_arch", "<crate::core_arch::simd::i32x8>::new", "Argument[1]", "ReturnValue.Field[crate::core_arch::simd::i32x8(0)].Element", "value", "dfc-generated"]
+      - ["repo:https://github.com/rust-lang/stdarch:core_arch", "<crate::core_arch::simd::i32x8>::new", "Argument[2]", "ReturnValue.Field[crate::core_arch::simd::i32x8(0)].Element", "value", "dfc-generated"]
+      - ["repo:https://github.com/rust-lang/stdarch:core_arch", "<crate::core_arch::simd::i32x8>::new", "Argument[3]", "ReturnValue.Field[crate::core_arch::simd::i32x8(0)].Element", "value", "dfc-generated"]
+      - ["repo:https://github.com/rust-lang/stdarch:core_arch", "<crate::core_arch::simd::i32x8>::new", "Argument[4]", "ReturnValue.Field[crate::core_arch::simd::i32x8(0)].Element", "value", "dfc-generated"]
+      - ["repo:https://github.com/rust-lang/stdarch:core_arch", "<crate::core_arch::simd::i32x8>::new", "Argument[5]", "ReturnValue.Field[crate::core_arch::simd::i32x8(0)].Element", "value", "dfc-generated"]
+      - ["repo:https://github.com/rust-lang/stdarch:core_arch", "<crate::core_arch::simd::i32x8>::new", "Argument[6]", "ReturnValue.Field[crate::core_arch::simd::i32x8(0)].Element", "value", "dfc-generated"]
+      - ["repo:https://github.com/rust-lang/stdarch:core_arch", "<crate::core_arch::simd::i32x8>::new", "Argument[7]", "ReturnValue.Field[crate::core_arch::simd::i32x8(0)].Element", "value", "dfc-generated"]
+      - ["repo:https://github.com/rust-lang/stdarch:core_arch", "<crate::core_arch::simd::i64x1>::from_array", "Argument[0]", "ReturnValue.Field[crate::core_arch::simd::i64x1(0)]", "value", "dfc-generated"]
+      - ["repo:https://github.com/rust-lang/stdarch:core_arch", "<crate::core_arch::simd::i64x1>::new", "Argument[0]", "ReturnValue.Field[crate::core_arch::simd::i64x1(0)].Element", "value", "dfc-generated"]
+      - ["repo:https://github.com/rust-lang/stdarch:core_arch", "<crate::core_arch::simd::i64x2>::from_array", "Argument[0]", "ReturnValue.Field[crate::core_arch::simd::i64x2(0)]", "value", "dfc-generated"]
+      - ["repo:https://github.com/rust-lang/stdarch:core_arch", "<crate::core_arch::simd::i64x2>::new", "Argument[0]", "ReturnValue.Field[crate::core_arch::simd::i64x2(0)].Element", "value", "dfc-generated"]
+      - ["repo:https://github.com/rust-lang/stdarch:core_arch", "<crate::core_arch::simd::i64x2>::new", "Argument[1]", "ReturnValue.Field[crate::core_arch::simd::i64x2(0)].Element", "value", "dfc-generated"]
+      - ["repo:https://github.com/rust-lang/stdarch:core_arch", "<crate::core_arch::simd::i64x4>::from_array", "Argument[0]", "ReturnValue.Field[crate::core_arch::simd::i64x4(0)]", "value", "dfc-generated"]
+      - ["repo:https://github.com/rust-lang/stdarch:core_arch", "<crate::core_arch::simd::i64x4>::new", "Argument[0]", "ReturnValue.Field[crate::core_arch::simd::i64x4(0)].Element", "value", "dfc-generated"]
+      - ["repo:https://github.com/rust-lang/stdarch:core_arch", "<crate::core_arch::simd::i64x4>::new", "Argument[1]", "ReturnValue.Field[crate::core_arch::simd::i64x4(0)].Element", "value", "dfc-generated"]
+      - ["repo:https://github.com/rust-lang/stdarch:core_arch", "<crate::core_arch::simd::i64x4>::new", "Argument[2]", "ReturnValue.Field[crate::core_arch::simd::i64x4(0)].Element", "value", "dfc-generated"]
+      - ["repo:https://github.com/rust-lang/stdarch:core_arch", "<crate::core_arch::simd::i64x4>::new", "Argument[3]", "ReturnValue.Field[crate::core_arch::simd::i64x4(0)].Element", "value", "dfc-generated"]
+      - ["repo:https://github.com/rust-lang/stdarch:core_arch", "<crate::core_arch::simd::i64x8>::from_array", "Argument[0]", "ReturnValue.Field[crate::core_arch::simd::i64x8(0)]", "value", "dfc-generated"]
+      - ["repo:https://github.com/rust-lang/stdarch:core_arch", "<crate::core_arch::simd::i64x8>::new", "Argument[0]", "ReturnValue.Field[crate::core_arch::simd::i64x8(0)].Element", "value", "dfc-generated"]
+      - ["repo:https://github.com/rust-lang/stdarch:core_arch", "<crate::core_arch::simd::i64x8>::new", "Argument[1]", "ReturnValue.Field[crate::core_arch::simd::i64x8(0)].Element", "value", "dfc-generated"]
+      - ["repo:https://github.com/rust-lang/stdarch:core_arch", "<crate::core_arch::simd::i64x8>::new", "Argument[2]", "ReturnValue.Field[crate::core_arch::simd::i64x8(0)].Element", "value", "dfc-generated"]
+      - ["repo:https://github.com/rust-lang/stdarch:core_arch", "<crate::core_arch::simd::i64x8>::new", "Argument[3]", "ReturnValue.Field[crate::core_arch::simd::i64x8(0)].Element", "value", "dfc-generated"]
+      - ["repo:https://github.com/rust-lang/stdarch:core_arch", "<crate::core_arch::simd::i64x8>::new", "Argument[4]", "ReturnValue.Field[crate::core_arch::simd::i64x8(0)].Element", "value", "dfc-generated"]
+      - ["repo:https://github.com/rust-lang/stdarch:core_arch", "<crate::core_arch::simd::i64x8>::new", "Argument[5]", "ReturnValue.Field[crate::core_arch::simd::i64x8(0)].Element", "value", "dfc-generated"]
+      - ["repo:https://github.com/rust-lang/stdarch:core_arch", "<crate::core_arch::simd::i64x8>::new", "Argument[6]", "ReturnValue.Field[crate::core_arch::simd::i64x8(0)].Element", "value", "dfc-generated"]
+      - ["repo:https://github.com/rust-lang/stdarch:core_arch", "<crate::core_arch::simd::i64x8>::new", "Argument[7]", "ReturnValue.Field[crate::core_arch::simd::i64x8(0)].Element", "value", "dfc-generated"]
+      - ["repo:https://github.com/rust-lang/stdarch:core_arch", "<crate::core_arch::simd::i8x16>::from_array", "Argument[0]", "ReturnValue.Field[crate::core_arch::simd::i8x16(0)]", "value", "dfc-generated"]
+      - ["repo:https://github.com/rust-lang/stdarch:core_arch", "<crate::core_arch::simd::i8x16>::new", "Argument[0]", "ReturnValue.Field[crate::core_arch::simd::i8x16(0)].Element", "value", "dfc-generated"]
+      - ["repo:https://github.com/rust-lang/stdarch:core_arch", "<crate::core_arch::simd::i8x16>::new", "Argument[10]", "ReturnValue.Field[crate::core_arch::simd::i8x16(0)].Element", "value", "dfc-generated"]
+      - ["repo:https://github.com/rust-lang/stdarch:core_arch", "<crate::core_arch::simd::i8x16>::new", "Argument[11]", "ReturnValue.Field[crate::core_arch::simd::i8x16(0)].Element", "value", "dfc-generated"]
+      - ["repo:https://github.com/rust-lang/stdarch:core_arch", "<crate::core_arch::simd::i8x16>::new", "Argument[12]", "ReturnValue.Field[crate::core_arch::simd::i8x16(0)].Element", "value", "dfc-generated"]
+      - ["repo:https://github.com/rust-lang/stdarch:core_arch", "<crate::core_arch::simd::i8x16>::new", "Argument[13]", "ReturnValue.Field[crate::core_arch::simd::i8x16(0)].Element", "value", "dfc-generated"]
+      - ["repo:https://github.com/rust-lang/stdarch:core_arch", "<crate::core_arch::simd::i8x16>::new", "Argument[14]", "ReturnValue.Field[crate::core_arch::simd::i8x16(0)].Element", "value", "dfc-generated"]
+      - ["repo:https://github.com/rust-lang/stdarch:core_arch", "<crate::core_arch::simd::i8x16>::new", "Argument[15]", "ReturnValue.Field[crate::core_arch::simd::i8x16(0)].Element", "value", "dfc-generated"]
+      - ["repo:https://github.com/rust-lang/stdarch:core_arch", "<crate::core_arch::simd::i8x16>::new", "Argument[1]", "ReturnValue.Field[crate::core_arch::simd::i8x16(0)].Element", "value", "dfc-generated"]
+      - ["repo:https://github.com/rust-lang/stdarch:core_arch", "<crate::core_arch::simd::i8x16>::new", "Argument[2]", "ReturnValue.Field[crate::core_arch::simd::i8x16(0)].Element", "value", "dfc-generated"]
+      - ["repo:https://github.com/rust-lang/stdarch:core_arch", "<crate::core_arch::simd::i8x16>::new", "Argument[3]", "ReturnValue.Field[crate::core_arch::simd::i8x16(0)].Element", "value", "dfc-generated"]
+      - ["repo:https://github.com/rust-lang/stdarch:core_arch", "<crate::core_arch::simd::i8x16>::new", "Argument[4]", "ReturnValue.Field[crate::core_arch::simd::i8x16(0)].Element", "value", "dfc-generated"]
+      - ["repo:https://github.com/rust-lang/stdarch:core_arch", "<crate::core_arch::simd::i8x16>::new", "Argument[5]", "ReturnValue.Field[crate::core_arch::simd::i8x16(0)].Element", "value", "dfc-generated"]
+      - ["repo:https://github.com/rust-lang/stdarch:core_arch", "<crate::core_arch::simd::i8x16>::new", "Argument[6]", "ReturnValue.Field[crate::core_arch::simd::i8x16(0)].Element", "value", "dfc-generated"]
+      - ["repo:https://github.com/rust-lang/stdarch:core_arch", "<crate::core_arch::simd::i8x16>::new", "Argument[7]", "ReturnValue.Field[crate::core_arch::simd::i8x16(0)].Element", "value", "dfc-generated"]
+      - ["repo:https://github.com/rust-lang/stdarch:core_arch", "<crate::core_arch::simd::i8x16>::new", "Argument[8]", "ReturnValue.Field[crate::core_arch::simd::i8x16(0)].Element", "value", "dfc-generated"]
+      - ["repo:https://github.com/rust-lang/stdarch:core_arch", "<crate::core_arch::simd::i8x16>::new", "Argument[9]", "ReturnValue.Field[crate::core_arch::simd::i8x16(0)].Element", "value", "dfc-generated"]
+      - ["repo:https://github.com/rust-lang/stdarch:core_arch", "<crate::core_arch::simd::i8x2>::from_array", "Argument[0]", "ReturnValue.Field[crate::core_arch::simd::i8x2(0)]", "value", "dfc-generated"]
+      - ["repo:https://github.com/rust-lang/stdarch:core_arch", "<crate::core_arch::simd::i8x2>::new", "Argument[0]", "ReturnValue.Field[crate::core_arch::simd::i8x2(0)].Element", "value", "dfc-generated"]
+      - ["repo:https://github.com/rust-lang/stdarch:core_arch", "<crate::core_arch::simd::i8x2>::new", "Argument[1]", "ReturnValue.Field[crate::core_arch::simd::i8x2(0)].Element", "value", "dfc-generated"]
+      - ["repo:https://github.com/rust-lang/stdarch:core_arch", "<crate::core_arch::simd::i8x32>::from_array", "Argument[0]", "ReturnValue.Field[crate::core_arch::simd::i8x32(0)]", "value", "dfc-generated"]
+      - ["repo:https://github.com/rust-lang/stdarch:core_arch", "<crate::core_arch::simd::i8x32>::new", "Argument[0]", "ReturnValue.Field[crate::core_arch::simd::i8x32(0)].Element", "value", "dfc-generated"]
+      - ["repo:https://github.com/rust-lang/stdarch:core_arch", "<crate::core_arch::simd::i8x32>::new", "Argument[10]", "ReturnValue.Field[crate::core_arch::simd::i8x32(0)].Element", "value", "dfc-generated"]
+      - ["repo:https://github.com/rust-lang/stdarch:core_arch", "<crate::core_arch::simd::i8x32>::new", "Argument[11]", "ReturnValue.Field[crate::core_arch::simd::i8x32(0)].Element", "value", "dfc-generated"]
+      - ["repo:https://github.com/rust-lang/stdarch:core_arch", "<crate::core_arch::simd::i8x32>::new", "Argument[12]", "ReturnValue.Field[crate::core_arch::simd::i8x32(0)].Element", "value", "dfc-generated"]
+      - ["repo:https://github.com/rust-lang/stdarch:core_arch", "<crate::core_arch::simd::i8x32>::new", "Argument[13]", "ReturnValue.Field[crate::core_arch::simd::i8x32(0)].Element", "value", "dfc-generated"]
+      - ["repo:https://github.com/rust-lang/stdarch:core_arch", "<crate::core_arch::simd::i8x32>::new", "Argument[14]", "ReturnValue.Field[crate::core_arch::simd::i8x32(0)].Element", "value", "dfc-generated"]
+      - ["repo:https://github.com/rust-lang/stdarch:core_arch", "<crate::core_arch::simd::i8x32>::new", "Argument[15]", "ReturnValue.Field[crate::core_arch::simd::i8x32(0)].Element", "value", "dfc-generated"]
+      - ["repo:https://github.com/rust-lang/stdarch:core_arch", "<crate::core_arch::simd::i8x32>::new", "Argument[16]", "ReturnValue.Field[crate::core_arch::simd::i8x32(0)].Element", "value", "dfc-generated"]
+      - ["repo:https://github.com/rust-lang/stdarch:core_arch", "<crate::core_arch::simd::i8x32>::new", "Argument[17]", "ReturnValue.Field[crate::core_arch::simd::i8x32(0)].Element", "value", "dfc-generated"]
+      - ["repo:https://github.com/rust-lang/stdarch:core_arch", "<crate::core_arch::simd::i8x32>::new", "Argument[18]", "ReturnValue.Field[crate::core_arch::simd::i8x32(0)].Element", "value", "dfc-generated"]
+      - ["repo:https://github.com/rust-lang/stdarch:core_arch", "<crate::core_arch::simd::i8x32>::new", "Argument[19]", "ReturnValue.Field[crate::core_arch::simd::i8x32(0)].Element", "value", "dfc-generated"]
+      - ["repo:https://github.com/rust-lang/stdarch:core_arch", "<crate::core_arch::simd::i8x32>::new", "Argument[1]", "ReturnValue.Field[crate::core_arch::simd::i8x32(0)].Element", "value", "dfc-generated"]
+      - ["repo:https://github.com/rust-lang/stdarch:core_arch", "<crate::core_arch::simd::i8x32>::new", "Argument[20]", "ReturnValue.Field[crate::core_arch::simd::i8x32(0)].Element", "value", "dfc-generated"]
+      - ["repo:https://github.com/rust-lang/stdarch:core_arch", "<crate::core_arch::simd::i8x32>::new", "Argument[21]", "ReturnValue.Field[crate::core_arch::simd::i8x32(0)].Element", "value", "dfc-generated"]
+      - ["repo:https://github.com/rust-lang/stdarch:core_arch", "<crate::core_arch::simd::i8x32>::new", "Argument[22]", "ReturnValue.Field[crate::core_arch::simd::i8x32(0)].Element", "value", "dfc-generated"]
+      - ["repo:https://github.com/rust-lang/stdarch:core_arch", "<crate::core_arch::simd::i8x32>::new", "Argument[23]", "ReturnValue.Field[crate::core_arch::simd::i8x32(0)].Element", "value", "dfc-generated"]
+      - ["repo:https://github.com/rust-lang/stdarch:core_arch", "<crate::core_arch::simd::i8x32>::new", "Argument[24]", "ReturnValue.Field[crate::core_arch::simd::i8x32(0)].Element", "value", "dfc-generated"]
+      - ["repo:https://github.com/rust-lang/stdarch:core_arch", "<crate::core_arch::simd::i8x32>::new", "Argument[25]", "ReturnValue.Field[crate::core_arch::simd::i8x32(0)].Element", "value", "dfc-generated"]
+      - ["repo:https://github.com/rust-lang/stdarch:core_arch", "<crate::core_arch::simd::i8x32>::new", "Argument[26]", "ReturnValue.Field[crate::core_arch::simd::i8x32(0)].Element", "value", "dfc-generated"]
+      - ["repo:https://github.com/rust-lang/stdarch:core_arch", "<crate::core_arch::simd::i8x32>::new", "Argument[27]", "ReturnValue.Field[crate::core_arch::simd::i8x32(0)].Element", "value", "dfc-generated"]
+      - ["repo:https://github.com/rust-lang/stdarch:core_arch", "<crate::core_arch::simd::i8x32>::new", "Argument[28]", "ReturnValue.Field[crate::core_arch::simd::i8x32(0)].Element", "value", "dfc-generated"]
+      - ["repo:https://github.com/rust-lang/stdarch:core_arch", "<crate::core_arch::simd::i8x32>::new", "Argument[29]", "ReturnValue.Field[crate::core_arch::simd::i8x32(0)].Element", "value", "dfc-generated"]
+      - ["repo:https://github.com/rust-lang/stdarch:core_arch", "<crate::core_arch::simd::i8x32>::new", "Argument[2]", "ReturnValue.Field[crate::core_arch::simd::i8x32(0)].Element", "value", "dfc-generated"]
+      - ["repo:https://github.com/rust-lang/stdarch:core_arch", "<crate::core_arch::simd::i8x32>::new", "Argument[30]", "ReturnValue.Field[crate::core_arch::simd::i8x32(0)].Element", "value", "dfc-generated"]
+      - ["repo:https://github.com/rust-lang/stdarch:core_arch", "<crate::core_arch::simd::i8x32>::new", "Argument[31]", "ReturnValue.Field[crate::core_arch::simd::i8x32(0)].Element", "value", "dfc-generated"]
+      - ["repo:https://github.com/rust-lang/stdarch:core_arch", "<crate::core_arch::simd::i8x32>::new", "Argument[3]", "ReturnValue.Field[crate::core_arch::simd::i8x32(0)].Element", "value", "dfc-generated"]
+      - ["repo:https://github.com/rust-lang/stdarch:core_arch", "<crate::core_arch::simd::i8x32>::new", "Argument[4]", "ReturnValue.Field[crate::core_arch::simd::i8x32(0)].Element", "value", "dfc-generated"]
+      - ["repo:https://github.com/rust-lang/stdarch:core_arch", "<crate::core_arch::simd::i8x32>::new", "Argument[5]", "ReturnValue.Field[crate::core_arch::simd::i8x32(0)].Element", "value", "dfc-generated"]
+      - ["repo:https://github.com/rust-lang/stdarch:core_arch", "<crate::core_arch::simd::i8x32>::new", "Argument[6]", "ReturnValue.Field[crate::core_arch::simd::i8x32(0)].Element", "value", "dfc-generated"]
+      - ["repo:https://github.com/rust-lang/stdarch:core_arch", "<crate::core_arch::simd::i8x32>::new", "Argument[7]", "ReturnValue.Field[crate::core_arch::simd::i8x32(0)].Element", "value", "dfc-generated"]
+      - ["repo:https://github.com/rust-lang/stdarch:core_arch", "<crate::core_arch::simd::i8x32>::new", "Argument[8]", "ReturnValue.Field[crate::core_arch::simd::i8x32(0)].Element", "value", "dfc-generated"]
+      - ["repo:https://github.com/rust-lang/stdarch:core_arch", "<crate::core_arch::simd::i8x32>::new", "Argument[9]", "ReturnValue.Field[crate::core_arch::simd::i8x32(0)].Element", "value", "dfc-generated"]
+      - ["repo:https://github.com/rust-lang/stdarch:core_arch", "<crate::core_arch::simd::i8x4>::from_array", "Argument[0]", "ReturnValue.Field[crate::core_arch::simd::i8x4(0)]", "value", "dfc-generated"]
+      - ["repo:https://github.com/rust-lang/stdarch:core_arch", "<crate::core_arch::simd::i8x4>::new", "Argument[0]", "ReturnValue.Field[crate::core_arch::simd::i8x4(0)].Element", "value", "dfc-generated"]
+      - ["repo:https://github.com/rust-lang/stdarch:core_arch", "<crate::core_arch::simd::i8x4>::new", "Argument[1]", "ReturnValue.Field[crate::core_arch::simd::i8x4(0)].Element", "value", "dfc-generated"]
+      - ["repo:https://github.com/rust-lang/stdarch:core_arch", "<crate::core_arch::simd::i8x4>::new", "Argument[2]", "ReturnValue.Field[crate::core_arch::simd::i8x4(0)].Element", "value", "dfc-generated"]
+      - ["repo:https://github.com/rust-lang/stdarch:core_arch", "<crate::core_arch::simd::i8x4>::new", "Argument[3]", "ReturnValue.Field[crate::core_arch::simd::i8x4(0)].Element", "value", "dfc-generated"]
+      - ["repo:https://github.com/rust-lang/stdarch:core_arch", "<crate::core_arch::simd::i8x64>::from_array", "Argument[0]", "ReturnValue.Field[crate::core_arch::simd::i8x64(0)]", "value", "dfc-generated"]
+      - ["repo:https://github.com/rust-lang/stdarch:core_arch", "<crate::core_arch::simd::i8x64>::new", "Argument[0]", "ReturnValue.Field[crate::core_arch::simd::i8x64(0)].Element", "value", "dfc-generated"]
+      - ["repo:https://github.com/rust-lang/stdarch:core_arch", "<crate::core_arch::simd::i8x64>::new", "Argument[10]", "ReturnValue.Field[crate::core_arch::simd::i8x64(0)].Element", "value", "dfc-generated"]
+      - ["repo:https://github.com/rust-lang/stdarch:core_arch", "<crate::core_arch::simd::i8x64>::new", "Argument[11]", "ReturnValue.Field[crate::core_arch::simd::i8x64(0)].Element", "value", "dfc-generated"]
+      - ["repo:https://github.com/rust-lang/stdarch:core_arch", "<crate::core_arch::simd::i8x64>::new", "Argument[12]", "ReturnValue.Field[crate::core_arch::simd::i8x64(0)].Element", "value", "dfc-generated"]
+      - ["repo:https://github.com/rust-lang/stdarch:core_arch", "<crate::core_arch::simd::i8x64>::new", "Argument[13]", "ReturnValue.Field[crate::core_arch::simd::i8x64(0)].Element", "value", "dfc-generated"]
+      - ["repo:https://github.com/rust-lang/stdarch:core_arch", "<crate::core_arch::simd::i8x64>::new", "Argument[14]", "ReturnValue.Field[crate::core_arch::simd::i8x64(0)].Element", "value", "dfc-generated"]
+      - ["repo:https://github.com/rust-lang/stdarch:core_arch", "<crate::core_arch::simd::i8x64>::new", "Argument[15]", "ReturnValue.Field[crate::core_arch::simd::i8x64(0)].Element", "value", "dfc-generated"]
+      - ["repo:https://github.com/rust-lang/stdarch:core_arch", "<crate::core_arch::simd::i8x64>::new", "Argument[16]", "ReturnValue.Field[crate::core_arch::simd::i8x64(0)].Element", "value", "dfc-generated"]
+      - ["repo:https://github.com/rust-lang/stdarch:core_arch", "<crate::core_arch::simd::i8x64>::new", "Argument[17]", "ReturnValue.Field[crate::core_arch::simd::i8x64(0)].Element", "value", "dfc-generated"]
+      - ["repo:https://github.com/rust-lang/stdarch:core_arch", "<crate::core_arch::simd::i8x64>::new", "Argument[18]", "ReturnValue.Field[crate::core_arch::simd::i8x64(0)].Element", "value", "dfc-generated"]
+      - ["repo:https://github.com/rust-lang/stdarch:core_arch", "<crate::core_arch::simd::i8x64>::new", "Argument[19]", "ReturnValue.Field[crate::core_arch::simd::i8x64(0)].Element", "value", "dfc-generated"]
+      - ["repo:https://github.com/rust-lang/stdarch:core_arch", "<crate::core_arch::simd::i8x64>::new", "Argument[1]", "ReturnValue.Field[crate::core_arch::simd::i8x64(0)].Element", "value", "dfc-generated"]
+      - ["repo:https://github.com/rust-lang/stdarch:core_arch", "<crate::core_arch::simd::i8x64>::new", "Argument[20]", "ReturnValue.Field[crate::core_arch::simd::i8x64(0)].Element", "value", "dfc-generated"]
+      - ["repo:https://github.com/rust-lang/stdarch:core_arch", "<crate::core_arch::simd::i8x64>::new", "Argument[21]", "ReturnValue.Field[crate::core_arch::simd::i8x64(0)].Element", "value", "dfc-generated"]
+      - ["repo:https://github.com/rust-lang/stdarch:core_arch", "<crate::core_arch::simd::i8x64>::new", "Argument[22]", "ReturnValue.Field[crate::core_arch::simd::i8x64(0)].Element", "value", "dfc-generated"]
+      - ["repo:https://github.com/rust-lang/stdarch:core_arch", "<crate::core_arch::simd::i8x64>::new", "Argument[23]", "ReturnValue.Field[crate::core_arch::simd::i8x64(0)].Element", "value", "dfc-generated"]
+      - ["repo:https://github.com/rust-lang/stdarch:core_arch", "<crate::core_arch::simd::i8x64>::new", "Argument[24]", "ReturnValue.Field[crate::core_arch::simd::i8x64(0)].Element", "value", "dfc-generated"]
+      - ["repo:https://github.com/rust-lang/stdarch:core_arch", "<crate::core_arch::simd::i8x64>::new", "Argument[25]", "ReturnValue.Field[crate::core_arch::simd::i8x64(0)].Element", "value", "dfc-generated"]
+      - ["repo:https://github.com/rust-lang/stdarch:core_arch", "<crate::core_arch::simd::i8x64>::new", "Argument[26]", "ReturnValue.Field[crate::core_arch::simd::i8x64(0)].Element", "value", "dfc-generated"]
+      - ["repo:https://github.com/rust-lang/stdarch:core_arch", "<crate::core_arch::simd::i8x64>::new", "Argument[27]", "ReturnValue.Field[crate::core_arch::simd::i8x64(0)].Element", "value", "dfc-generated"]
+      - ["repo:https://github.com/rust-lang/stdarch:core_arch", "<crate::core_arch::simd::i8x64>::new", "Argument[28]", "ReturnValue.Field[crate::core_arch::simd::i8x64(0)].Element", "value", "dfc-generated"]
+      - ["repo:https://github.com/rust-lang/stdarch:core_arch", "<crate::core_arch::simd::i8x64>::new", "Argument[29]", "ReturnValue.Field[crate::core_arch::simd::i8x64(0)].Element", "value", "dfc-generated"]
+      - ["repo:https://github.com/rust-lang/stdarch:core_arch", "<crate::core_arch::simd::i8x64>::new", "Argument[2]", "ReturnValue.Field[crate::core_arch::simd::i8x64(0)].Element", "value", "dfc-generated"]
+      - ["repo:https://github.com/rust-lang/stdarch:core_arch", "<crate::core_arch::simd::i8x64>::new", "Argument[30]", "ReturnValue.Field[crate::core_arch::simd::i8x64(0)].Element", "value", "dfc-generated"]
+      - ["repo:https://github.com/rust-lang/stdarch:core_arch", "<crate::core_arch::simd::i8x64>::new", "Argument[31]", "ReturnValue.Field[crate::core_arch::simd::i8x64(0)].Element", "value", "dfc-generated"]
+      - ["repo:https://github.com/rust-lang/stdarch:core_arch", "<crate::core_arch::simd::i8x64>::new", "Argument[32]", "ReturnValue.Field[crate::core_arch::simd::i8x64(0)].Element", "value", "dfc-generated"]
+      - ["repo:https://github.com/rust-lang/stdarch:core_arch", "<crate::core_arch::simd::i8x64>::new", "Argument[33]", "ReturnValue.Field[crate::core_arch::simd::i8x64(0)].Element", "value", "dfc-generated"]
+      - ["repo:https://github.com/rust-lang/stdarch:core_arch", "<crate::core_arch::simd::i8x64>::new", "Argument[34]", "ReturnValue.Field[crate::core_arch::simd::i8x64(0)].Element", "value", "dfc-generated"]
+      - ["repo:https://github.com/rust-lang/stdarch:core_arch", "<crate::core_arch::simd::i8x64>::new", "Argument[35]", "ReturnValue.Field[crate::core_arch::simd::i8x64(0)].Element", "value", "dfc-generated"]
+      - ["repo:https://github.com/rust-lang/stdarch:core_arch", "<crate::core_arch::simd::i8x64>::new", "Argument[36]", "ReturnValue.Field[crate::core_arch::simd::i8x64(0)].Element", "value", "dfc-generated"]
+      - ["repo:https://github.com/rust-lang/stdarch:core_arch", "<crate::core_arch::simd::i8x64>::new", "Argument[37]", "ReturnValue.Field[crate::core_arch::simd::i8x64(0)].Element", "value", "dfc-generated"]
+      - ["repo:https://github.com/rust-lang/stdarch:core_arch", "<crate::core_arch::simd::i8x64>::new", "Argument[38]", "ReturnValue.Field[crate::core_arch::simd::i8x64(0)].Element", "value", "dfc-generated"]
+      - ["repo:https://github.com/rust-lang/stdarch:core_arch", "<crate::core_arch::simd::i8x64>::new", "Argument[39]", "ReturnValue.Field[crate::core_arch::simd::i8x64(0)].Element", "value", "dfc-generated"]
+      - ["repo:https://github.com/rust-lang/stdarch:core_arch", "<crate::core_arch::simd::i8x64>::new", "Argument[3]", "ReturnValue.Field[crate::core_arch::simd::i8x64(0)].Element", "value", "dfc-generated"]
+      - ["repo:https://github.com/rust-lang/stdarch:core_arch", "<crate::core_arch::simd::i8x64>::new", "Argument[40]", "ReturnValue.Field[crate::core_arch::simd::i8x64(0)].Element", "value", "dfc-generated"]
+      - ["repo:https://github.com/rust-lang/stdarch:core_arch", "<crate::core_arch::simd::i8x64>::new", "Argument[41]", "ReturnValue.Field[crate::core_arch::simd::i8x64(0)].Element", "value", "dfc-generated"]
+      - ["repo:https://github.com/rust-lang/stdarch:core_arch", "<crate::core_arch::simd::i8x64>::new", "Argument[42]", "ReturnValue.Field[crate::core_arch::simd::i8x64(0)].Element", "value", "dfc-generated"]
+      - ["repo:https://github.com/rust-lang/stdarch:core_arch", "<crate::core_arch::simd::i8x64>::new", "Argument[43]", "ReturnValue.Field[crate::core_arch::simd::i8x64(0)].Element", "value", "dfc-generated"]
+      - ["repo:https://github.com/rust-lang/stdarch:core_arch", "<crate::core_arch::simd::i8x64>::new", "Argument[44]", "ReturnValue.Field[crate::core_arch::simd::i8x64(0)].Element", "value", "dfc-generated"]
+      - ["repo:https://github.com/rust-lang/stdarch:core_arch", "<crate::core_arch::simd::i8x64>::new", "Argument[45]", "ReturnValue.Field[crate::core_arch::simd::i8x64(0)].Element", "value", "dfc-generated"]
+      - ["repo:https://github.com/rust-lang/stdarch:core_arch", "<crate::core_arch::simd::i8x64>::new", "Argument[46]", "ReturnValue.Field[crate::core_arch::simd::i8x64(0)].Element", "value", "dfc-generated"]
+      - ["repo:https://github.com/rust-lang/stdarch:core_arch", "<crate::core_arch::simd::i8x64>::new", "Argument[47]", "ReturnValue.Field[crate::core_arch::simd::i8x64(0)].Element", "value", "dfc-generated"]
+      - ["repo:https://github.com/rust-lang/stdarch:core_arch", "<crate::core_arch::simd::i8x64>::new", "Argument[48]", "ReturnValue.Field[crate::core_arch::simd::i8x64(0)].Element", "value", "dfc-generated"]
+      - ["repo:https://github.com/rust-lang/stdarch:core_arch", "<crate::core_arch::simd::i8x64>::new", "Argument[49]", "ReturnValue.Field[crate::core_arch::simd::i8x64(0)].Element", "value", "dfc-generated"]
+      - ["repo:https://github.com/rust-lang/stdarch:core_arch", "<crate::core_arch::simd::i8x64>::new", "Argument[4]", "ReturnValue.Field[crate::core_arch::simd::i8x64(0)].Element", "value", "dfc-generated"]
+      - ["repo:https://github.com/rust-lang/stdarch:core_arch", "<crate::core_arch::simd::i8x64>::new", "Argument[50]", "ReturnValue.Field[crate::core_arch::simd::i8x64(0)].Element", "value", "dfc-generated"]
+      - ["repo:https://github.com/rust-lang/stdarch:core_arch", "<crate::core_arch::simd::i8x64>::new", "Argument[51]", "ReturnValue.Field[crate::core_arch::simd::i8x64(0)].Element", "value", "dfc-generated"]
+      - ["repo:https://github.com/rust-lang/stdarch:core_arch", "<crate::core_arch::simd::i8x64>::new", "Argument[52]", "ReturnValue.Field[crate::core_arch::simd::i8x64(0)].Element", "value", "dfc-generated"]
+      - ["repo:https://github.com/rust-lang/stdarch:core_arch", "<crate::core_arch::simd::i8x64>::new", "Argument[53]", "ReturnValue.Field[crate::core_arch::simd::i8x64(0)].Element", "value", "dfc-generated"]
+      - ["repo:https://github.com/rust-lang/stdarch:core_arch", "<crate::core_arch::simd::i8x64>::new", "Argument[54]", "ReturnValue.Field[crate::core_arch::simd::i8x64(0)].Element", "value", "dfc-generated"]
+      - ["repo:https://github.com/rust-lang/stdarch:core_arch", "<crate::core_arch::simd::i8x64>::new", "Argument[55]", "ReturnValue.Field[crate::core_arch::simd::i8x64(0)].Element", "value", "dfc-generated"]
+      - ["repo:https://github.com/rust-lang/stdarch:core_arch", "<crate::core_arch::simd::i8x64>::new", "Argument[56]", "ReturnValue.Field[crate::core_arch::simd::i8x64(0)].Element", "value", "dfc-generated"]
+      - ["repo:https://github.com/rust-lang/stdarch:core_arch", "<crate::core_arch::simd::i8x64>::new", "Argument[57]", "ReturnValue.Field[crate::core_arch::simd::i8x64(0)].Element", "value", "dfc-generated"]
+      - ["repo:https://github.com/rust-lang/stdarch:core_arch", "<crate::core_arch::simd::i8x64>::new", "Argument[58]", "ReturnValue.Field[crate::core_arch::simd::i8x64(0)].Element", "value", "dfc-generated"]
+      - ["repo:https://github.com/rust-lang/stdarch:core_arch", "<crate::core_arch::simd::i8x64>::new", "Argument[59]", "ReturnValue.Field[crate::core_arch::simd::i8x64(0)].Element", "value", "dfc-generated"]
+      - ["repo:https://github.com/rust-lang/stdarch:core_arch", "<crate::core_arch::simd::i8x64>::new", "Argument[5]", "ReturnValue.Field[crate::core_arch::simd::i8x64(0)].Element", "value", "dfc-generated"]
+      - ["repo:https://github.com/rust-lang/stdarch:core_arch", "<crate::core_arch::simd::i8x64>::new", "Argument[60]", "ReturnValue.Field[crate::core_arch::simd::i8x64(0)].Element", "value", "dfc-generated"]
+      - ["repo:https://github.com/rust-lang/stdarch:core_arch", "<crate::core_arch::simd::i8x64>::new", "Argument[61]", "ReturnValue.Field[crate::core_arch::simd::i8x64(0)].Element", "value", "dfc-generated"]
+      - ["repo:https://github.com/rust-lang/stdarch:core_arch", "<crate::core_arch::simd::i8x64>::new", "Argument[62]", "ReturnValue.Field[crate::core_arch::simd::i8x64(0)].Element", "value", "dfc-generated"]
+      - ["repo:https://github.com/rust-lang/stdarch:core_arch", "<crate::core_arch::simd::i8x64>::new", "Argument[63]", "ReturnValue.Field[crate::core_arch::simd::i8x64(0)].Element", "value", "dfc-generated"]
+      - ["repo:https://github.com/rust-lang/stdarch:core_arch", "<crate::core_arch::simd::i8x64>::new", "Argument[6]", "ReturnValue.Field[crate::core_arch::simd::i8x64(0)].Element", "value", "dfc-generated"]
+      - ["repo:https://github.com/rust-lang/stdarch:core_arch", "<crate::core_arch::simd::i8x64>::new", "Argument[7]", "ReturnValue.Field[crate::core_arch::simd::i8x64(0)].Element", "value", "dfc-generated"]
+      - ["repo:https://github.com/rust-lang/stdarch:core_arch", "<crate::core_arch::simd::i8x64>::new", "Argument[8]", "ReturnValue.Field[crate::core_arch::simd::i8x64(0)].Element", "value", "dfc-generated"]
+      - ["repo:https://github.com/rust-lang/stdarch:core_arch", "<crate::core_arch::simd::i8x64>::new", "Argument[9]", "ReturnValue.Field[crate::core_arch::simd::i8x64(0)].Element", "value", "dfc-generated"]
+      - ["repo:https://github.com/rust-lang/stdarch:core_arch", "<crate::core_arch::simd::i8x8>::from_array", "Argument[0]", "ReturnValue.Field[crate::core_arch::simd::i8x8(0)]", "value", "dfc-generated"]
+      - ["repo:https://github.com/rust-lang/stdarch:core_arch", "<crate::core_arch::simd::i8x8>::new", "Argument[0]", "ReturnValue.Field[crate::core_arch::simd::i8x8(0)].Element", "value", "dfc-generated"]
+      - ["repo:https://github.com/rust-lang/stdarch:core_arch", "<crate::core_arch::simd::i8x8>::new", "Argument[1]", "ReturnValue.Field[crate::core_arch::simd::i8x8(0)].Element", "value", "dfc-generated"]
+      - ["repo:https://github.com/rust-lang/stdarch:core_arch", "<crate::core_arch::simd::i8x8>::new", "Argument[2]", "ReturnValue.Field[crate::core_arch::simd::i8x8(0)].Element", "value", "dfc-generated"]
+      - ["repo:https://github.com/rust-lang/stdarch:core_arch", "<crate::core_arch::simd::i8x8>::new", "Argument[3]", "ReturnValue.Field[crate::core_arch::simd::i8x8(0)].Element", "value", "dfc-generated"]
+      - ["repo:https://github.com/rust-lang/stdarch:core_arch", "<crate::core_arch::simd::i8x8>::new", "Argument[4]", "ReturnValue.Field[crate::core_arch::simd::i8x8(0)].Element", "value", "dfc-generated"]
+      - ["repo:https://github.com/rust-lang/stdarch:core_arch", "<crate::core_arch::simd::i8x8>::new", "Argument[5]", "ReturnValue.Field[crate::core_arch::simd::i8x8(0)].Element", "value", "dfc-generated"]
+      - ["repo:https://github.com/rust-lang/stdarch:core_arch", "<crate::core_arch::simd::i8x8>::new", "Argument[6]", "ReturnValue.Field[crate::core_arch::simd::i8x8(0)].Element", "value", "dfc-generated"]
+      - ["repo:https://github.com/rust-lang/stdarch:core_arch", "<crate::core_arch::simd::i8x8>::new", "Argument[7]", "ReturnValue.Field[crate::core_arch::simd::i8x8(0)].Element", "value", "dfc-generated"]
+      - ["repo:https://github.com/rust-lang/stdarch:core_arch", "<crate::core_arch::simd::u16x16>::from_array", "Argument[0]", "ReturnValue.Field[crate::core_arch::simd::u16x16(0)]", "value", "dfc-generated"]
+      - ["repo:https://github.com/rust-lang/stdarch:core_arch", "<crate::core_arch::simd::u16x16>::new", "Argument[0]", "ReturnValue.Field[crate::core_arch::simd::u16x16(0)].Element", "value", "dfc-generated"]
+      - ["repo:https://github.com/rust-lang/stdarch:core_arch", "<crate::core_arch::simd::u16x16>::new", "Argument[10]", "ReturnValue.Field[crate::core_arch::simd::u16x16(0)].Element", "value", "dfc-generated"]
+      - ["repo:https://github.com/rust-lang/stdarch:core_arch", "<crate::core_arch::simd::u16x16>::new", "Argument[11]", "ReturnValue.Field[crate::core_arch::simd::u16x16(0)].Element", "value", "dfc-generated"]
+      - ["repo:https://github.com/rust-lang/stdarch:core_arch", "<crate::core_arch::simd::u16x16>::new", "Argument[12]", "ReturnValue.Field[crate::core_arch::simd::u16x16(0)].Element", "value", "dfc-generated"]
+      - ["repo:https://github.com/rust-lang/stdarch:core_arch", "<crate::core_arch::simd::u16x16>::new", "Argument[13]", "ReturnValue.Field[crate::core_arch::simd::u16x16(0)].Element", "value", "dfc-generated"]
+      - ["repo:https://github.com/rust-lang/stdarch:core_arch", "<crate::core_arch::simd::u16x16>::new", "Argument[14]", "ReturnValue.Field[crate::core_arch::simd::u16x16(0)].Element", "value", "dfc-generated"]
+      - ["repo:https://github.com/rust-lang/stdarch:core_arch", "<crate::core_arch::simd::u16x16>::new", "Argument[15]", "ReturnValue.Field[crate::core_arch::simd::u16x16(0)].Element", "value", "dfc-generated"]
+      - ["repo:https://github.com/rust-lang/stdarch:core_arch", "<crate::core_arch::simd::u16x16>::new", "Argument[1]", "ReturnValue.Field[crate::core_arch::simd::u16x16(0)].Element", "value", "dfc-generated"]
+      - ["repo:https://github.com/rust-lang/stdarch:core_arch", "<crate::core_arch::simd::u16x16>::new", "Argument[2]", "ReturnValue.Field[crate::core_arch::simd::u16x16(0)].Element", "value", "dfc-generated"]
+      - ["repo:https://github.com/rust-lang/stdarch:core_arch", "<crate::core_arch::simd::u16x16>::new", "Argument[3]", "ReturnValue.Field[crate::core_arch::simd::u16x16(0)].Element", "value", "dfc-generated"]
+      - ["repo:https://github.com/rust-lang/stdarch:core_arch", "<crate::core_arch::simd::u16x16>::new", "Argument[4]", "ReturnValue.Field[crate::core_arch::simd::u16x16(0)].Element", "value", "dfc-generated"]
+      - ["repo:https://github.com/rust-lang/stdarch:core_arch", "<crate::core_arch::simd::u16x16>::new", "Argument[5]", "ReturnValue.Field[crate::core_arch::simd::u16x16(0)].Element", "value", "dfc-generated"]
+      - ["repo:https://github.com/rust-lang/stdarch:core_arch", "<crate::core_arch::simd::u16x16>::new", "Argument[6]", "ReturnValue.Field[crate::core_arch::simd::u16x16(0)].Element", "value", "dfc-generated"]
+      - ["repo:https://github.com/rust-lang/stdarch:core_arch", "<crate::core_arch::simd::u16x16>::new", "Argument[7]", "ReturnValue.Field[crate::core_arch::simd::u16x16(0)].Element", "value", "dfc-generated"]
+      - ["repo:https://github.com/rust-lang/stdarch:core_arch", "<crate::core_arch::simd::u16x16>::new", "Argument[8]", "ReturnValue.Field[crate::core_arch::simd::u16x16(0)].Element", "value", "dfc-generated"]
+      - ["repo:https://github.com/rust-lang/stdarch:core_arch", "<crate::core_arch::simd::u16x16>::new", "Argument[9]", "ReturnValue.Field[crate::core_arch::simd::u16x16(0)].Element", "value", "dfc-generated"]
+      - ["repo:https://github.com/rust-lang/stdarch:core_arch", "<crate::core_arch::simd::u16x2>::from_array", "Argument[0]", "ReturnValue.Field[crate::core_arch::simd::u16x2(0)]", "value", "dfc-generated"]
+      - ["repo:https://github.com/rust-lang/stdarch:core_arch", "<crate::core_arch::simd::u16x2>::new", "Argument[0]", "ReturnValue.Field[crate::core_arch::simd::u16x2(0)].Element", "value", "dfc-generated"]
+      - ["repo:https://github.com/rust-lang/stdarch:core_arch", "<crate::core_arch::simd::u16x2>::new", "Argument[1]", "ReturnValue.Field[crate::core_arch::simd::u16x2(0)].Element", "value", "dfc-generated"]
+      - ["repo:https://github.com/rust-lang/stdarch:core_arch", "<crate::core_arch::simd::u16x32>::from_array", "Argument[0]", "ReturnValue.Field[crate::core_arch::simd::u16x32(0)]", "value", "dfc-generated"]
+      - ["repo:https://github.com/rust-lang/stdarch:core_arch", "<crate::core_arch::simd::u16x32>::new", "Argument[0]", "ReturnValue.Field[crate::core_arch::simd::u16x32(0)].Element", "value", "dfc-generated"]
+      - ["repo:https://github.com/rust-lang/stdarch:core_arch", "<crate::core_arch::simd::u16x32>::new", "Argument[10]", "ReturnValue.Field[crate::core_arch::simd::u16x32(0)].Element", "value", "dfc-generated"]
+      - ["repo:https://github.com/rust-lang/stdarch:core_arch", "<crate::core_arch::simd::u16x32>::new", "Argument[11]", "ReturnValue.Field[crate::core_arch::simd::u16x32(0)].Element", "value", "dfc-generated"]
+      - ["repo:https://github.com/rust-lang/stdarch:core_arch", "<crate::core_arch::simd::u16x32>::new", "Argument[12]", "ReturnValue.Field[crate::core_arch::simd::u16x32(0)].Element", "value", "dfc-generated"]
+      - ["repo:https://github.com/rust-lang/stdarch:core_arch", "<crate::core_arch::simd::u16x32>::new", "Argument[13]", "ReturnValue.Field[crate::core_arch::simd::u16x32(0)].Element", "value", "dfc-generated"]
+      - ["repo:https://github.com/rust-lang/stdarch:core_arch", "<crate::core_arch::simd::u16x32>::new", "Argument[14]", "ReturnValue.Field[crate::core_arch::simd::u16x32(0)].Element", "value", "dfc-generated"]
+      - ["repo:https://github.com/rust-lang/stdarch:core_arch", "<crate::core_arch::simd::u16x32>::new", "Argument[15]", "ReturnValue.Field[crate::core_arch::simd::u16x32(0)].Element", "value", "dfc-generated"]
+      - ["repo:https://github.com/rust-lang/stdarch:core_arch", "<crate::core_arch::simd::u16x32>::new", "Argument[16]", "ReturnValue.Field[crate::core_arch::simd::u16x32(0)].Element", "value", "dfc-generated"]
+      - ["repo:https://github.com/rust-lang/stdarch:core_arch", "<crate::core_arch::simd::u16x32>::new", "Argument[17]", "ReturnValue.Field[crate::core_arch::simd::u16x32(0)].Element", "value", "dfc-generated"]
+      - ["repo:https://github.com/rust-lang/stdarch:core_arch", "<crate::core_arch::simd::u16x32>::new", "Argument[18]", "ReturnValue.Field[crate::core_arch::simd::u16x32(0)].Element", "value", "dfc-generated"]
+      - ["repo:https://github.com/rust-lang/stdarch:core_arch", "<crate::core_arch::simd::u16x32>::new", "Argument[19]", "ReturnValue.Field[crate::core_arch::simd::u16x32(0)].Element", "value", "dfc-generated"]
+      - ["repo:https://github.com/rust-lang/stdarch:core_arch", "<crate::core_arch::simd::u16x32>::new", "Argument[1]", "ReturnValue.Field[crate::core_arch::simd::u16x32(0)].Element", "value", "dfc-generated"]
+      - ["repo:https://github.com/rust-lang/stdarch:core_arch", "<crate::core_arch::simd::u16x32>::new", "Argument[20]", "ReturnValue.Field[crate::core_arch::simd::u16x32(0)].Element", "value", "dfc-generated"]
+      - ["repo:https://github.com/rust-lang/stdarch:core_arch", "<crate::core_arch::simd::u16x32>::new", "Argument[21]", "ReturnValue.Field[crate::core_arch::simd::u16x32(0)].Element", "value", "dfc-generated"]
+      - ["repo:https://github.com/rust-lang/stdarch:core_arch", "<crate::core_arch::simd::u16x32>::new", "Argument[22]", "ReturnValue.Field[crate::core_arch::simd::u16x32(0)].Element", "value", "dfc-generated"]
+      - ["repo:https://github.com/rust-lang/stdarch:core_arch", "<crate::core_arch::simd::u16x32>::new", "Argument[23]", "ReturnValue.Field[crate::core_arch::simd::u16x32(0)].Element", "value", "dfc-generated"]
+      - ["repo:https://github.com/rust-lang/stdarch:core_arch", "<crate::core_arch::simd::u16x32>::new", "Argument[24]", "ReturnValue.Field[crate::core_arch::simd::u16x32(0)].Element", "value", "dfc-generated"]
+      - ["repo:https://github.com/rust-lang/stdarch:core_arch", "<crate::core_arch::simd::u16x32>::new", "Argument[25]", "ReturnValue.Field[crate::core_arch::simd::u16x32(0)].Element", "value", "dfc-generated"]
+      - ["repo:https://github.com/rust-lang/stdarch:core_arch", "<crate::core_arch::simd::u16x32>::new", "Argument[26]", "ReturnValue.Field[crate::core_arch::simd::u16x32(0)].Element", "value", "dfc-generated"]
+      - ["repo:https://github.com/rust-lang/stdarch:core_arch", "<crate::core_arch::simd::u16x32>::new", "Argument[27]", "ReturnValue.Field[crate::core_arch::simd::u16x32(0)].Element", "value", "dfc-generated"]
+      - ["repo:https://github.com/rust-lang/stdarch:core_arch", "<crate::core_arch::simd::u16x32>::new", "Argument[28]", "ReturnValue.Field[crate::core_arch::simd::u16x32(0)].Element", "value", "dfc-generated"]
+      - ["repo:https://github.com/rust-lang/stdarch:core_arch", "<crate::core_arch::simd::u16x32>::new", "Argument[29]", "ReturnValue.Field[crate::core_arch::simd::u16x32(0)].Element", "value", "dfc-generated"]
+      - ["repo:https://github.com/rust-lang/stdarch:core_arch", "<crate::core_arch::simd::u16x32>::new", "Argument[2]", "ReturnValue.Field[crate::core_arch::simd::u16x32(0)].Element", "value", "dfc-generated"]
+      - ["repo:https://github.com/rust-lang/stdarch:core_arch", "<crate::core_arch::simd::u16x32>::new", "Argument[30]", "ReturnValue.Field[crate::core_arch::simd::u16x32(0)].Element", "value", "dfc-generated"]
+      - ["repo:https://github.com/rust-lang/stdarch:core_arch", "<crate::core_arch::simd::u16x32>::new", "Argument[31]", "ReturnValue.Field[crate::core_arch::simd::u16x32(0)].Element", "value", "dfc-generated"]
+      - ["repo:https://github.com/rust-lang/stdarch:core_arch", "<crate::core_arch::simd::u16x32>::new", "Argument[3]", "ReturnValue.Field[crate::core_arch::simd::u16x32(0)].Element", "value", "dfc-generated"]
+      - ["repo:https://github.com/rust-lang/stdarch:core_arch", "<crate::core_arch::simd::u16x32>::new", "Argument[4]", "ReturnValue.Field[crate::core_arch::simd::u16x32(0)].Element", "value", "dfc-generated"]
+      - ["repo:https://github.com/rust-lang/stdarch:core_arch", "<crate::core_arch::simd::u16x32>::new", "Argument[5]", "ReturnValue.Field[crate::core_arch::simd::u16x32(0)].Element", "value", "dfc-generated"]
+      - ["repo:https://github.com/rust-lang/stdarch:core_arch", "<crate::core_arch::simd::u16x32>::new", "Argument[6]", "ReturnValue.Field[crate::core_arch::simd::u16x32(0)].Element", "value", "dfc-generated"]
+      - ["repo:https://github.com/rust-lang/stdarch:core_arch", "<crate::core_arch::simd::u16x32>::new", "Argument[7]", "ReturnValue.Field[crate::core_arch::simd::u16x32(0)].Element", "value", "dfc-generated"]
+      - ["repo:https://github.com/rust-lang/stdarch:core_arch", "<crate::core_arch::simd::u16x32>::new", "Argument[8]", "ReturnValue.Field[crate::core_arch::simd::u16x32(0)].Element", "value", "dfc-generated"]
+      - ["repo:https://github.com/rust-lang/stdarch:core_arch", "<crate::core_arch::simd::u16x32>::new", "Argument[9]", "ReturnValue.Field[crate::core_arch::simd::u16x32(0)].Element", "value", "dfc-generated"]
+      - ["repo:https://github.com/rust-lang/stdarch:core_arch", "<crate::core_arch::simd::u16x4>::from_array", "Argument[0]", "ReturnValue.Field[crate::core_arch::simd::u16x4(0)]", "value", "dfc-generated"]
+      - ["repo:https://github.com/rust-lang/stdarch:core_arch", "<crate::core_arch::simd::u16x4>::new", "Argument[0]", "ReturnValue.Field[crate::core_arch::simd::u16x4(0)].Element", "value", "dfc-generated"]
+      - ["repo:https://github.com/rust-lang/stdarch:core_arch", "<crate::core_arch::simd::u16x4>::new", "Argument[1]", "ReturnValue.Field[crate::core_arch::simd::u16x4(0)].Element", "value", "dfc-generated"]
+      - ["repo:https://github.com/rust-lang/stdarch:core_arch", "<crate::core_arch::simd::u16x4>::new", "Argument[2]", "ReturnValue.Field[crate::core_arch::simd::u16x4(0)].Element", "value", "dfc-generated"]
+      - ["repo:https://github.com/rust-lang/stdarch:core_arch", "<crate::core_arch::simd::u16x4>::new", "Argument[3]", "ReturnValue.Field[crate::core_arch::simd::u16x4(0)].Element", "value", "dfc-generated"]
+      - ["repo:https://github.com/rust-lang/stdarch:core_arch", "<crate::core_arch::simd::u16x64>::from_array", "Argument[0]", "ReturnValue.Field[crate::core_arch::simd::u16x64(0)]", "value", "dfc-generated"]
+      - ["repo:https://github.com/rust-lang/stdarch:core_arch", "<crate::core_arch::simd::u16x64>::new", "Argument[0]", "ReturnValue.Field[crate::core_arch::simd::u16x64(0)].Element", "value", "dfc-generated"]
+      - ["repo:https://github.com/rust-lang/stdarch:core_arch", "<crate::core_arch::simd::u16x64>::new", "Argument[10]", "ReturnValue.Field[crate::core_arch::simd::u16x64(0)].Element", "value", "dfc-generated"]
+      - ["repo:https://github.com/rust-lang/stdarch:core_arch", "<crate::core_arch::simd::u16x64>::new", "Argument[11]", "ReturnValue.Field[crate::core_arch::simd::u16x64(0)].Element", "value", "dfc-generated"]
+      - ["repo:https://github.com/rust-lang/stdarch:core_arch", "<crate::core_arch::simd::u16x64>::new", "Argument[12]", "ReturnValue.Field[crate::core_arch::simd::u16x64(0)].Element", "value", "dfc-generated"]
+      - ["repo:https://github.com/rust-lang/stdarch:core_arch", "<crate::core_arch::simd::u16x64>::new", "Argument[13]", "ReturnValue.Field[crate::core_arch::simd::u16x64(0)].Element", "value", "dfc-generated"]
+      - ["repo:https://github.com/rust-lang/stdarch:core_arch", "<crate::core_arch::simd::u16x64>::new", "Argument[14]", "ReturnValue.Field[crate::core_arch::simd::u16x64(0)].Element", "value", "dfc-generated"]
+      - ["repo:https://github.com/rust-lang/stdarch:core_arch", "<crate::core_arch::simd::u16x64>::new", "Argument[15]", "ReturnValue.Field[crate::core_arch::simd::u16x64(0)].Element", "value", "dfc-generated"]
+      - ["repo:https://github.com/rust-lang/stdarch:core_arch", "<crate::core_arch::simd::u16x64>::new", "Argument[16]", "ReturnValue.Field[crate::core_arch::simd::u16x64(0)].Element", "value", "dfc-generated"]
+      - ["repo:https://github.com/rust-lang/stdarch:core_arch", "<crate::core_arch::simd::u16x64>::new", "Argument[17]", "ReturnValue.Field[crate::core_arch::simd::u16x64(0)].Element", "value", "dfc-generated"]
+      - ["repo:https://github.com/rust-lang/stdarch:core_arch", "<crate::core_arch::simd::u16x64>::new", "Argument[18]", "ReturnValue.Field[crate::core_arch::simd::u16x64(0)].Element", "value", "dfc-generated"]
+      - ["repo:https://github.com/rust-lang/stdarch:core_arch", "<crate::core_arch::simd::u16x64>::new", "Argument[19]", "ReturnValue.Field[crate::core_arch::simd::u16x64(0)].Element", "value", "dfc-generated"]
+      - ["repo:https://github.com/rust-lang/stdarch:core_arch", "<crate::core_arch::simd::u16x64>::new", "Argument[1]", "ReturnValue.Field[crate::core_arch::simd::u16x64(0)].Element", "value", "dfc-generated"]
+      - ["repo:https://github.com/rust-lang/stdarch:core_arch", "<crate::core_arch::simd::u16x64>::new", "Argument[20]", "ReturnValue.Field[crate::core_arch::simd::u16x64(0)].Element", "value", "dfc-generated"]
+      - ["repo:https://github.com/rust-lang/stdarch:core_arch", "<crate::core_arch::simd::u16x64>::new", "Argument[21]", "ReturnValue.Field[crate::core_arch::simd::u16x64(0)].Element", "value", "dfc-generated"]
+      - ["repo:https://github.com/rust-lang/stdarch:core_arch", "<crate::core_arch::simd::u16x64>::new", "Argument[22]", "ReturnValue.Field[crate::core_arch::simd::u16x64(0)].Element", "value", "dfc-generated"]
+      - ["repo:https://github.com/rust-lang/stdarch:core_arch", "<crate::core_arch::simd::u16x64>::new", "Argument[23]", "ReturnValue.Field[crate::core_arch::simd::u16x64(0)].Element", "value", "dfc-generated"]
+      - ["repo:https://github.com/rust-lang/stdarch:core_arch", "<crate::core_arch::simd::u16x64>::new", "Argument[24]", "ReturnValue.Field[crate::core_arch::simd::u16x64(0)].Element", "value", "dfc-generated"]
+      - ["repo:https://github.com/rust-lang/stdarch:core_arch", "<crate::core_arch::simd::u16x64>::new", "Argument[25]", "ReturnValue.Field[crate::core_arch::simd::u16x64(0)].Element", "value", "dfc-generated"]
+      - ["repo:https://github.com/rust-lang/stdarch:core_arch", "<crate::core_arch::simd::u16x64>::new", "Argument[26]", "ReturnValue.Field[crate::core_arch::simd::u16x64(0)].Element", "value", "dfc-generated"]
+      - ["repo:https://github.com/rust-lang/stdarch:core_arch", "<crate::core_arch::simd::u16x64>::new", "Argument[27]", "ReturnValue.Field[crate::core_arch::simd::u16x64(0)].Element", "value", "dfc-generated"]
+      - ["repo:https://github.com/rust-lang/stdarch:core_arch", "<crate::core_arch::simd::u16x64>::new", "Argument[28]", "ReturnValue.Field[crate::core_arch::simd::u16x64(0)].Element", "value", "dfc-generated"]
+      - ["repo:https://github.com/rust-lang/stdarch:core_arch", "<crate::core_arch::simd::u16x64>::new", "Argument[29]", "ReturnValue.Field[crate::core_arch::simd::u16x64(0)].Element", "value", "dfc-generated"]
+      - ["repo:https://github.com/rust-lang/stdarch:core_arch", "<crate::core_arch::simd::u16x64>::new", "Argument[2]", "ReturnValue.Field[crate::core_arch::simd::u16x64(0)].Element", "value", "dfc-generated"]
+      - ["repo:https://github.com/rust-lang/stdarch:core_arch", "<crate::core_arch::simd::u16x64>::new", "Argument[30]", "ReturnValue.Field[crate::core_arch::simd::u16x64(0)].Element", "value", "dfc-generated"]
+      - ["repo:https://github.com/rust-lang/stdarch:core_arch", "<crate::core_arch::simd::u16x64>::new", "Argument[31]", "ReturnValue.Field[crate::core_arch::simd::u16x64(0)].Element", "value", "dfc-generated"]
+      - ["repo:https://github.com/rust-lang/stdarch:core_arch", "<crate::core_arch::simd::u16x64>::new", "Argument[32]", "ReturnValue.Field[crate::core_arch::simd::u16x64(0)].Element", "value", "dfc-generated"]
+      - ["repo:https://github.com/rust-lang/stdarch:core_arch", "<crate::core_arch::simd::u16x64>::new", "Argument[33]", "ReturnValue.Field[crate::core_arch::simd::u16x64(0)].Element", "value", "dfc-generated"]
+      - ["repo:https://github.com/rust-lang/stdarch:core_arch", "<crate::core_arch::simd::u16x64>::new", "Argument[34]", "ReturnValue.Field[crate::core_arch::simd::u16x64(0)].Element", "value", "dfc-generated"]
+      - ["repo:https://github.com/rust-lang/stdarch:core_arch", "<crate::core_arch::simd::u16x64>::new", "Argument[35]", "ReturnValue.Field[crate::core_arch::simd::u16x64(0)].Element", "value", "dfc-generated"]
+      - ["repo:https://github.com/rust-lang/stdarch:core_arch", "<crate::core_arch::simd::u16x64>::new", "Argument[36]", "ReturnValue.Field[crate::core_arch::simd::u16x64(0)].Element", "value", "dfc-generated"]
+      - ["repo:https://github.com/rust-lang/stdarch:core_arch", "<crate::core_arch::simd::u16x64>::new", "Argument[37]", "ReturnValue.Field[crate::core_arch::simd::u16x64(0)].Element", "value", "dfc-generated"]
+      - ["repo:https://github.com/rust-lang/stdarch:core_arch", "<crate::core_arch::simd::u16x64>::new", "Argument[38]", "ReturnValue.Field[crate::core_arch::simd::u16x64(0)].Element", "value", "dfc-generated"]
+      - ["repo:https://github.com/rust-lang/stdarch:core_arch", "<crate::core_arch::simd::u16x64>::new", "Argument[39]", "ReturnValue.Field[crate::core_arch::simd::u16x64(0)].Element", "value", "dfc-generated"]
+      - ["repo:https://github.com/rust-lang/stdarch:core_arch", "<crate::core_arch::simd::u16x64>::new", "Argument[3]", "ReturnValue.Field[crate::core_arch::simd::u16x64(0)].Element", "value", "dfc-generated"]
+      - ["repo:https://github.com/rust-lang/stdarch:core_arch", "<crate::core_arch::simd::u16x64>::new", "Argument[40]", "ReturnValue.Field[crate::core_arch::simd::u16x64(0)].Element", "value", "dfc-generated"]
+      - ["repo:https://github.com/rust-lang/stdarch:core_arch", "<crate::core_arch::simd::u16x64>::new", "Argument[41]", "ReturnValue.Field[crate::core_arch::simd::u16x64(0)].Element", "value", "dfc-generated"]
+      - ["repo:https://github.com/rust-lang/stdarch:core_arch", "<crate::core_arch::simd::u16x64>::new", "Argument[42]", "ReturnValue.Field[crate::core_arch::simd::u16x64(0)].Element", "value", "dfc-generated"]
+      - ["repo:https://github.com/rust-lang/stdarch:core_arch", "<crate::core_arch::simd::u16x64>::new", "Argument[43]", "ReturnValue.Field[crate::core_arch::simd::u16x64(0)].Element", "value", "dfc-generated"]
+      - ["repo:https://github.com/rust-lang/stdarch:core_arch", "<crate::core_arch::simd::u16x64>::new", "Argument[44]", "ReturnValue.Field[crate::core_arch::simd::u16x64(0)].Element", "value", "dfc-generated"]
+      - ["repo:https://github.com/rust-lang/stdarch:core_arch", "<crate::core_arch::simd::u16x64>::new", "Argument[45]", "ReturnValue.Field[crate::core_arch::simd::u16x64(0)].Element", "value", "dfc-generated"]
+      - ["repo:https://github.com/rust-lang/stdarch:core_arch", "<crate::core_arch::simd::u16x64>::new", "Argument[46]", "ReturnValue.Field[crate::core_arch::simd::u16x64(0)].Element", "value", "dfc-generated"]
+      - ["repo:https://github.com/rust-lang/stdarch:core_arch", "<crate::core_arch::simd::u16x64>::new", "Argument[47]", "ReturnValue.Field[crate::core_arch::simd::u16x64(0)].Element", "value", "dfc-generated"]
+      - ["repo:https://github.com/rust-lang/stdarch:core_arch", "<crate::core_arch::simd::u16x64>::new", "Argument[48]", "ReturnValue.Field[crate::core_arch::simd::u16x64(0)].Element", "value", "dfc-generated"]
+      - ["repo:https://github.com/rust-lang/stdarch:core_arch", "<crate::core_arch::simd::u16x64>::new", "Argument[49]", "ReturnValue.Field[crate::core_arch::simd::u16x64(0)].Element", "value", "dfc-generated"]
+      - ["repo:https://github.com/rust-lang/stdarch:core_arch", "<crate::core_arch::simd::u16x64>::new", "Argument[4]", "ReturnValue.Field[crate::core_arch::simd::u16x64(0)].Element", "value", "dfc-generated"]
+      - ["repo:https://github.com/rust-lang/stdarch:core_arch", "<crate::core_arch::simd::u16x64>::new", "Argument[50]", "ReturnValue.Field[crate::core_arch::simd::u16x64(0)].Element", "value", "dfc-generated"]
+      - ["repo:https://github.com/rust-lang/stdarch:core_arch", "<crate::core_arch::simd::u16x64>::new", "Argument[51]", "ReturnValue.Field[crate::core_arch::simd::u16x64(0)].Element", "value", "dfc-generated"]
+      - ["repo:https://github.com/rust-lang/stdarch:core_arch", "<crate::core_arch::simd::u16x64>::new", "Argument[52]", "ReturnValue.Field[crate::core_arch::simd::u16x64(0)].Element", "value", "dfc-generated"]
+      - ["repo:https://github.com/rust-lang/stdarch:core_arch", "<crate::core_arch::simd::u16x64>::new", "Argument[53]", "ReturnValue.Field[crate::core_arch::simd::u16x64(0)].Element", "value", "dfc-generated"]
+      - ["repo:https://github.com/rust-lang/stdarch:core_arch", "<crate::core_arch::simd::u16x64>::new", "Argument[54]", "ReturnValue.Field[crate::core_arch::simd::u16x64(0)].Element", "value", "dfc-generated"]
+      - ["repo:https://github.com/rust-lang/stdarch:core_arch", "<crate::core_arch::simd::u16x64>::new", "Argument[55]", "ReturnValue.Field[crate::core_arch::simd::u16x64(0)].Element", "value", "dfc-generated"]
+      - ["repo:https://github.com/rust-lang/stdarch:core_arch", "<crate::core_arch::simd::u16x64>::new", "Argument[56]", "ReturnValue.Field[crate::core_arch::simd::u16x64(0)].Element", "value", "dfc-generated"]
+      - ["repo:https://github.com/rust-lang/stdarch:core_arch", "<crate::core_arch::simd::u16x64>::new", "Argument[57]", "ReturnValue.Field[crate::core_arch::simd::u16x64(0)].Element", "value", "dfc-generated"]
+      - ["repo:https://github.com/rust-lang/stdarch:core_arch", "<crate::core_arch::simd::u16x64>::new", "Argument[58]", "ReturnValue.Field[crate::core_arch::simd::u16x64(0)].Element", "value", "dfc-generated"]
+      - ["repo:https://github.com/rust-lang/stdarch:core_arch", "<crate::core_arch::simd::u16x64>::new", "Argument[59]", "ReturnValue.Field[crate::core_arch::simd::u16x64(0)].Element", "value", "dfc-generated"]
+      - ["repo:https://github.com/rust-lang/stdarch:core_arch", "<crate::core_arch::simd::u16x64>::new", "Argument[5]", "ReturnValue.Field[crate::core_arch::simd::u16x64(0)].Element", "value", "dfc-generated"]
+      - ["repo:https://github.com/rust-lang/stdarch:core_arch", "<crate::core_arch::simd::u16x64>::new", "Argument[60]", "ReturnValue.Field[crate::core_arch::simd::u16x64(0)].Element", "value", "dfc-generated"]
+      - ["repo:https://github.com/rust-lang/stdarch:core_arch", "<crate::core_arch::simd::u16x64>::new", "Argument[61]", "ReturnValue.Field[crate::core_arch::simd::u16x64(0)].Element", "value", "dfc-generated"]
+      - ["repo:https://github.com/rust-lang/stdarch:core_arch", "<crate::core_arch::simd::u16x64>::new", "Argument[62]", "ReturnValue.Field[crate::core_arch::simd::u16x64(0)].Element", "value", "dfc-generated"]
+      - ["repo:https://github.com/rust-lang/stdarch:core_arch", "<crate::core_arch::simd::u16x64>::new", "Argument[63]", "ReturnValue.Field[crate::core_arch::simd::u16x64(0)].Element", "value", "dfc-generated"]
+      - ["repo:https://github.com/rust-lang/stdarch:core_arch", "<crate::core_arch::simd::u16x64>::new", "Argument[6]", "ReturnValue.Field[crate::core_arch::simd::u16x64(0)].Element", "value", "dfc-generated"]
+      - ["repo:https://github.com/rust-lang/stdarch:core_arch", "<crate::core_arch::simd::u16x64>::new", "Argument[7]", "ReturnValue.Field[crate::core_arch::simd::u16x64(0)].Element", "value", "dfc-generated"]
+      - ["repo:https://github.com/rust-lang/stdarch:core_arch", "<crate::core_arch::simd::u16x64>::new", "Argument[8]", "ReturnValue.Field[crate::core_arch::simd::u16x64(0)].Element", "value", "dfc-generated"]
+      - ["repo:https://github.com/rust-lang/stdarch:core_arch", "<crate::core_arch::simd::u16x64>::new", "Argument[9]", "ReturnValue.Field[crate::core_arch::simd::u16x64(0)].Element", "value", "dfc-generated"]
+      - ["repo:https://github.com/rust-lang/stdarch:core_arch", "<crate::core_arch::simd::u16x8>::from_array", "Argument[0]", "ReturnValue.Field[crate::core_arch::simd::u16x8(0)]", "value", "dfc-generated"]
+      - ["repo:https://github.com/rust-lang/stdarch:core_arch", "<crate::core_arch::simd::u16x8>::new", "Argument[0]", "ReturnValue.Field[crate::core_arch::simd::u16x8(0)].Element", "value", "dfc-generated"]
+      - ["repo:https://github.com/rust-lang/stdarch:core_arch", "<crate::core_arch::simd::u16x8>::new", "Argument[1]", "ReturnValue.Field[crate::core_arch::simd::u16x8(0)].Element", "value", "dfc-generated"]
+      - ["repo:https://github.com/rust-lang/stdarch:core_arch", "<crate::core_arch::simd::u16x8>::new", "Argument[2]", "ReturnValue.Field[crate::core_arch::simd::u16x8(0)].Element", "value", "dfc-generated"]
+      - ["repo:https://github.com/rust-lang/stdarch:core_arch", "<crate::core_arch::simd::u16x8>::new", "Argument[3]", "ReturnValue.Field[crate::core_arch::simd::u16x8(0)].Element", "value", "dfc-generated"]
+      - ["repo:https://github.com/rust-lang/stdarch:core_arch", "<crate::core_arch::simd::u16x8>::new", "Argument[4]", "ReturnValue.Field[crate::core_arch::simd::u16x8(0)].Element", "value", "dfc-generated"]
+      - ["repo:https://github.com/rust-lang/stdarch:core_arch", "<crate::core_arch::simd::u16x8>::new", "Argument[5]", "ReturnValue.Field[crate::core_arch::simd::u16x8(0)].Element", "value", "dfc-generated"]
+      - ["repo:https://github.com/rust-lang/stdarch:core_arch", "<crate::core_arch::simd::u16x8>::new", "Argument[6]", "ReturnValue.Field[crate::core_arch::simd::u16x8(0)].Element", "value", "dfc-generated"]
+      - ["repo:https://github.com/rust-lang/stdarch:core_arch", "<crate::core_arch::simd::u16x8>::new", "Argument[7]", "ReturnValue.Field[crate::core_arch::simd::u16x8(0)].Element", "value", "dfc-generated"]
+      - ["repo:https://github.com/rust-lang/stdarch:core_arch", "<crate::core_arch::simd::u32x16>::from_array", "Argument[0]", "ReturnValue.Field[crate::core_arch::simd::u32x16(0)]", "value", "dfc-generated"]
+      - ["repo:https://github.com/rust-lang/stdarch:core_arch", "<crate::core_arch::simd::u32x16>::new", "Argument[0]", "ReturnValue.Field[crate::core_arch::simd::u32x16(0)].Element", "value", "dfc-generated"]
+      - ["repo:https://github.com/rust-lang/stdarch:core_arch", "<crate::core_arch::simd::u32x16>::new", "Argument[10]", "ReturnValue.Field[crate::core_arch::simd::u32x16(0)].Element", "value", "dfc-generated"]
+      - ["repo:https://github.com/rust-lang/stdarch:core_arch", "<crate::core_arch::simd::u32x16>::new", "Argument[11]", "ReturnValue.Field[crate::core_arch::simd::u32x16(0)].Element", "value", "dfc-generated"]
+      - ["repo:https://github.com/rust-lang/stdarch:core_arch", "<crate::core_arch::simd::u32x16>::new", "Argument[12]", "ReturnValue.Field[crate::core_arch::simd::u32x16(0)].Element", "value", "dfc-generated"]
+      - ["repo:https://github.com/rust-lang/stdarch:core_arch", "<crate::core_arch::simd::u32x16>::new", "Argument[13]", "ReturnValue.Field[crate::core_arch::simd::u32x16(0)].Element", "value", "dfc-generated"]
+      - ["repo:https://github.com/rust-lang/stdarch:core_arch", "<crate::core_arch::simd::u32x16>::new", "Argument[14]", "ReturnValue.Field[crate::core_arch::simd::u32x16(0)].Element", "value", "dfc-generated"]
+      - ["repo:https://github.com/rust-lang/stdarch:core_arch", "<crate::core_arch::simd::u32x16>::new", "Argument[15]", "ReturnValue.Field[crate::core_arch::simd::u32x16(0)].Element", "value", "dfc-generated"]
+      - ["repo:https://github.com/rust-lang/stdarch:core_arch", "<crate::core_arch::simd::u32x16>::new", "Argument[1]", "ReturnValue.Field[crate::core_arch::simd::u32x16(0)].Element", "value", "dfc-generated"]
+      - ["repo:https://github.com/rust-lang/stdarch:core_arch", "<crate::core_arch::simd::u32x16>::new", "Argument[2]", "ReturnValue.Field[crate::core_arch::simd::u32x16(0)].Element", "value", "dfc-generated"]
+      - ["repo:https://github.com/rust-lang/stdarch:core_arch", "<crate::core_arch::simd::u32x16>::new", "Argument[3]", "ReturnValue.Field[crate::core_arch::simd::u32x16(0)].Element", "value", "dfc-generated"]
+      - ["repo:https://github.com/rust-lang/stdarch:core_arch", "<crate::core_arch::simd::u32x16>::new", "Argument[4]", "ReturnValue.Field[crate::core_arch::simd::u32x16(0)].Element", "value", "dfc-generated"]
+      - ["repo:https://github.com/rust-lang/stdarch:core_arch", "<crate::core_arch::simd::u32x16>::new", "Argument[5]", "ReturnValue.Field[crate::core_arch::simd::u32x16(0)].Element", "value", "dfc-generated"]
+      - ["repo:https://github.com/rust-lang/stdarch:core_arch", "<crate::core_arch::simd::u32x16>::new", "Argument[6]", "ReturnValue.Field[crate::core_arch::simd::u32x16(0)].Element", "value", "dfc-generated"]
+      - ["repo:https://github.com/rust-lang/stdarch:core_arch", "<crate::core_arch::simd::u32x16>::new", "Argument[7]", "ReturnValue.Field[crate::core_arch::simd::u32x16(0)].Element", "value", "dfc-generated"]
+      - ["repo:https://github.com/rust-lang/stdarch:core_arch", "<crate::core_arch::simd::u32x16>::new", "Argument[8]", "ReturnValue.Field[crate::core_arch::simd::u32x16(0)].Element", "value", "dfc-generated"]
+      - ["repo:https://github.com/rust-lang/stdarch:core_arch", "<crate::core_arch::simd::u32x16>::new", "Argument[9]", "ReturnValue.Field[crate::core_arch::simd::u32x16(0)].Element", "value", "dfc-generated"]
+      - ["repo:https://github.com/rust-lang/stdarch:core_arch", "<crate::core_arch::simd::u32x2>::from_array", "Argument[0]", "ReturnValue.Field[crate::core_arch::simd::u32x2(0)]", "value", "dfc-generated"]
+      - ["repo:https://github.com/rust-lang/stdarch:core_arch", "<crate::core_arch::simd::u32x2>::new", "Argument[0]", "ReturnValue.Field[crate::core_arch::simd::u32x2(0)].Element", "value", "dfc-generated"]
+      - ["repo:https://github.com/rust-lang/stdarch:core_arch", "<crate::core_arch::simd::u32x2>::new", "Argument[1]", "ReturnValue.Field[crate::core_arch::simd::u32x2(0)].Element", "value", "dfc-generated"]
+      - ["repo:https://github.com/rust-lang/stdarch:core_arch", "<crate::core_arch::simd::u32x32>::from_array", "Argument[0]", "ReturnValue.Field[crate::core_arch::simd::u32x32(0)]", "value", "dfc-generated"]
+      - ["repo:https://github.com/rust-lang/stdarch:core_arch", "<crate::core_arch::simd::u32x32>::new", "Argument[0]", "ReturnValue.Field[crate::core_arch::simd::u32x32(0)].Element", "value", "dfc-generated"]
+      - ["repo:https://github.com/rust-lang/stdarch:core_arch", "<crate::core_arch::simd::u32x32>::new", "Argument[10]", "ReturnValue.Field[crate::core_arch::simd::u32x32(0)].Element", "value", "dfc-generated"]
+      - ["repo:https://github.com/rust-lang/stdarch:core_arch", "<crate::core_arch::simd::u32x32>::new", "Argument[11]", "ReturnValue.Field[crate::core_arch::simd::u32x32(0)].Element", "value", "dfc-generated"]
+      - ["repo:https://github.com/rust-lang/stdarch:core_arch", "<crate::core_arch::simd::u32x32>::new", "Argument[12]", "ReturnValue.Field[crate::core_arch::simd::u32x32(0)].Element", "value", "dfc-generated"]
+      - ["repo:https://github.com/rust-lang/stdarch:core_arch", "<crate::core_arch::simd::u32x32>::new", "Argument[13]", "ReturnValue.Field[crate::core_arch::simd::u32x32(0)].Element", "value", "dfc-generated"]
+      - ["repo:https://github.com/rust-lang/stdarch:core_arch", "<crate::core_arch::simd::u32x32>::new", "Argument[14]", "ReturnValue.Field[crate::core_arch::simd::u32x32(0)].Element", "value", "dfc-generated"]
+      - ["repo:https://github.com/rust-lang/stdarch:core_arch", "<crate::core_arch::simd::u32x32>::new", "Argument[15]", "ReturnValue.Field[crate::core_arch::simd::u32x32(0)].Element", "value", "dfc-generated"]
+      - ["repo:https://github.com/rust-lang/stdarch:core_arch", "<crate::core_arch::simd::u32x32>::new", "Argument[16]", "ReturnValue.Field[crate::core_arch::simd::u32x32(0)].Element", "value", "dfc-generated"]
+      - ["repo:https://github.com/rust-lang/stdarch:core_arch", "<crate::core_arch::simd::u32x32>::new", "Argument[17]", "ReturnValue.Field[crate::core_arch::simd::u32x32(0)].Element", "value", "dfc-generated"]
+      - ["repo:https://github.com/rust-lang/stdarch:core_arch", "<crate::core_arch::simd::u32x32>::new", "Argument[18]", "ReturnValue.Field[crate::core_arch::simd::u32x32(0)].Element", "value", "dfc-generated"]
+      - ["repo:https://github.com/rust-lang/stdarch:core_arch", "<crate::core_arch::simd::u32x32>::new", "Argument[19]", "ReturnValue.Field[crate::core_arch::simd::u32x32(0)].Element", "value", "dfc-generated"]
+      - ["repo:https://github.com/rust-lang/stdarch:core_arch", "<crate::core_arch::simd::u32x32>::new", "Argument[1]", "ReturnValue.Field[crate::core_arch::simd::u32x32(0)].Element", "value", "dfc-generated"]
+      - ["repo:https://github.com/rust-lang/stdarch:core_arch", "<crate::core_arch::simd::u32x32>::new", "Argument[20]", "ReturnValue.Field[crate::core_arch::simd::u32x32(0)].Element", "value", "dfc-generated"]
+      - ["repo:https://github.com/rust-lang/stdarch:core_arch", "<crate::core_arch::simd::u32x32>::new", "Argument[21]", "ReturnValue.Field[crate::core_arch::simd::u32x32(0)].Element", "value", "dfc-generated"]
+      - ["repo:https://github.com/rust-lang/stdarch:core_arch", "<crate::core_arch::simd::u32x32>::new", "Argument[22]", "ReturnValue.Field[crate::core_arch::simd::u32x32(0)].Element", "value", "dfc-generated"]
+      - ["repo:https://github.com/rust-lang/stdarch:core_arch", "<crate::core_arch::simd::u32x32>::new", "Argument[23]", "ReturnValue.Field[crate::core_arch::simd::u32x32(0)].Element", "value", "dfc-generated"]
+      - ["repo:https://github.com/rust-lang/stdarch:core_arch", "<crate::core_arch::simd::u32x32>::new", "Argument[24]", "ReturnValue.Field[crate::core_arch::simd::u32x32(0)].Element", "value", "dfc-generated"]
+      - ["repo:https://github.com/rust-lang/stdarch:core_arch", "<crate::core_arch::simd::u32x32>::new", "Argument[25]", "ReturnValue.Field[crate::core_arch::simd::u32x32(0)].Element", "value", "dfc-generated"]
+      - ["repo:https://github.com/rust-lang/stdarch:core_arch", "<crate::core_arch::simd::u32x32>::new", "Argument[26]", "ReturnValue.Field[crate::core_arch::simd::u32x32(0)].Element", "value", "dfc-generated"]
+      - ["repo:https://github.com/rust-lang/stdarch:core_arch", "<crate::core_arch::simd::u32x32>::new", "Argument[27]", "ReturnValue.Field[crate::core_arch::simd::u32x32(0)].Element", "value", "dfc-generated"]
+      - ["repo:https://github.com/rust-lang/stdarch:core_arch", "<crate::core_arch::simd::u32x32>::new", "Argument[28]", "ReturnValue.Field[crate::core_arch::simd::u32x32(0)].Element", "value", "dfc-generated"]
+      - ["repo:https://github.com/rust-lang/stdarch:core_arch", "<crate::core_arch::simd::u32x32>::new", "Argument[29]", "ReturnValue.Field[crate::core_arch::simd::u32x32(0)].Element", "value", "dfc-generated"]
+      - ["repo:https://github.com/rust-lang/stdarch:core_arch", "<crate::core_arch::simd::u32x32>::new", "Argument[2]", "ReturnValue.Field[crate::core_arch::simd::u32x32(0)].Element", "value", "dfc-generated"]
+      - ["repo:https://github.com/rust-lang/stdarch:core_arch", "<crate::core_arch::simd::u32x32>::new", "Argument[30]", "ReturnValue.Field[crate::core_arch::simd::u32x32(0)].Element", "value", "dfc-generated"]
+      - ["repo:https://github.com/rust-lang/stdarch:core_arch", "<crate::core_arch::simd::u32x32>::new", "Argument[31]", "ReturnValue.Field[crate::core_arch::simd::u32x32(0)].Element", "value", "dfc-generated"]
+      - ["repo:https://github.com/rust-lang/stdarch:core_arch", "<crate::core_arch::simd::u32x32>::new", "Argument[3]", "ReturnValue.Field[crate::core_arch::simd::u32x32(0)].Element", "value", "dfc-generated"]
+      - ["repo:https://github.com/rust-lang/stdarch:core_arch", "<crate::core_arch::simd::u32x32>::new", "Argument[4]", "ReturnValue.Field[crate::core_arch::simd::u32x32(0)].Element", "value", "dfc-generated"]
+      - ["repo:https://github.com/rust-lang/stdarch:core_arch", "<crate::core_arch::simd::u32x32>::new", "Argument[5]", "ReturnValue.Field[crate::core_arch::simd::u32x32(0)].Element", "value", "dfc-generated"]
+      - ["repo:https://github.com/rust-lang/stdarch:core_arch", "<crate::core_arch::simd::u32x32>::new", "Argument[6]", "ReturnValue.Field[crate::core_arch::simd::u32x32(0)].Element", "value", "dfc-generated"]
+      - ["repo:https://github.com/rust-lang/stdarch:core_arch", "<crate::core_arch::simd::u32x32>::new", "Argument[7]", "ReturnValue.Field[crate::core_arch::simd::u32x32(0)].Element", "value", "dfc-generated"]
+      - ["repo:https://github.com/rust-lang/stdarch:core_arch", "<crate::core_arch::simd::u32x32>::new", "Argument[8]", "ReturnValue.Field[crate::core_arch::simd::u32x32(0)].Element", "value", "dfc-generated"]
+      - ["repo:https://github.com/rust-lang/stdarch:core_arch", "<crate::core_arch::simd::u32x32>::new", "Argument[9]", "ReturnValue.Field[crate::core_arch::simd::u32x32(0)].Element", "value", "dfc-generated"]
+      - ["repo:https://github.com/rust-lang/stdarch:core_arch", "<crate::core_arch::simd::u32x4>::from_array", "Argument[0]", "ReturnValue.Field[crate::core_arch::simd::u32x4(0)]", "value", "dfc-generated"]
+      - ["repo:https://github.com/rust-lang/stdarch:core_arch", "<crate::core_arch::simd::u32x4>::new", "Argument[0]", "ReturnValue.Field[crate::core_arch::simd::u32x4(0)].Element", "value", "dfc-generated"]
+      - ["repo:https://github.com/rust-lang/stdarch:core_arch", "<crate::core_arch::simd::u32x4>::new", "Argument[1]", "ReturnValue.Field[crate::core_arch::simd::u32x4(0)].Element", "value", "dfc-generated"]
+      - ["repo:https://github.com/rust-lang/stdarch:core_arch", "<crate::core_arch::simd::u32x4>::new", "Argument[2]", "ReturnValue.Field[crate::core_arch::simd::u32x4(0)].Element", "value", "dfc-generated"]
+      - ["repo:https://github.com/rust-lang/stdarch:core_arch", "<crate::core_arch::simd::u32x4>::new", "Argument[3]", "ReturnValue.Field[crate::core_arch::simd::u32x4(0)].Element", "value", "dfc-generated"]
+      - ["repo:https://github.com/rust-lang/stdarch:core_arch", "<crate::core_arch::simd::u32x8>::from_array", "Argument[0]", "ReturnValue.Field[crate::core_arch::simd::u32x8(0)]", "value", "dfc-generated"]
+      - ["repo:https://github.com/rust-lang/stdarch:core_arch", "<crate::core_arch::simd::u32x8>::new", "Argument[0]", "ReturnValue.Field[crate::core_arch::simd::u32x8(0)].Element", "value", "dfc-generated"]
+      - ["repo:https://github.com/rust-lang/stdarch:core_arch", "<crate::core_arch::simd::u32x8>::new", "Argument[1]", "ReturnValue.Field[crate::core_arch::simd::u32x8(0)].Element", "value", "dfc-generated"]
+      - ["repo:https://github.com/rust-lang/stdarch:core_arch", "<crate::core_arch::simd::u32x8>::new", "Argument[2]", "ReturnValue.Field[crate::core_arch::simd::u32x8(0)].Element", "value", "dfc-generated"]
+      - ["repo:https://github.com/rust-lang/stdarch:core_arch", "<crate::core_arch::simd::u32x8>::new", "Argument[3]", "ReturnValue.Field[crate::core_arch::simd::u32x8(0)].Element", "value", "dfc-generated"]
+      - ["repo:https://github.com/rust-lang/stdarch:core_arch", "<crate::core_arch::simd::u32x8>::new", "Argument[4]", "ReturnValue.Field[crate::core_arch::simd::u32x8(0)].Element", "value", "dfc-generated"]
+      - ["repo:https://github.com/rust-lang/stdarch:core_arch", "<crate::core_arch::simd::u32x8>::new", "Argument[5]", "ReturnValue.Field[crate::core_arch::simd::u32x8(0)].Element", "value", "dfc-generated"]
+      - ["repo:https://github.com/rust-lang/stdarch:core_arch", "<crate::core_arch::simd::u32x8>::new", "Argument[6]", "ReturnValue.Field[crate::core_arch::simd::u32x8(0)].Element", "value", "dfc-generated"]
+      - ["repo:https://github.com/rust-lang/stdarch:core_arch", "<crate::core_arch::simd::u32x8>::new", "Argument[7]", "ReturnValue.Field[crate::core_arch::simd::u32x8(0)].Element", "value", "dfc-generated"]
+      - ["repo:https://github.com/rust-lang/stdarch:core_arch", "<crate::core_arch::simd::u64x1>::from_array", "Argument[0]", "ReturnValue.Field[crate::core_arch::simd::u64x1(0)]", "value", "dfc-generated"]
+      - ["repo:https://github.com/rust-lang/stdarch:core_arch", "<crate::core_arch::simd::u64x1>::new", "Argument[0]", "ReturnValue.Field[crate::core_arch::simd::u64x1(0)].Element", "value", "dfc-generated"]
+      - ["repo:https://github.com/rust-lang/stdarch:core_arch", "<crate::core_arch::simd::u64x2>::from_array", "Argument[0]", "ReturnValue.Field[crate::core_arch::simd::u64x2(0)]", "value", "dfc-generated"]
+      - ["repo:https://github.com/rust-lang/stdarch:core_arch", "<crate::core_arch::simd::u64x2>::new", "Argument[0]", "ReturnValue.Field[crate::core_arch::simd::u64x2(0)].Element", "value", "dfc-generated"]
+      - ["repo:https://github.com/rust-lang/stdarch:core_arch", "<crate::core_arch::simd::u64x2>::new", "Argument[1]", "ReturnValue.Field[crate::core_arch::simd::u64x2(0)].Element", "value", "dfc-generated"]
+      - ["repo:https://github.com/rust-lang/stdarch:core_arch", "<crate::core_arch::simd::u64x4>::from_array", "Argument[0]", "ReturnValue.Field[crate::core_arch::simd::u64x4(0)]", "value", "dfc-generated"]
+      - ["repo:https://github.com/rust-lang/stdarch:core_arch", "<crate::core_arch::simd::u64x4>::new", "Argument[0]", "ReturnValue.Field[crate::core_arch::simd::u64x4(0)].Element", "value", "dfc-generated"]
+      - ["repo:https://github.com/rust-lang/stdarch:core_arch", "<crate::core_arch::simd::u64x4>::new", "Argument[1]", "ReturnValue.Field[crate::core_arch::simd::u64x4(0)].Element", "value", "dfc-generated"]
+      - ["repo:https://github.com/rust-lang/stdarch:core_arch", "<crate::core_arch::simd::u64x4>::new", "Argument[2]", "ReturnValue.Field[crate::core_arch::simd::u64x4(0)].Element", "value", "dfc-generated"]
+      - ["repo:https://github.com/rust-lang/stdarch:core_arch", "<crate::core_arch::simd::u64x4>::new", "Argument[3]", "ReturnValue.Field[crate::core_arch::simd::u64x4(0)].Element", "value", "dfc-generated"]
+      - ["repo:https://github.com/rust-lang/stdarch:core_arch", "<crate::core_arch::simd::u64x8>::from_array", "Argument[0]", "ReturnValue.Field[crate::core_arch::simd::u64x8(0)]", "value", "dfc-generated"]
+      - ["repo:https://github.com/rust-lang/stdarch:core_arch", "<crate::core_arch::simd::u64x8>::new", "Argument[0]", "ReturnValue.Field[crate::core_arch::simd::u64x8(0)].Element", "value", "dfc-generated"]
+      - ["repo:https://github.com/rust-lang/stdarch:core_arch", "<crate::core_arch::simd::u64x8>::new", "Argument[1]", "ReturnValue.Field[crate::core_arch::simd::u64x8(0)].Element", "value", "dfc-generated"]
+      - ["repo:https://github.com/rust-lang/stdarch:core_arch", "<crate::core_arch::simd::u64x8>::new", "Argument[2]", "ReturnValue.Field[crate::core_arch::simd::u64x8(0)].Element", "value", "dfc-generated"]
+      - ["repo:https://github.com/rust-lang/stdarch:core_arch", "<crate::core_arch::simd::u64x8>::new", "Argument[3]", "ReturnValue.Field[crate::core_arch::simd::u64x8(0)].Element", "value", "dfc-generated"]
+      - ["repo:https://github.com/rust-lang/stdarch:core_arch", "<crate::core_arch::simd::u64x8>::new", "Argument[4]", "ReturnValue.Field[crate::core_arch::simd::u64x8(0)].Element", "value", "dfc-generated"]
+      - ["repo:https://github.com/rust-lang/stdarch:core_arch", "<crate::core_arch::simd::u64x8>::new", "Argument[5]", "ReturnValue.Field[crate::core_arch::simd::u64x8(0)].Element", "value", "dfc-generated"]
+      - ["repo:https://github.com/rust-lang/stdarch:core_arch", "<crate::core_arch::simd::u64x8>::new", "Argument[6]", "ReturnValue.Field[crate::core_arch::simd::u64x8(0)].Element", "value", "dfc-generated"]
+      - ["repo:https://github.com/rust-lang/stdarch:core_arch", "<crate::core_arch::simd::u64x8>::new", "Argument[7]", "ReturnValue.Field[crate::core_arch::simd::u64x8(0)].Element", "value", "dfc-generated"]
+      - ["repo:https://github.com/rust-lang/stdarch:core_arch", "<crate::core_arch::simd::u8x16>::from_array", "Argument[0]", "ReturnValue.Field[crate::core_arch::simd::u8x16(0)]", "value", "dfc-generated"]
+      - ["repo:https://github.com/rust-lang/stdarch:core_arch", "<crate::core_arch::simd::u8x16>::new", "Argument[0]", "ReturnValue.Field[crate::core_arch::simd::u8x16(0)].Element", "value", "dfc-generated"]
+      - ["repo:https://github.com/rust-lang/stdarch:core_arch", "<crate::core_arch::simd::u8x16>::new", "Argument[10]", "ReturnValue.Field[crate::core_arch::simd::u8x16(0)].Element", "value", "dfc-generated"]
+      - ["repo:https://github.com/rust-lang/stdarch:core_arch", "<crate::core_arch::simd::u8x16>::new", "Argument[11]", "ReturnValue.Field[crate::core_arch::simd::u8x16(0)].Element", "value", "dfc-generated"]
+      - ["repo:https://github.com/rust-lang/stdarch:core_arch", "<crate::core_arch::simd::u8x16>::new", "Argument[12]", "ReturnValue.Field[crate::core_arch::simd::u8x16(0)].Element", "value", "dfc-generated"]
+      - ["repo:https://github.com/rust-lang/stdarch:core_arch", "<crate::core_arch::simd::u8x16>::new", "Argument[13]", "ReturnValue.Field[crate::core_arch::simd::u8x16(0)].Element", "value", "dfc-generated"]
+      - ["repo:https://github.com/rust-lang/stdarch:core_arch", "<crate::core_arch::simd::u8x16>::new", "Argument[14]", "ReturnValue.Field[crate::core_arch::simd::u8x16(0)].Element", "value", "dfc-generated"]
+      - ["repo:https://github.com/rust-lang/stdarch:core_arch", "<crate::core_arch::simd::u8x16>::new", "Argument[15]", "ReturnValue.Field[crate::core_arch::simd::u8x16(0)].Element", "value", "dfc-generated"]
+      - ["repo:https://github.com/rust-lang/stdarch:core_arch", "<crate::core_arch::simd::u8x16>::new", "Argument[1]", "ReturnValue.Field[crate::core_arch::simd::u8x16(0)].Element", "value", "dfc-generated"]
+      - ["repo:https://github.com/rust-lang/stdarch:core_arch", "<crate::core_arch::simd::u8x16>::new", "Argument[2]", "ReturnValue.Field[crate::core_arch::simd::u8x16(0)].Element", "value", "dfc-generated"]
+      - ["repo:https://github.com/rust-lang/stdarch:core_arch", "<crate::core_arch::simd::u8x16>::new", "Argument[3]", "ReturnValue.Field[crate::core_arch::simd::u8x16(0)].Element", "value", "dfc-generated"]
+      - ["repo:https://github.com/rust-lang/stdarch:core_arch", "<crate::core_arch::simd::u8x16>::new", "Argument[4]", "ReturnValue.Field[crate::core_arch::simd::u8x16(0)].Element", "value", "dfc-generated"]
+      - ["repo:https://github.com/rust-lang/stdarch:core_arch", "<crate::core_arch::simd::u8x16>::new", "Argument[5]", "ReturnValue.Field[crate::core_arch::simd::u8x16(0)].Element", "value", "dfc-generated"]
+      - ["repo:https://github.com/rust-lang/stdarch:core_arch", "<crate::core_arch::simd::u8x16>::new", "Argument[6]", "ReturnValue.Field[crate::core_arch::simd::u8x16(0)].Element", "value", "dfc-generated"]
+      - ["repo:https://github.com/rust-lang/stdarch:core_arch", "<crate::core_arch::simd::u8x16>::new", "Argument[7]", "ReturnValue.Field[crate::core_arch::simd::u8x16(0)].Element", "value", "dfc-generated"]
+      - ["repo:https://github.com/rust-lang/stdarch:core_arch", "<crate::core_arch::simd::u8x16>::new", "Argument[8]", "ReturnValue.Field[crate::core_arch::simd::u8x16(0)].Element", "value", "dfc-generated"]
+      - ["repo:https://github.com/rust-lang/stdarch:core_arch", "<crate::core_arch::simd::u8x16>::new", "Argument[9]", "ReturnValue.Field[crate::core_arch::simd::u8x16(0)].Element", "value", "dfc-generated"]
+      - ["repo:https://github.com/rust-lang/stdarch:core_arch", "<crate::core_arch::simd::u8x2>::from_array", "Argument[0]", "ReturnValue.Field[crate::core_arch::simd::u8x2(0)]", "value", "dfc-generated"]
+      - ["repo:https://github.com/rust-lang/stdarch:core_arch", "<crate::core_arch::simd::u8x2>::new", "Argument[0]", "ReturnValue.Field[crate::core_arch::simd::u8x2(0)].Element", "value", "dfc-generated"]
+      - ["repo:https://github.com/rust-lang/stdarch:core_arch", "<crate::core_arch::simd::u8x2>::new", "Argument[1]", "ReturnValue.Field[crate::core_arch::simd::u8x2(0)].Element", "value", "dfc-generated"]
+      - ["repo:https://github.com/rust-lang/stdarch:core_arch", "<crate::core_arch::simd::u8x32>::from_array", "Argument[0]", "ReturnValue.Field[crate::core_arch::simd::u8x32(0)]", "value", "dfc-generated"]
+      - ["repo:https://github.com/rust-lang/stdarch:core_arch", "<crate::core_arch::simd::u8x32>::new", "Argument[0]", "ReturnValue.Field[crate::core_arch::simd::u8x32(0)].Element", "value", "dfc-generated"]
+      - ["repo:https://github.com/rust-lang/stdarch:core_arch", "<crate::core_arch::simd::u8x32>::new", "Argument[10]", "ReturnValue.Field[crate::core_arch::simd::u8x32(0)].Element", "value", "dfc-generated"]
+      - ["repo:https://github.com/rust-lang/stdarch:core_arch", "<crate::core_arch::simd::u8x32>::new", "Argument[11]", "ReturnValue.Field[crate::core_arch::simd::u8x32(0)].Element", "value", "dfc-generated"]
+      - ["repo:https://github.com/rust-lang/stdarch:core_arch", "<crate::core_arch::simd::u8x32>::new", "Argument[12]", "ReturnValue.Field[crate::core_arch::simd::u8x32(0)].Element", "value", "dfc-generated"]
+      - ["repo:https://github.com/rust-lang/stdarch:core_arch", "<crate::core_arch::simd::u8x32>::new", "Argument[13]", "ReturnValue.Field[crate::core_arch::simd::u8x32(0)].Element", "value", "dfc-generated"]
+      - ["repo:https://github.com/rust-lang/stdarch:core_arch", "<crate::core_arch::simd::u8x32>::new", "Argument[14]", "ReturnValue.Field[crate::core_arch::simd::u8x32(0)].Element", "value", "dfc-generated"]
+      - ["repo:https://github.com/rust-lang/stdarch:core_arch", "<crate::core_arch::simd::u8x32>::new", "Argument[15]", "ReturnValue.Field[crate::core_arch::simd::u8x32(0)].Element", "value", "dfc-generated"]
+      - ["repo:https://github.com/rust-lang/stdarch:core_arch", "<crate::core_arch::simd::u8x32>::new", "Argument[16]", "ReturnValue.Field[crate::core_arch::simd::u8x32(0)].Element", "value", "dfc-generated"]
+      - ["repo:https://github.com/rust-lang/stdarch:core_arch", "<crate::core_arch::simd::u8x32>::new", "Argument[17]", "ReturnValue.Field[crate::core_arch::simd::u8x32(0)].Element", "value", "dfc-generated"]
+      - ["repo:https://github.com/rust-lang/stdarch:core_arch", "<crate::core_arch::simd::u8x32>::new", "Argument[18]", "ReturnValue.Field[crate::core_arch::simd::u8x32(0)].Element", "value", "dfc-generated"]
+      - ["repo:https://github.com/rust-lang/stdarch:core_arch", "<crate::core_arch::simd::u8x32>::new", "Argument[19]", "ReturnValue.Field[crate::core_arch::simd::u8x32(0)].Element", "value", "dfc-generated"]
+      - ["repo:https://github.com/rust-lang/stdarch:core_arch", "<crate::core_arch::simd::u8x32>::new", "Argument[1]", "ReturnValue.Field[crate::core_arch::simd::u8x32(0)].Element", "value", "dfc-generated"]
+      - ["repo:https://github.com/rust-lang/stdarch:core_arch", "<crate::core_arch::simd::u8x32>::new", "Argument[20]", "ReturnValue.Field[crate::core_arch::simd::u8x32(0)].Element", "value", "dfc-generated"]
+      - ["repo:https://github.com/rust-lang/stdarch:core_arch", "<crate::core_arch::simd::u8x32>::new", "Argument[21]", "ReturnValue.Field[crate::core_arch::simd::u8x32(0)].Element", "value", "dfc-generated"]
+      - ["repo:https://github.com/rust-lang/stdarch:core_arch", "<crate::core_arch::simd::u8x32>::new", "Argument[22]", "ReturnValue.Field[crate::core_arch::simd::u8x32(0)].Element", "value", "dfc-generated"]
+      - ["repo:https://github.com/rust-lang/stdarch:core_arch", "<crate::core_arch::simd::u8x32>::new", "Argument[23]", "ReturnValue.Field[crate::core_arch::simd::u8x32(0)].Element", "value", "dfc-generated"]
+      - ["repo:https://github.com/rust-lang/stdarch:core_arch", "<crate::core_arch::simd::u8x32>::new", "Argument[24]", "ReturnValue.Field[crate::core_arch::simd::u8x32(0)].Element", "value", "dfc-generated"]
+      - ["repo:https://github.com/rust-lang/stdarch:core_arch", "<crate::core_arch::simd::u8x32>::new", "Argument[25]", "ReturnValue.Field[crate::core_arch::simd::u8x32(0)].Element", "value", "dfc-generated"]
+      - ["repo:https://github.com/rust-lang/stdarch:core_arch", "<crate::core_arch::simd::u8x32>::new", "Argument[26]", "ReturnValue.Field[crate::core_arch::simd::u8x32(0)].Element", "value", "dfc-generated"]
+      - ["repo:https://github.com/rust-lang/stdarch:core_arch", "<crate::core_arch::simd::u8x32>::new", "Argument[27]", "ReturnValue.Field[crate::core_arch::simd::u8x32(0)].Element", "value", "dfc-generated"]
+      - ["repo:https://github.com/rust-lang/stdarch:core_arch", "<crate::core_arch::simd::u8x32>::new", "Argument[28]", "ReturnValue.Field[crate::core_arch::simd::u8x32(0)].Element", "value", "dfc-generated"]
+      - ["repo:https://github.com/rust-lang/stdarch:core_arch", "<crate::core_arch::simd::u8x32>::new", "Argument[29]", "ReturnValue.Field[crate::core_arch::simd::u8x32(0)].Element", "value", "dfc-generated"]
+      - ["repo:https://github.com/rust-lang/stdarch:core_arch", "<crate::core_arch::simd::u8x32>::new", "Argument[2]", "ReturnValue.Field[crate::core_arch::simd::u8x32(0)].Element", "value", "dfc-generated"]
+      - ["repo:https://github.com/rust-lang/stdarch:core_arch", "<crate::core_arch::simd::u8x32>::new", "Argument[30]", "ReturnValue.Field[crate::core_arch::simd::u8x32(0)].Element", "value", "dfc-generated"]
+      - ["repo:https://github.com/rust-lang/stdarch:core_arch", "<crate::core_arch::simd::u8x32>::new", "Argument[31]", "ReturnValue.Field[crate::core_arch::simd::u8x32(0)].Element", "value", "dfc-generated"]
+      - ["repo:https://github.com/rust-lang/stdarch:core_arch", "<crate::core_arch::simd::u8x32>::new", "Argument[3]", "ReturnValue.Field[crate::core_arch::simd::u8x32(0)].Element", "value", "dfc-generated"]
+      - ["repo:https://github.com/rust-lang/stdarch:core_arch", "<crate::core_arch::simd::u8x32>::new", "Argument[4]", "ReturnValue.Field[crate::core_arch::simd::u8x32(0)].Element", "value", "dfc-generated"]
+      - ["repo:https://github.com/rust-lang/stdarch:core_arch", "<crate::core_arch::simd::u8x32>::new", "Argument[5]", "ReturnValue.Field[crate::core_arch::simd::u8x32(0)].Element", "value", "dfc-generated"]
+      - ["repo:https://github.com/rust-lang/stdarch:core_arch", "<crate::core_arch::simd::u8x32>::new", "Argument[6]", "ReturnValue.Field[crate::core_arch::simd::u8x32(0)].Element", "value", "dfc-generated"]
+      - ["repo:https://github.com/rust-lang/stdarch:core_arch", "<crate::core_arch::simd::u8x32>::new", "Argument[7]", "ReturnValue.Field[crate::core_arch::simd::u8x32(0)].Element", "value", "dfc-generated"]
+      - ["repo:https://github.com/rust-lang/stdarch:core_arch", "<crate::core_arch::simd::u8x32>::new", "Argument[8]", "ReturnValue.Field[crate::core_arch::simd::u8x32(0)].Element", "value", "dfc-generated"]
+      - ["repo:https://github.com/rust-lang/stdarch:core_arch", "<crate::core_arch::simd::u8x32>::new", "Argument[9]", "ReturnValue.Field[crate::core_arch::simd::u8x32(0)].Element", "value", "dfc-generated"]
+      - ["repo:https://github.com/rust-lang/stdarch:core_arch", "<crate::core_arch::simd::u8x4>::from_array", "Argument[0]", "ReturnValue.Field[crate::core_arch::simd::u8x4(0)]", "value", "dfc-generated"]
+      - ["repo:https://github.com/rust-lang/stdarch:core_arch", "<crate::core_arch::simd::u8x4>::new", "Argument[0]", "ReturnValue.Field[crate::core_arch::simd::u8x4(0)].Element", "value", "dfc-generated"]
+      - ["repo:https://github.com/rust-lang/stdarch:core_arch", "<crate::core_arch::simd::u8x4>::new", "Argument[1]", "ReturnValue.Field[crate::core_arch::simd::u8x4(0)].Element", "value", "dfc-generated"]
+      - ["repo:https://github.com/rust-lang/stdarch:core_arch", "<crate::core_arch::simd::u8x4>::new", "Argument[2]", "ReturnValue.Field[crate::core_arch::simd::u8x4(0)].Element", "value", "dfc-generated"]
+      - ["repo:https://github.com/rust-lang/stdarch:core_arch", "<crate::core_arch::simd::u8x4>::new", "Argument[3]", "ReturnValue.Field[crate::core_arch::simd::u8x4(0)].Element", "value", "dfc-generated"]
+      - ["repo:https://github.com/rust-lang/stdarch:core_arch", "<crate::core_arch::simd::u8x64>::from_array", "Argument[0]", "ReturnValue.Field[crate::core_arch::simd::u8x64(0)]", "value", "dfc-generated"]
+      - ["repo:https://github.com/rust-lang/stdarch:core_arch", "<crate::core_arch::simd::u8x64>::new", "Argument[0]", "ReturnValue.Field[crate::core_arch::simd::u8x64(0)].Element", "value", "dfc-generated"]
+      - ["repo:https://github.com/rust-lang/stdarch:core_arch", "<crate::core_arch::simd::u8x64>::new", "Argument[10]", "ReturnValue.Field[crate::core_arch::simd::u8x64(0)].Element", "value", "dfc-generated"]
+      - ["repo:https://github.com/rust-lang/stdarch:core_arch", "<crate::core_arch::simd::u8x64>::new", "Argument[11]", "ReturnValue.Field[crate::core_arch::simd::u8x64(0)].Element", "value", "dfc-generated"]
+      - ["repo:https://github.com/rust-lang/stdarch:core_arch", "<crate::core_arch::simd::u8x64>::new", "Argument[12]", "ReturnValue.Field[crate::core_arch::simd::u8x64(0)].Element", "value", "dfc-generated"]
+      - ["repo:https://github.com/rust-lang/stdarch:core_arch", "<crate::core_arch::simd::u8x64>::new", "Argument[13]", "ReturnValue.Field[crate::core_arch::simd::u8x64(0)].Element", "value", "dfc-generated"]
+      - ["repo:https://github.com/rust-lang/stdarch:core_arch", "<crate::core_arch::simd::u8x64>::new", "Argument[14]", "ReturnValue.Field[crate::core_arch::simd::u8x64(0)].Element", "value", "dfc-generated"]
+      - ["repo:https://github.com/rust-lang/stdarch:core_arch", "<crate::core_arch::simd::u8x64>::new", "Argument[15]", "ReturnValue.Field[crate::core_arch::simd::u8x64(0)].Element", "value", "dfc-generated"]
+      - ["repo:https://github.com/rust-lang/stdarch:core_arch", "<crate::core_arch::simd::u8x64>::new", "Argument[16]", "ReturnValue.Field[crate::core_arch::simd::u8x64(0)].Element", "value", "dfc-generated"]
+      - ["repo:https://github.com/rust-lang/stdarch:core_arch", "<crate::core_arch::simd::u8x64>::new", "Argument[17]", "ReturnValue.Field[crate::core_arch::simd::u8x64(0)].Element", "value", "dfc-generated"]
+      - ["repo:https://github.com/rust-lang/stdarch:core_arch", "<crate::core_arch::simd::u8x64>::new", "Argument[18]", "ReturnValue.Field[crate::core_arch::simd::u8x64(0)].Element", "value", "dfc-generated"]
+      - ["repo:https://github.com/rust-lang/stdarch:core_arch", "<crate::core_arch::simd::u8x64>::new", "Argument[19]", "ReturnValue.Field[crate::core_arch::simd::u8x64(0)].Element", "value", "dfc-generated"]
+      - ["repo:https://github.com/rust-lang/stdarch:core_arch", "<crate::core_arch::simd::u8x64>::new", "Argument[1]", "ReturnValue.Field[crate::core_arch::simd::u8x64(0)].Element", "value", "dfc-generated"]
+      - ["repo:https://github.com/rust-lang/stdarch:core_arch", "<crate::core_arch::simd::u8x64>::new", "Argument[20]", "ReturnValue.Field[crate::core_arch::simd::u8x64(0)].Element", "value", "dfc-generated"]
+      - ["repo:https://github.com/rust-lang/stdarch:core_arch", "<crate::core_arch::simd::u8x64>::new", "Argument[21]", "ReturnValue.Field[crate::core_arch::simd::u8x64(0)].Element", "value", "dfc-generated"]
+      - ["repo:https://github.com/rust-lang/stdarch:core_arch", "<crate::core_arch::simd::u8x64>::new", "Argument[22]", "ReturnValue.Field[crate::core_arch::simd::u8x64(0)].Element", "value", "dfc-generated"]
+      - ["repo:https://github.com/rust-lang/stdarch:core_arch", "<crate::core_arch::simd::u8x64>::new", "Argument[23]", "ReturnValue.Field[crate::core_arch::simd::u8x64(0)].Element", "value", "dfc-generated"]
+      - ["repo:https://github.com/rust-lang/stdarch:core_arch", "<crate::core_arch::simd::u8x64>::new", "Argument[24]", "ReturnValue.Field[crate::core_arch::simd::u8x64(0)].Element", "value", "dfc-generated"]
+      - ["repo:https://github.com/rust-lang/stdarch:core_arch", "<crate::core_arch::simd::u8x64>::new", "Argument[25]", "ReturnValue.Field[crate::core_arch::simd::u8x64(0)].Element", "value", "dfc-generated"]
+      - ["repo:https://github.com/rust-lang/stdarch:core_arch", "<crate::core_arch::simd::u8x64>::new", "Argument[26]", "ReturnValue.Field[crate::core_arch::simd::u8x64(0)].Element", "value", "dfc-generated"]
+      - ["repo:https://github.com/rust-lang/stdarch:core_arch", "<crate::core_arch::simd::u8x64>::new", "Argument[27]", "ReturnValue.Field[crate::core_arch::simd::u8x64(0)].Element", "value", "dfc-generated"]
+      - ["repo:https://github.com/rust-lang/stdarch:core_arch", "<crate::core_arch::simd::u8x64>::new", "Argument[28]", "ReturnValue.Field[crate::core_arch::simd::u8x64(0)].Element", "value", "dfc-generated"]
+      - ["repo:https://github.com/rust-lang/stdarch:core_arch", "<crate::core_arch::simd::u8x64>::new", "Argument[29]", "ReturnValue.Field[crate::core_arch::simd::u8x64(0)].Element", "value", "dfc-generated"]
+      - ["repo:https://github.com/rust-lang/stdarch:core_arch", "<crate::core_arch::simd::u8x64>::new", "Argument[2]", "ReturnValue.Field[crate::core_arch::simd::u8x64(0)].Element", "value", "dfc-generated"]
+      - ["repo:https://github.com/rust-lang/stdarch:core_arch", "<crate::core_arch::simd::u8x64>::new", "Argument[30]", "ReturnValue.Field[crate::core_arch::simd::u8x64(0)].Element", "value", "dfc-generated"]
+      - ["repo:https://github.com/rust-lang/stdarch:core_arch", "<crate::core_arch::simd::u8x64>::new", "Argument[31]", "ReturnValue.Field[crate::core_arch::simd::u8x64(0)].Element", "value", "dfc-generated"]
+      - ["repo:https://github.com/rust-lang/stdarch:core_arch", "<crate::core_arch::simd::u8x64>::new", "Argument[32]", "ReturnValue.Field[crate::core_arch::simd::u8x64(0)].Element", "value", "dfc-generated"]
+      - ["repo:https://github.com/rust-lang/stdarch:core_arch", "<crate::core_arch::simd::u8x64>::new", "Argument[33]", "ReturnValue.Field[crate::core_arch::simd::u8x64(0)].Element", "value", "dfc-generated"]
+      - ["repo:https://github.com/rust-lang/stdarch:core_arch", "<crate::core_arch::simd::u8x64>::new", "Argument[34]", "ReturnValue.Field[crate::core_arch::simd::u8x64(0)].Element", "value", "dfc-generated"]
+      - ["repo:https://github.com/rust-lang/stdarch:core_arch", "<crate::core_arch::simd::u8x64>::new", "Argument[35]", "ReturnValue.Field[crate::core_arch::simd::u8x64(0)].Element", "value", "dfc-generated"]
+      - ["repo:https://github.com/rust-lang/stdarch:core_arch", "<crate::core_arch::simd::u8x64>::new", "Argument[36]", "ReturnValue.Field[crate::core_arch::simd::u8x64(0)].Element", "value", "dfc-generated"]
+      - ["repo:https://github.com/rust-lang/stdarch:core_arch", "<crate::core_arch::simd::u8x64>::new", "Argument[37]", "ReturnValue.Field[crate::core_arch::simd::u8x64(0)].Element", "value", "dfc-generated"]
+      - ["repo:https://github.com/rust-lang/stdarch:core_arch", "<crate::core_arch::simd::u8x64>::new", "Argument[38]", "ReturnValue.Field[crate::core_arch::simd::u8x64(0)].Element", "value", "dfc-generated"]
+      - ["repo:https://github.com/rust-lang/stdarch:core_arch", "<crate::core_arch::simd::u8x64>::new", "Argument[39]", "ReturnValue.Field[crate::core_arch::simd::u8x64(0)].Element", "value", "dfc-generated"]
+      - ["repo:https://github.com/rust-lang/stdarch:core_arch", "<crate::core_arch::simd::u8x64>::new", "Argument[3]", "ReturnValue.Field[crate::core_arch::simd::u8x64(0)].Element", "value", "dfc-generated"]
+      - ["repo:https://github.com/rust-lang/stdarch:core_arch", "<crate::core_arch::simd::u8x64>::new", "Argument[40]", "ReturnValue.Field[crate::core_arch::simd::u8x64(0)].Element", "value", "dfc-generated"]
+      - ["repo:https://github.com/rust-lang/stdarch:core_arch", "<crate::core_arch::simd::u8x64>::new", "Argument[41]", "ReturnValue.Field[crate::core_arch::simd::u8x64(0)].Element", "value", "dfc-generated"]
+      - ["repo:https://github.com/rust-lang/stdarch:core_arch", "<crate::core_arch::simd::u8x64>::new", "Argument[42]", "ReturnValue.Field[crate::core_arch::simd::u8x64(0)].Element", "value", "dfc-generated"]
+      - ["repo:https://github.com/rust-lang/stdarch:core_arch", "<crate::core_arch::simd::u8x64>::new", "Argument[43]", "ReturnValue.Field[crate::core_arch::simd::u8x64(0)].Element", "value", "dfc-generated"]
+      - ["repo:https://github.com/rust-lang/stdarch:core_arch", "<crate::core_arch::simd::u8x64>::new", "Argument[44]", "ReturnValue.Field[crate::core_arch::simd::u8x64(0)].Element", "value", "dfc-generated"]
+      - ["repo:https://github.com/rust-lang/stdarch:core_arch", "<crate::core_arch::simd::u8x64>::new", "Argument[45]", "ReturnValue.Field[crate::core_arch::simd::u8x64(0)].Element", "value", "dfc-generated"]
+      - ["repo:https://github.com/rust-lang/stdarch:core_arch", "<crate::core_arch::simd::u8x64>::new", "Argument[46]", "ReturnValue.Field[crate::core_arch::simd::u8x64(0)].Element", "value", "dfc-generated"]
+      - ["repo:https://github.com/rust-lang/stdarch:core_arch", "<crate::core_arch::simd::u8x64>::new", "Argument[47]", "ReturnValue.Field[crate::core_arch::simd::u8x64(0)].Element", "value", "dfc-generated"]
+      - ["repo:https://github.com/rust-lang/stdarch:core_arch", "<crate::core_arch::simd::u8x64>::new", "Argument[48]", "ReturnValue.Field[crate::core_arch::simd::u8x64(0)].Element", "value", "dfc-generated"]
+      - ["repo:https://github.com/rust-lang/stdarch:core_arch", "<crate::core_arch::simd::u8x64>::new", "Argument[49]", "ReturnValue.Field[crate::core_arch::simd::u8x64(0)].Element", "value", "dfc-generated"]
+      - ["repo:https://github.com/rust-lang/stdarch:core_arch", "<crate::core_arch::simd::u8x64>::new", "Argument[4]", "ReturnValue.Field[crate::core_arch::simd::u8x64(0)].Element", "value", "dfc-generated"]
+      - ["repo:https://github.com/rust-lang/stdarch:core_arch", "<crate::core_arch::simd::u8x64>::new", "Argument[50]", "ReturnValue.Field[crate::core_arch::simd::u8x64(0)].Element", "value", "dfc-generated"]
+      - ["repo:https://github.com/rust-lang/stdarch:core_arch", "<crate::core_arch::simd::u8x64>::new", "Argument[51]", "ReturnValue.Field[crate::core_arch::simd::u8x64(0)].Element", "value", "dfc-generated"]
+      - ["repo:https://github.com/rust-lang/stdarch:core_arch", "<crate::core_arch::simd::u8x64>::new", "Argument[52]", "ReturnValue.Field[crate::core_arch::simd::u8x64(0)].Element", "value", "dfc-generated"]
+      - ["repo:https://github.com/rust-lang/stdarch:core_arch", "<crate::core_arch::simd::u8x64>::new", "Argument[53]", "ReturnValue.Field[crate::core_arch::simd::u8x64(0)].Element", "value", "dfc-generated"]
+      - ["repo:https://github.com/rust-lang/stdarch:core_arch", "<crate::core_arch::simd::u8x64>::new", "Argument[54]", "ReturnValue.Field[crate::core_arch::simd::u8x64(0)].Element", "value", "dfc-generated"]
+      - ["repo:https://github.com/rust-lang/stdarch:core_arch", "<crate::core_arch::simd::u8x64>::new", "Argument[55]", "ReturnValue.Field[crate::core_arch::simd::u8x64(0)].Element", "value", "dfc-generated"]
+      - ["repo:https://github.com/rust-lang/stdarch:core_arch", "<crate::core_arch::simd::u8x64>::new", "Argument[56]", "ReturnValue.Field[crate::core_arch::simd::u8x64(0)].Element", "value", "dfc-generated"]
+      - ["repo:https://github.com/rust-lang/stdarch:core_arch", "<crate::core_arch::simd::u8x64>::new", "Argument[57]", "ReturnValue.Field[crate::core_arch::simd::u8x64(0)].Element", "value", "dfc-generated"]
+      - ["repo:https://github.com/rust-lang/stdarch:core_arch", "<crate::core_arch::simd::u8x64>::new", "Argument[58]", "ReturnValue.Field[crate::core_arch::simd::u8x64(0)].Element", "value", "dfc-generated"]
+      - ["repo:https://github.com/rust-lang/stdarch:core_arch", "<crate::core_arch::simd::u8x64>::new", "Argument[59]", "ReturnValue.Field[crate::core_arch::simd::u8x64(0)].Element", "value", "dfc-generated"]
+      - ["repo:https://github.com/rust-lang/stdarch:core_arch", "<crate::core_arch::simd::u8x64>::new", "Argument[5]", "ReturnValue.Field[crate::core_arch::simd::u8x64(0)].Element", "value", "dfc-generated"]
+      - ["repo:https://github.com/rust-lang/stdarch:core_arch", "<crate::core_arch::simd::u8x64>::new", "Argument[60]", "ReturnValue.Field[crate::core_arch::simd::u8x64(0)].Element", "value", "dfc-generated"]
+      - ["repo:https://github.com/rust-lang/stdarch:core_arch", "<crate::core_arch::simd::u8x64>::new", "Argument[61]", "ReturnValue.Field[crate::core_arch::simd::u8x64(0)].Element", "value", "dfc-generated"]
+      - ["repo:https://github.com/rust-lang/stdarch:core_arch", "<crate::core_arch::simd::u8x64>::new", "Argument[62]", "ReturnValue.Field[crate::core_arch::simd::u8x64(0)].Element", "value", "dfc-generated"]
+      - ["repo:https://github.com/rust-lang/stdarch:core_arch", "<crate::core_arch::simd::u8x64>::new", "Argument[63]", "ReturnValue.Field[crate::core_arch::simd::u8x64(0)].Element", "value", "dfc-generated"]
+      - ["repo:https://github.com/rust-lang/stdarch:core_arch", "<crate::core_arch::simd::u8x64>::new", "Argument[6]", "ReturnValue.Field[crate::core_arch::simd::u8x64(0)].Element", "value", "dfc-generated"]
+      - ["repo:https://github.com/rust-lang/stdarch:core_arch", "<crate::core_arch::simd::u8x64>::new", "Argument[7]", "ReturnValue.Field[crate::core_arch::simd::u8x64(0)].Element", "value", "dfc-generated"]
+      - ["repo:https://github.com/rust-lang/stdarch:core_arch", "<crate::core_arch::simd::u8x64>::new", "Argument[8]", "ReturnValue.Field[crate::core_arch::simd::u8x64(0)].Element", "value", "dfc-generated"]
+      - ["repo:https://github.com/rust-lang/stdarch:core_arch", "<crate::core_arch::simd::u8x64>::new", "Argument[9]", "ReturnValue.Field[crate::core_arch::simd::u8x64(0)].Element", "value", "dfc-generated"]
+      - ["repo:https://github.com/rust-lang/stdarch:core_arch", "<crate::core_arch::simd::u8x8>::from_array", "Argument[0]", "ReturnValue.Field[crate::core_arch::simd::u8x8(0)]", "value", "dfc-generated"]
+      - ["repo:https://github.com/rust-lang/stdarch:core_arch", "<crate::core_arch::simd::u8x8>::new", "Argument[0]", "ReturnValue.Field[crate::core_arch::simd::u8x8(0)].Element", "value", "dfc-generated"]
+      - ["repo:https://github.com/rust-lang/stdarch:core_arch", "<crate::core_arch::simd::u8x8>::new", "Argument[1]", "ReturnValue.Field[crate::core_arch::simd::u8x8(0)].Element", "value", "dfc-generated"]
+      - ["repo:https://github.com/rust-lang/stdarch:core_arch", "<crate::core_arch::simd::u8x8>::new", "Argument[2]", "ReturnValue.Field[crate::core_arch::simd::u8x8(0)].Element", "value", "dfc-generated"]
+      - ["repo:https://github.com/rust-lang/stdarch:core_arch", "<crate::core_arch::simd::u8x8>::new", "Argument[3]", "ReturnValue.Field[crate::core_arch::simd::u8x8(0)].Element", "value", "dfc-generated"]
+      - ["repo:https://github.com/rust-lang/stdarch:core_arch", "<crate::core_arch::simd::u8x8>::new", "Argument[4]", "ReturnValue.Field[crate::core_arch::simd::u8x8(0)].Element", "value", "dfc-generated"]
+      - ["repo:https://github.com/rust-lang/stdarch:core_arch", "<crate::core_arch::simd::u8x8>::new", "Argument[5]", "ReturnValue.Field[crate::core_arch::simd::u8x8(0)].Element", "value", "dfc-generated"]
+      - ["repo:https://github.com/rust-lang/stdarch:core_arch", "<crate::core_arch::simd::u8x8>::new", "Argument[6]", "ReturnValue.Field[crate::core_arch::simd::u8x8(0)].Element", "value", "dfc-generated"]
+      - ["repo:https://github.com/rust-lang/stdarch:core_arch", "<crate::core_arch::simd::u8x8>::new", "Argument[7]", "ReturnValue.Field[crate::core_arch::simd::u8x8(0)].Element", "value", "dfc-generated"]
+      - ["repo:https://github.com/rust-lang/stdarch:core_arch", "<crate::core_arch::x86::bf16>::from_bits", "Argument[0]", "ReturnValue.Field[crate::core_arch::x86::bf16(0)]", "value", "dfc-generated"]
+      - ["repo:https://github.com/rust-lang/stdarch:core_arch", "<crate::core_arch::x86::bf16>::to_bits", "Argument[self].Field[0]", "ReturnValue", "value", "dfc-generated"]
+      - ["repo:https://github.com/rust-lang/stdarch:core_arch", "<crate::core_arch::x86::bf16>::to_bits", "Argument[self].Field[crate::core_arch::x86::bf16(0)]", "ReturnValue", "value", "dfc-generated"]
+      - ["repo:https://github.com/rust-lang/stdarch:core_arch", "crate::core_arch::x86::avx512bf16::_mm_mask_cvtneps_pbh", "Argument[0]", "ReturnValue", "value", "dfc-generated"]
+      - ["repo:https://github.com/rust-lang/stdarch:core_arch", "crate::core_arch::x86::avx512bw::_cvtmask32_u32", "Argument[0]", "ReturnValue", "value", "dfc-generated"]
+      - ["repo:https://github.com/rust-lang/stdarch:core_arch", "crate::core_arch::x86::avx512bw::_cvtu32_mask32", "Argument[0]", "ReturnValue", "value", "dfc-generated"]
+      - ["repo:https://github.com/rust-lang/stdarch:core_arch", "crate::core_arch::x86::avx512bw::_kadd_mask32", "Argument[0]", "ReturnValue", "taint", "df-generated"]
+      - ["repo:https://github.com/rust-lang/stdarch:core_arch", "crate::core_arch::x86::avx512bw::_kadd_mask32", "Argument[1]", "ReturnValue", "taint", "df-generated"]
+      - ["repo:https://github.com/rust-lang/stdarch:core_arch", "crate::core_arch::x86::avx512bw::_kadd_mask64", "Argument[0]", "ReturnValue", "taint", "df-generated"]
+      - ["repo:https://github.com/rust-lang/stdarch:core_arch", "crate::core_arch::x86::avx512bw::_kadd_mask64", "Argument[1]", "ReturnValue", "taint", "df-generated"]
+      - ["repo:https://github.com/rust-lang/stdarch:core_arch", "crate::core_arch::x86::avx512bw::_kand_mask32", "Argument[0]", "ReturnValue", "taint", "df-generated"]
+      - ["repo:https://github.com/rust-lang/stdarch:core_arch", "crate::core_arch::x86::avx512bw::_kand_mask32", "Argument[1]", "ReturnValue", "taint", "df-generated"]
+      - ["repo:https://github.com/rust-lang/stdarch:core_arch", "crate::core_arch::x86::avx512bw::_kand_mask64", "Argument[0]", "ReturnValue", "taint", "df-generated"]
+      - ["repo:https://github.com/rust-lang/stdarch:core_arch", "crate::core_arch::x86::avx512bw::_kand_mask64", "Argument[1]", "ReturnValue", "taint", "df-generated"]
+      - ["repo:https://github.com/rust-lang/stdarch:core_arch", "crate::core_arch::x86::avx512bw::_kandn_mask32", "Argument[0]", "ReturnValue", "taint", "df-generated"]
+      - ["repo:https://github.com/rust-lang/stdarch:core_arch", "crate::core_arch::x86::avx512bw::_kandn_mask32", "Argument[1]", "ReturnValue", "taint", "df-generated"]
+      - ["repo:https://github.com/rust-lang/stdarch:core_arch", "crate::core_arch::x86::avx512bw::_kandn_mask64", "Argument[0]", "ReturnValue", "taint", "df-generated"]
+      - ["repo:https://github.com/rust-lang/stdarch:core_arch", "crate::core_arch::x86::avx512bw::_kandn_mask64", "Argument[1]", "ReturnValue", "taint", "df-generated"]
+      - ["repo:https://github.com/rust-lang/stdarch:core_arch", "crate::core_arch::x86::avx512bw::_knot_mask32", "Argument[0]", "ReturnValue", "taint", "df-generated"]
+      - ["repo:https://github.com/rust-lang/stdarch:core_arch", "crate::core_arch::x86::avx512bw::_knot_mask64", "Argument[0]", "ReturnValue", "taint", "df-generated"]
+      - ["repo:https://github.com/rust-lang/stdarch:core_arch", "crate::core_arch::x86::avx512bw::_kor_mask32", "Argument[0]", "ReturnValue", "taint", "df-generated"]
+      - ["repo:https://github.com/rust-lang/stdarch:core_arch", "crate::core_arch::x86::avx512bw::_kor_mask32", "Argument[1]", "ReturnValue", "taint", "df-generated"]
+      - ["repo:https://github.com/rust-lang/stdarch:core_arch", "crate::core_arch::x86::avx512bw::_kor_mask64", "Argument[0]", "ReturnValue", "taint", "df-generated"]
+      - ["repo:https://github.com/rust-lang/stdarch:core_arch", "crate::core_arch::x86::avx512bw::_kor_mask64", "Argument[1]", "ReturnValue", "taint", "df-generated"]
+      - ["repo:https://github.com/rust-lang/stdarch:core_arch", "crate::core_arch::x86::avx512bw::_kshiftli_mask32", "Argument[0]", "ReturnValue", "taint", "df-generated"]
+      - ["repo:https://github.com/rust-lang/stdarch:core_arch", "crate::core_arch::x86::avx512bw::_kshiftli_mask64", "Argument[0]", "ReturnValue", "taint", "df-generated"]
+      - ["repo:https://github.com/rust-lang/stdarch:core_arch", "crate::core_arch::x86::avx512bw::_kshiftri_mask32", "Argument[0]", "ReturnValue", "taint", "df-generated"]
+      - ["repo:https://github.com/rust-lang/stdarch:core_arch", "crate::core_arch::x86::avx512bw::_kshiftri_mask64", "Argument[0]", "ReturnValue", "taint", "df-generated"]
+      - ["repo:https://github.com/rust-lang/stdarch:core_arch", "crate::core_arch::x86::avx512bw::_kxnor_mask32", "Argument[0]", "ReturnValue", "taint", "df-generated"]
+      - ["repo:https://github.com/rust-lang/stdarch:core_arch", "crate::core_arch::x86::avx512bw::_kxnor_mask32", "Argument[1]", "ReturnValue", "taint", "df-generated"]
+      - ["repo:https://github.com/rust-lang/stdarch:core_arch", "crate::core_arch::x86::avx512bw::_kxnor_mask64", "Argument[0]", "ReturnValue", "taint", "df-generated"]
+      - ["repo:https://github.com/rust-lang/stdarch:core_arch", "crate::core_arch::x86::avx512bw::_kxnor_mask64", "Argument[1]", "ReturnValue", "taint", "df-generated"]
+      - ["repo:https://github.com/rust-lang/stdarch:core_arch", "crate::core_arch::x86::avx512bw::_kxor_mask32", "Argument[0]", "ReturnValue", "taint", "df-generated"]
+      - ["repo:https://github.com/rust-lang/stdarch:core_arch", "crate::core_arch::x86::avx512bw::_kxor_mask32", "Argument[1]", "ReturnValue", "taint", "df-generated"]
+      - ["repo:https://github.com/rust-lang/stdarch:core_arch", "crate::core_arch::x86::avx512bw::_kxor_mask64", "Argument[0]", "ReturnValue", "taint", "df-generated"]
+      - ["repo:https://github.com/rust-lang/stdarch:core_arch", "crate::core_arch::x86::avx512bw::_kxor_mask64", "Argument[1]", "ReturnValue", "taint", "df-generated"]
+      - ["repo:https://github.com/rust-lang/stdarch:core_arch", "crate::core_arch::x86::avx512bw::_load_mask32", "Argument[0]", "ReturnValue", "taint", "df-generated"]
+      - ["repo:https://github.com/rust-lang/stdarch:core_arch", "crate::core_arch::x86::avx512bw::_load_mask64", "Argument[0]", "ReturnValue", "taint", "df-generated"]
+      - ["repo:https://github.com/rust-lang/stdarch:core_arch", "crate::core_arch::x86::avx512bw::_mm256_loadu_epi16", "Argument[0]", "ReturnValue", "taint", "df-generated"]
+      - ["repo:https://github.com/rust-lang/stdarch:core_arch", "crate::core_arch::x86::avx512bw::_mm256_loadu_epi8", "Argument[0]", "ReturnValue", "taint", "df-generated"]
+      - ["repo:https://github.com/rust-lang/stdarch:core_arch", "crate::core_arch::x86::avx512bw::_mm256_storeu_epi16", "Argument[1]", "Argument[0]", "taint", "df-generated"]
+      - ["repo:https://github.com/rust-lang/stdarch:core_arch", "crate::core_arch::x86::avx512bw::_mm256_storeu_epi8", "Argument[1]", "Argument[0]", "taint", "df-generated"]
+      - ["repo:https://github.com/rust-lang/stdarch:core_arch", "crate::core_arch::x86::avx512bw::_mm512_kunpackd", "Argument[0]", "ReturnValue", "taint", "df-generated"]
+      - ["repo:https://github.com/rust-lang/stdarch:core_arch", "crate::core_arch::x86::avx512bw::_mm512_kunpackd", "Argument[1]", "ReturnValue", "taint", "df-generated"]
+      - ["repo:https://github.com/rust-lang/stdarch:core_arch", "crate::core_arch::x86::avx512bw::_mm512_kunpackw", "Argument[0]", "ReturnValue", "taint", "df-generated"]
+      - ["repo:https://github.com/rust-lang/stdarch:core_arch", "crate::core_arch::x86::avx512bw::_mm512_kunpackw", "Argument[1]", "ReturnValue", "taint", "df-generated"]
+      - ["repo:https://github.com/rust-lang/stdarch:core_arch", "crate::core_arch::x86::avx512bw::_mm512_loadu_epi16", "Argument[0]", "ReturnValue", "taint", "df-generated"]
+      - ["repo:https://github.com/rust-lang/stdarch:core_arch", "crate::core_arch::x86::avx512bw::_mm512_loadu_epi8", "Argument[0]", "ReturnValue", "taint", "df-generated"]
+      - ["repo:https://github.com/rust-lang/stdarch:core_arch", "crate::core_arch::x86::avx512bw::_mm512_storeu_epi16", "Argument[1]", "Argument[0]", "taint", "df-generated"]
+      - ["repo:https://github.com/rust-lang/stdarch:core_arch", "crate::core_arch::x86::avx512bw::_mm512_storeu_epi8", "Argument[1]", "Argument[0]", "taint", "df-generated"]
+      - ["repo:https://github.com/rust-lang/stdarch:core_arch", "crate::core_arch::x86::avx512bw::_mm_loadu_epi16", "Argument[0]", "ReturnValue", "taint", "df-generated"]
+      - ["repo:https://github.com/rust-lang/stdarch:core_arch", "crate::core_arch::x86::avx512bw::_mm_loadu_epi8", "Argument[0]", "ReturnValue", "taint", "df-generated"]
+      - ["repo:https://github.com/rust-lang/stdarch:core_arch", "crate::core_arch::x86::avx512bw::_mm_storeu_epi16", "Argument[1]", "Argument[0]", "taint", "df-generated"]
+      - ["repo:https://github.com/rust-lang/stdarch:core_arch", "crate::core_arch::x86::avx512bw::_mm_storeu_epi8", "Argument[1]", "Argument[0]", "taint", "df-generated"]
+      - ["repo:https://github.com/rust-lang/stdarch:core_arch", "crate::core_arch::x86::avx512bw::_store_mask32", "Argument[1]", "Argument[0]", "taint", "df-generated"]
+      - ["repo:https://github.com/rust-lang/stdarch:core_arch", "crate::core_arch::x86::avx512bw::_store_mask64", "Argument[1]", "Argument[0]", "taint", "df-generated"]
+      - ["repo:https://github.com/rust-lang/stdarch:core_arch", "crate::core_arch::x86::avx512dq::_cvtmask8_u32", "Argument[0]", "ReturnValue", "taint", "df-generated"]
+      - ["repo:https://github.com/rust-lang/stdarch:core_arch", "crate::core_arch::x86::avx512dq::_cvtu32_mask8", "Argument[0]", "ReturnValue", "taint", "df-generated"]
+      - ["repo:https://github.com/rust-lang/stdarch:core_arch", "crate::core_arch::x86::avx512dq::_kadd_mask16", "Argument[0]", "ReturnValue", "taint", "df-generated"]
+      - ["repo:https://github.com/rust-lang/stdarch:core_arch", "crate::core_arch::x86::avx512dq::_kadd_mask16", "Argument[1]", "ReturnValue", "taint", "df-generated"]
+      - ["repo:https://github.com/rust-lang/stdarch:core_arch", "crate::core_arch::x86::avx512dq::_kadd_mask8", "Argument[0]", "ReturnValue", "taint", "df-generated"]
+      - ["repo:https://github.com/rust-lang/stdarch:core_arch", "crate::core_arch::x86::avx512dq::_kadd_mask8", "Argument[1]", "ReturnValue", "taint", "df-generated"]
+      - ["repo:https://github.com/rust-lang/stdarch:core_arch", "crate::core_arch::x86::avx512dq::_kand_mask8", "Argument[0]", "ReturnValue", "taint", "df-generated"]
+      - ["repo:https://github.com/rust-lang/stdarch:core_arch", "crate::core_arch::x86::avx512dq::_kand_mask8", "Argument[1]", "ReturnValue", "taint", "df-generated"]
+      - ["repo:https://github.com/rust-lang/stdarch:core_arch", "crate::core_arch::x86::avx512dq::_kandn_mask8", "Argument[0]", "ReturnValue", "taint", "df-generated"]
+      - ["repo:https://github.com/rust-lang/stdarch:core_arch", "crate::core_arch::x86::avx512dq::_kandn_mask8", "Argument[1]", "ReturnValue", "taint", "df-generated"]
+      - ["repo:https://github.com/rust-lang/stdarch:core_arch", "crate::core_arch::x86::avx512dq::_knot_mask8", "Argument[0]", "ReturnValue", "taint", "df-generated"]
+      - ["repo:https://github.com/rust-lang/stdarch:core_arch", "crate::core_arch::x86::avx512dq::_kor_mask8", "Argument[0]", "ReturnValue", "taint", "df-generated"]
+      - ["repo:https://github.com/rust-lang/stdarch:core_arch", "crate::core_arch::x86::avx512dq::_kor_mask8", "Argument[1]", "ReturnValue", "taint", "df-generated"]
+      - ["repo:https://github.com/rust-lang/stdarch:core_arch", "crate::core_arch::x86::avx512dq::_kshiftli_mask8", "Argument[0]", "ReturnValue", "taint", "df-generated"]
+      - ["repo:https://github.com/rust-lang/stdarch:core_arch", "crate::core_arch::x86::avx512dq::_kshiftri_mask8", "Argument[0]", "ReturnValue", "taint", "df-generated"]
+      - ["repo:https://github.com/rust-lang/stdarch:core_arch", "crate::core_arch::x86::avx512dq::_kxnor_mask8", "Argument[0]", "ReturnValue", "taint", "df-generated"]
+      - ["repo:https://github.com/rust-lang/stdarch:core_arch", "crate::core_arch::x86::avx512dq::_kxnor_mask8", "Argument[1]", "ReturnValue", "taint", "df-generated"]
+      - ["repo:https://github.com/rust-lang/stdarch:core_arch", "crate::core_arch::x86::avx512dq::_kxor_mask8", "Argument[0]", "ReturnValue", "taint", "df-generated"]
+      - ["repo:https://github.com/rust-lang/stdarch:core_arch", "crate::core_arch::x86::avx512dq::_kxor_mask8", "Argument[1]", "ReturnValue", "taint", "df-generated"]
+      - ["repo:https://github.com/rust-lang/stdarch:core_arch", "crate::core_arch::x86::avx512dq::_load_mask8", "Argument[0].Reference", "ReturnValue", "value", "dfc-generated"]
+      - ["repo:https://github.com/rust-lang/stdarch:core_arch", "crate::core_arch::x86::avx512dq::_store_mask8", "Argument[1]", "Argument[0].Reference", "value", "dfc-generated"]
+      - ["repo:https://github.com/rust-lang/stdarch:core_arch", "crate::core_arch::x86::avx512f::_cvtmask16_u32", "Argument[0]", "ReturnValue", "taint", "df-generated"]
+      - ["repo:https://github.com/rust-lang/stdarch:core_arch", "crate::core_arch::x86::avx512f::_cvtu32_mask16", "Argument[0]", "ReturnValue", "taint", "df-generated"]
+      - ["repo:https://github.com/rust-lang/stdarch:core_arch", "crate::core_arch::x86::avx512f::_kand_mask16", "Argument[0]", "ReturnValue", "taint", "df-generated"]
+      - ["repo:https://github.com/rust-lang/stdarch:core_arch", "crate::core_arch::x86::avx512f::_kand_mask16", "Argument[1]", "ReturnValue", "taint", "df-generated"]
+      - ["repo:https://github.com/rust-lang/stdarch:core_arch", "crate::core_arch::x86::avx512f::_kandn_mask16", "Argument[0]", "ReturnValue", "taint", "df-generated"]
+      - ["repo:https://github.com/rust-lang/stdarch:core_arch", "crate::core_arch::x86::avx512f::_kandn_mask16", "Argument[1]", "ReturnValue", "taint", "df-generated"]
+      - ["repo:https://github.com/rust-lang/stdarch:core_arch", "crate::core_arch::x86::avx512f::_knot_mask16", "Argument[0]", "ReturnValue", "taint", "df-generated"]
+      - ["repo:https://github.com/rust-lang/stdarch:core_arch", "crate::core_arch::x86::avx512f::_kor_mask16", "Argument[0]", "ReturnValue", "taint", "df-generated"]
+      - ["repo:https://github.com/rust-lang/stdarch:core_arch", "crate::core_arch::x86::avx512f::_kor_mask16", "Argument[1]", "ReturnValue", "taint", "df-generated"]
+      - ["repo:https://github.com/rust-lang/stdarch:core_arch", "crate::core_arch::x86::avx512f::_kshiftli_mask16", "Argument[0]", "ReturnValue", "taint", "df-generated"]
+      - ["repo:https://github.com/rust-lang/stdarch:core_arch", "crate::core_arch::x86::avx512f::_kshiftri_mask16", "Argument[0]", "ReturnValue", "taint", "df-generated"]
+      - ["repo:https://github.com/rust-lang/stdarch:core_arch", "crate::core_arch::x86::avx512f::_kxnor_mask16", "Argument[0]", "ReturnValue", "taint", "df-generated"]
+      - ["repo:https://github.com/rust-lang/stdarch:core_arch", "crate::core_arch::x86::avx512f::_kxnor_mask16", "Argument[1]", "ReturnValue", "taint", "df-generated"]
+      - ["repo:https://github.com/rust-lang/stdarch:core_arch", "crate::core_arch::x86::avx512f::_kxor_mask16", "Argument[0]", "ReturnValue", "taint", "df-generated"]
+      - ["repo:https://github.com/rust-lang/stdarch:core_arch", "crate::core_arch::x86::avx512f::_kxor_mask16", "Argument[1]", "ReturnValue", "taint", "df-generated"]
+      - ["repo:https://github.com/rust-lang/stdarch:core_arch", "crate::core_arch::x86::avx512f::_load_mask16", "Argument[0].Reference", "ReturnValue", "value", "dfc-generated"]
+      - ["repo:https://github.com/rust-lang/stdarch:core_arch", "crate::core_arch::x86::avx512f::_mm256_load_epi32", "Argument[0]", "ReturnValue", "taint", "df-generated"]
+      - ["repo:https://github.com/rust-lang/stdarch:core_arch", "crate::core_arch::x86::avx512f::_mm256_load_epi64", "Argument[0]", "ReturnValue", "taint", "df-generated"]
+      - ["repo:https://github.com/rust-lang/stdarch:core_arch", "crate::core_arch::x86::avx512f::_mm256_loadu_epi32", "Argument[0]", "ReturnValue", "taint", "df-generated"]
+      - ["repo:https://github.com/rust-lang/stdarch:core_arch", "crate::core_arch::x86::avx512f::_mm256_loadu_epi64", "Argument[0]", "ReturnValue", "taint", "df-generated"]
+      - ["repo:https://github.com/rust-lang/stdarch:core_arch", "crate::core_arch::x86::avx512f::_mm256_store_epi32", "Argument[1]", "Argument[0]", "taint", "df-generated"]
+      - ["repo:https://github.com/rust-lang/stdarch:core_arch", "crate::core_arch::x86::avx512f::_mm256_store_epi64", "Argument[1]", "Argument[0]", "taint", "df-generated"]
+      - ["repo:https://github.com/rust-lang/stdarch:core_arch", "crate::core_arch::x86::avx512f::_mm256_storeu_epi32", "Argument[1]", "Argument[0]", "taint", "df-generated"]
+      - ["repo:https://github.com/rust-lang/stdarch:core_arch", "crate::core_arch::x86::avx512f::_mm256_storeu_epi64", "Argument[1]", "Argument[0]", "taint", "df-generated"]
+      - ["repo:https://github.com/rust-lang/stdarch:core_arch", "crate::core_arch::x86::avx512f::_mm512_int2mask", "Argument[0]", "ReturnValue", "taint", "df-generated"]
+      - ["repo:https://github.com/rust-lang/stdarch:core_arch", "crate::core_arch::x86::avx512f::_mm512_kand", "Argument[0]", "ReturnValue", "taint", "df-generated"]
+      - ["repo:https://github.com/rust-lang/stdarch:core_arch", "crate::core_arch::x86::avx512f::_mm512_kand", "Argument[1]", "ReturnValue", "taint", "df-generated"]
+      - ["repo:https://github.com/rust-lang/stdarch:core_arch", "crate::core_arch::x86::avx512f::_mm512_kandn", "Argument[0]", "ReturnValue", "taint", "df-generated"]
+      - ["repo:https://github.com/rust-lang/stdarch:core_arch", "crate::core_arch::x86::avx512f::_mm512_kandn", "Argument[1]", "ReturnValue", "taint", "df-generated"]
+      - ["repo:https://github.com/rust-lang/stdarch:core_arch", "crate::core_arch::x86::avx512f::_mm512_kmov", "Argument[0]", "ReturnValue", "value", "dfc-generated"]
+      - ["repo:https://github.com/rust-lang/stdarch:core_arch", "crate::core_arch::x86::avx512f::_mm512_knot", "Argument[0]", "ReturnValue", "taint", "df-generated"]
+      - ["repo:https://github.com/rust-lang/stdarch:core_arch", "crate::core_arch::x86::avx512f::_mm512_kor", "Argument[0]", "ReturnValue", "taint", "df-generated"]
+      - ["repo:https://github.com/rust-lang/stdarch:core_arch", "crate::core_arch::x86::avx512f::_mm512_kor", "Argument[1]", "ReturnValue", "taint", "df-generated"]
+      - ["repo:https://github.com/rust-lang/stdarch:core_arch", "crate::core_arch::x86::avx512f::_mm512_kunpackb", "Argument[0]", "ReturnValue", "taint", "df-generated"]
+      - ["repo:https://github.com/rust-lang/stdarch:core_arch", "crate::core_arch::x86::avx512f::_mm512_kunpackb", "Argument[1]", "ReturnValue", "taint", "df-generated"]
+      - ["repo:https://github.com/rust-lang/stdarch:core_arch", "crate::core_arch::x86::avx512f::_mm512_kxnor", "Argument[0]", "ReturnValue", "taint", "df-generated"]
+      - ["repo:https://github.com/rust-lang/stdarch:core_arch", "crate::core_arch::x86::avx512f::_mm512_kxnor", "Argument[1]", "ReturnValue", "taint", "df-generated"]
+      - ["repo:https://github.com/rust-lang/stdarch:core_arch", "crate::core_arch::x86::avx512f::_mm512_kxor", "Argument[0]", "ReturnValue", "taint", "df-generated"]
+      - ["repo:https://github.com/rust-lang/stdarch:core_arch", "crate::core_arch::x86::avx512f::_mm512_kxor", "Argument[1]", "ReturnValue", "taint", "df-generated"]
+      - ["repo:https://github.com/rust-lang/stdarch:core_arch", "crate::core_arch::x86::avx512f::_mm512_load_epi32", "Argument[0]", "ReturnValue", "taint", "df-generated"]
+      - ["repo:https://github.com/rust-lang/stdarch:core_arch", "crate::core_arch::x86::avx512f::_mm512_load_epi64", "Argument[0]", "ReturnValue", "taint", "df-generated"]
+      - ["repo:https://github.com/rust-lang/stdarch:core_arch", "crate::core_arch::x86::avx512f::_mm512_load_pd", "Argument[0]", "ReturnValue", "taint", "df-generated"]
+      - ["repo:https://github.com/rust-lang/stdarch:core_arch", "crate::core_arch::x86::avx512f::_mm512_load_ps", "Argument[0]", "ReturnValue", "taint", "df-generated"]
+      - ["repo:https://github.com/rust-lang/stdarch:core_arch", "crate::core_arch::x86::avx512f::_mm512_load_si512", "Argument[0]", "ReturnValue", "taint", "df-generated"]
+      - ["repo:https://github.com/rust-lang/stdarch:core_arch", "crate::core_arch::x86::avx512f::_mm512_loadu_epi32", "Argument[0]", "ReturnValue", "taint", "df-generated"]
+      - ["repo:https://github.com/rust-lang/stdarch:core_arch", "crate::core_arch::x86::avx512f::_mm512_loadu_epi64", "Argument[0]", "ReturnValue", "taint", "df-generated"]
+      - ["repo:https://github.com/rust-lang/stdarch:core_arch", "crate::core_arch::x86::avx512f::_mm512_loadu_pd", "Argument[0]", "ReturnValue", "taint", "df-generated"]
+      - ["repo:https://github.com/rust-lang/stdarch:core_arch", "crate::core_arch::x86::avx512f::_mm512_loadu_ps", "Argument[0]", "ReturnValue", "taint", "df-generated"]
+      - ["repo:https://github.com/rust-lang/stdarch:core_arch", "crate::core_arch::x86::avx512f::_mm512_loadu_si512", "Argument[0]", "ReturnValue", "taint", "df-generated"]
+      - ["repo:https://github.com/rust-lang/stdarch:core_arch", "crate::core_arch::x86::avx512f::_mm512_mask2int", "Argument[0]", "ReturnValue", "taint", "df-generated"]
+      - ["repo:https://github.com/rust-lang/stdarch:core_arch", "crate::core_arch::x86::avx512f::_mm512_store_epi32", "Argument[1]", "Argument[0]", "taint", "df-generated"]
+      - ["repo:https://github.com/rust-lang/stdarch:core_arch", "crate::core_arch::x86::avx512f::_mm512_store_epi64", "Argument[1]", "Argument[0]", "taint", "df-generated"]
+      - ["repo:https://github.com/rust-lang/stdarch:core_arch", "crate::core_arch::x86::avx512f::_mm512_store_pd", "Argument[1]", "Argument[0]", "taint", "df-generated"]
+      - ["repo:https://github.com/rust-lang/stdarch:core_arch", "crate::core_arch::x86::avx512f::_mm512_store_ps", "Argument[1]", "Argument[0]", "taint", "df-generated"]
+      - ["repo:https://github.com/rust-lang/stdarch:core_arch", "crate::core_arch::x86::avx512f::_mm512_store_si512", "Argument[1]", "Argument[0].Reference", "value", "dfc-generated"]
+      - ["repo:https://github.com/rust-lang/stdarch:core_arch", "crate::core_arch::x86::avx512f::_mm512_storeu_epi32", "Argument[1]", "Argument[0]", "taint", "df-generated"]
+      - ["repo:https://github.com/rust-lang/stdarch:core_arch", "crate::core_arch::x86::avx512f::_mm512_storeu_epi64", "Argument[1]", "Argument[0]", "taint", "df-generated"]
+      - ["repo:https://github.com/rust-lang/stdarch:core_arch", "crate::core_arch::x86::avx512f::_mm512_storeu_pd", "Argument[1]", "Argument[0]", "taint", "df-generated"]
+      - ["repo:https://github.com/rust-lang/stdarch:core_arch", "crate::core_arch::x86::avx512f::_mm512_storeu_ps", "Argument[1]", "Argument[0]", "taint", "df-generated"]
+      - ["repo:https://github.com/rust-lang/stdarch:core_arch", "crate::core_arch::x86::avx512f::_mm512_storeu_si512", "Argument[1]", "Argument[0].Reference", "value", "dfc-generated"]
+      - ["repo:https://github.com/rust-lang/stdarch:core_arch", "crate::core_arch::x86::avx512f::_mm_load_epi32", "Argument[0]", "ReturnValue", "taint", "df-generated"]
+      - ["repo:https://github.com/rust-lang/stdarch:core_arch", "crate::core_arch::x86::avx512f::_mm_load_epi64", "Argument[0]", "ReturnValue", "taint", "df-generated"]
+      - ["repo:https://github.com/rust-lang/stdarch:core_arch", "crate::core_arch::x86::avx512f::_mm_loadu_epi32", "Argument[0]", "ReturnValue", "taint", "df-generated"]
+      - ["repo:https://github.com/rust-lang/stdarch:core_arch", "crate::core_arch::x86::avx512f::_mm_loadu_epi64", "Argument[0]", "ReturnValue", "taint", "df-generated"]
+      - ["repo:https://github.com/rust-lang/stdarch:core_arch", "crate::core_arch::x86::avx512f::_mm_mask_load_sd", "Argument[0]", "ReturnValue", "value", "dfc-generated"]
+      - ["repo:https://github.com/rust-lang/stdarch:core_arch", "crate::core_arch::x86::avx512f::_mm_mask_load_ss", "Argument[0]", "ReturnValue", "value", "dfc-generated"]
+      - ["repo:https://github.com/rust-lang/stdarch:core_arch", "crate::core_arch::x86::avx512f::_mm_store_epi32", "Argument[1]", "Argument[0]", "taint", "df-generated"]
+      - ["repo:https://github.com/rust-lang/stdarch:core_arch", "crate::core_arch::x86::avx512f::_mm_store_epi64", "Argument[1]", "Argument[0]", "taint", "df-generated"]
+      - ["repo:https://github.com/rust-lang/stdarch:core_arch", "crate::core_arch::x86::avx512f::_mm_storeu_epi32", "Argument[1]", "Argument[0]", "taint", "df-generated"]
+      - ["repo:https://github.com/rust-lang/stdarch:core_arch", "crate::core_arch::x86::avx512f::_mm_storeu_epi64", "Argument[1]", "Argument[0]", "taint", "df-generated"]
+      - ["repo:https://github.com/rust-lang/stdarch:core_arch", "crate::core_arch::x86::avx512f::_store_mask16", "Argument[1]", "Argument[0].Reference", "value", "dfc-generated"]
+      - ["repo:https://github.com/rust-lang/stdarch:core_arch", "crate::core_arch::x86::avx512fp16::_mm256_set_ph", "Argument[0]", "ReturnValue.Field[crate::core_arch::x86::__m256h(0)].Element", "value", "dfc-generated"]
+      - ["repo:https://github.com/rust-lang/stdarch:core_arch", "crate::core_arch::x86::avx512fp16::_mm256_set_ph", "Argument[10]", "ReturnValue.Field[crate::core_arch::x86::__m256h(0)].Element", "value", "dfc-generated"]
+      - ["repo:https://github.com/rust-lang/stdarch:core_arch", "crate::core_arch::x86::avx512fp16::_mm256_set_ph", "Argument[11]", "ReturnValue.Field[crate::core_arch::x86::__m256h(0)].Element", "value", "dfc-generated"]
+      - ["repo:https://github.com/rust-lang/stdarch:core_arch", "crate::core_arch::x86::avx512fp16::_mm256_set_ph", "Argument[12]", "ReturnValue.Field[crate::core_arch::x86::__m256h(0)].Element", "value", "dfc-generated"]
+      - ["repo:https://github.com/rust-lang/stdarch:core_arch", "crate::core_arch::x86::avx512fp16::_mm256_set_ph", "Argument[13]", "ReturnValue.Field[crate::core_arch::x86::__m256h(0)].Element", "value", "dfc-generated"]
+      - ["repo:https://github.com/rust-lang/stdarch:core_arch", "crate::core_arch::x86::avx512fp16::_mm256_set_ph", "Argument[14]", "ReturnValue.Field[crate::core_arch::x86::__m256h(0)].Element", "value", "dfc-generated"]
+      - ["repo:https://github.com/rust-lang/stdarch:core_arch", "crate::core_arch::x86::avx512fp16::_mm256_set_ph", "Argument[15]", "ReturnValue.Field[crate::core_arch::x86::__m256h(0)].Element", "value", "dfc-generated"]
+      - ["repo:https://github.com/rust-lang/stdarch:core_arch", "crate::core_arch::x86::avx512fp16::_mm256_set_ph", "Argument[1]", "ReturnValue.Field[crate::core_arch::x86::__m256h(0)].Element", "value", "dfc-generated"]
+      - ["repo:https://github.com/rust-lang/stdarch:core_arch", "crate::core_arch::x86::avx512fp16::_mm256_set_ph", "Argument[2]", "ReturnValue.Field[crate::core_arch::x86::__m256h(0)].Element", "value", "dfc-generated"]
+      - ["repo:https://github.com/rust-lang/stdarch:core_arch", "crate::core_arch::x86::avx512fp16::_mm256_set_ph", "Argument[3]", "ReturnValue.Field[crate::core_arch::x86::__m256h(0)].Element", "value", "dfc-generated"]
+      - ["repo:https://github.com/rust-lang/stdarch:core_arch", "crate::core_arch::x86::avx512fp16::_mm256_set_ph", "Argument[4]", "ReturnValue.Field[crate::core_arch::x86::__m256h(0)].Element", "value", "dfc-generated"]
+      - ["repo:https://github.com/rust-lang/stdarch:core_arch", "crate::core_arch::x86::avx512fp16::_mm256_set_ph", "Argument[5]", "ReturnValue.Field[crate::core_arch::x86::__m256h(0)].Element", "value", "dfc-generated"]
+      - ["repo:https://github.com/rust-lang/stdarch:core_arch", "crate::core_arch::x86::avx512fp16::_mm256_set_ph", "Argument[6]", "ReturnValue.Field[crate::core_arch::x86::__m256h(0)].Element", "value", "dfc-generated"]
+      - ["repo:https://github.com/rust-lang/stdarch:core_arch", "crate::core_arch::x86::avx512fp16::_mm256_set_ph", "Argument[7]", "ReturnValue.Field[crate::core_arch::x86::__m256h(0)].Element", "value", "dfc-generated"]
+      - ["repo:https://github.com/rust-lang/stdarch:core_arch", "crate::core_arch::x86::avx512fp16::_mm256_set_ph", "Argument[8]", "ReturnValue.Field[crate::core_arch::x86::__m256h(0)].Element", "value", "dfc-generated"]
+      - ["repo:https://github.com/rust-lang/stdarch:core_arch", "crate::core_arch::x86::avx512fp16::_mm256_set_ph", "Argument[9]", "ReturnValue.Field[crate::core_arch::x86::__m256h(0)].Element", "value", "dfc-generated"]
+      - ["repo:https://github.com/rust-lang/stdarch:core_arch", "crate::core_arch::x86::avx512fp16::_mm256_setr_ph", "Argument[0]", "ReturnValue.Field[crate::core_arch::x86::__m256h(0)].Element", "value", "dfc-generated"]
+      - ["repo:https://github.com/rust-lang/stdarch:core_arch", "crate::core_arch::x86::avx512fp16::_mm256_setr_ph", "Argument[10]", "ReturnValue.Field[crate::core_arch::x86::__m256h(0)].Element", "value", "dfc-generated"]
+      - ["repo:https://github.com/rust-lang/stdarch:core_arch", "crate::core_arch::x86::avx512fp16::_mm256_setr_ph", "Argument[11]", "ReturnValue.Field[crate::core_arch::x86::__m256h(0)].Element", "value", "dfc-generated"]
+      - ["repo:https://github.com/rust-lang/stdarch:core_arch", "crate::core_arch::x86::avx512fp16::_mm256_setr_ph", "Argument[12]", "ReturnValue.Field[crate::core_arch::x86::__m256h(0)].Element", "value", "dfc-generated"]
+      - ["repo:https://github.com/rust-lang/stdarch:core_arch", "crate::core_arch::x86::avx512fp16::_mm256_setr_ph", "Argument[13]", "ReturnValue.Field[crate::core_arch::x86::__m256h(0)].Element", "value", "dfc-generated"]
+      - ["repo:https://github.com/rust-lang/stdarch:core_arch", "crate::core_arch::x86::avx512fp16::_mm256_setr_ph", "Argument[14]", "ReturnValue.Field[crate::core_arch::x86::__m256h(0)].Element", "value", "dfc-generated"]
+      - ["repo:https://github.com/rust-lang/stdarch:core_arch", "crate::core_arch::x86::avx512fp16::_mm256_setr_ph", "Argument[15]", "ReturnValue.Field[crate::core_arch::x86::__m256h(0)].Element", "value", "dfc-generated"]
+      - ["repo:https://github.com/rust-lang/stdarch:core_arch", "crate::core_arch::x86::avx512fp16::_mm256_setr_ph", "Argument[1]", "ReturnValue.Field[crate::core_arch::x86::__m256h(0)].Element", "value", "dfc-generated"]
+      - ["repo:https://github.com/rust-lang/stdarch:core_arch", "crate::core_arch::x86::avx512fp16::_mm256_setr_ph", "Argument[2]", "ReturnValue.Field[crate::core_arch::x86::__m256h(0)].Element", "value", "dfc-generated"]
+      - ["repo:https://github.com/rust-lang/stdarch:core_arch", "crate::core_arch::x86::avx512fp16::_mm256_setr_ph", "Argument[3]", "ReturnValue.Field[crate::core_arch::x86::__m256h(0)].Element", "value", "dfc-generated"]
+      - ["repo:https://github.com/rust-lang/stdarch:core_arch", "crate::core_arch::x86::avx512fp16::_mm256_setr_ph", "Argument[4]", "ReturnValue.Field[crate::core_arch::x86::__m256h(0)].Element", "value", "dfc-generated"]
+      - ["repo:https://github.com/rust-lang/stdarch:core_arch", "crate::core_arch::x86::avx512fp16::_mm256_setr_ph", "Argument[5]", "ReturnValue.Field[crate::core_arch::x86::__m256h(0)].Element", "value", "dfc-generated"]
+      - ["repo:https://github.com/rust-lang/stdarch:core_arch", "crate::core_arch::x86::avx512fp16::_mm256_setr_ph", "Argument[6]", "ReturnValue.Field[crate::core_arch::x86::__m256h(0)].Element", "value", "dfc-generated"]
+      - ["repo:https://github.com/rust-lang/stdarch:core_arch", "crate::core_arch::x86::avx512fp16::_mm256_setr_ph", "Argument[7]", "ReturnValue.Field[crate::core_arch::x86::__m256h(0)].Element", "value", "dfc-generated"]
+      - ["repo:https://github.com/rust-lang/stdarch:core_arch", "crate::core_arch::x86::avx512fp16::_mm256_setr_ph", "Argument[8]", "ReturnValue.Field[crate::core_arch::x86::__m256h(0)].Element", "value", "dfc-generated"]
+      - ["repo:https://github.com/rust-lang/stdarch:core_arch", "crate::core_arch::x86::avx512fp16::_mm256_setr_ph", "Argument[9]", "ReturnValue.Field[crate::core_arch::x86::__m256h(0)].Element", "value", "dfc-generated"]
+      - ["repo:https://github.com/rust-lang/stdarch:core_arch", "crate::core_arch::x86::avx512fp16::_mm512_set_ph", "Argument[0]", "ReturnValue.Field[crate::core_arch::x86::__m512h(0)].Element", "value", "dfc-generated"]
+      - ["repo:https://github.com/rust-lang/stdarch:core_arch", "crate::core_arch::x86::avx512fp16::_mm512_set_ph", "Argument[10]", "ReturnValue.Field[crate::core_arch::x86::__m512h(0)].Element", "value", "dfc-generated"]
+      - ["repo:https://github.com/rust-lang/stdarch:core_arch", "crate::core_arch::x86::avx512fp16::_mm512_set_ph", "Argument[11]", "ReturnValue.Field[crate::core_arch::x86::__m512h(0)].Element", "value", "dfc-generated"]
+      - ["repo:https://github.com/rust-lang/stdarch:core_arch", "crate::core_arch::x86::avx512fp16::_mm512_set_ph", "Argument[12]", "ReturnValue.Field[crate::core_arch::x86::__m512h(0)].Element", "value", "dfc-generated"]
+      - ["repo:https://github.com/rust-lang/stdarch:core_arch", "crate::core_arch::x86::avx512fp16::_mm512_set_ph", "Argument[13]", "ReturnValue.Field[crate::core_arch::x86::__m512h(0)].Element", "value", "dfc-generated"]
+      - ["repo:https://github.com/rust-lang/stdarch:core_arch", "crate::core_arch::x86::avx512fp16::_mm512_set_ph", "Argument[14]", "ReturnValue.Field[crate::core_arch::x86::__m512h(0)].Element", "value", "dfc-generated"]
+      - ["repo:https://github.com/rust-lang/stdarch:core_arch", "crate::core_arch::x86::avx512fp16::_mm512_set_ph", "Argument[15]", "ReturnValue.Field[crate::core_arch::x86::__m512h(0)].Element", "value", "dfc-generated"]
+      - ["repo:https://github.com/rust-lang/stdarch:core_arch", "crate::core_arch::x86::avx512fp16::_mm512_set_ph", "Argument[16]", "ReturnValue.Field[crate::core_arch::x86::__m512h(0)].Element", "value", "dfc-generated"]
+      - ["repo:https://github.com/rust-lang/stdarch:core_arch", "crate::core_arch::x86::avx512fp16::_mm512_set_ph", "Argument[17]", "ReturnValue.Field[crate::core_arch::x86::__m512h(0)].Element", "value", "dfc-generated"]
+      - ["repo:https://github.com/rust-lang/stdarch:core_arch", "crate::core_arch::x86::avx512fp16::_mm512_set_ph", "Argument[18]", "ReturnValue.Field[crate::core_arch::x86::__m512h(0)].Element", "value", "dfc-generated"]
+      - ["repo:https://github.com/rust-lang/stdarch:core_arch", "crate::core_arch::x86::avx512fp16::_mm512_set_ph", "Argument[19]", "ReturnValue.Field[crate::core_arch::x86::__m512h(0)].Element", "value", "dfc-generated"]
+      - ["repo:https://github.com/rust-lang/stdarch:core_arch", "crate::core_arch::x86::avx512fp16::_mm512_set_ph", "Argument[1]", "ReturnValue.Field[crate::core_arch::x86::__m512h(0)].Element", "value", "dfc-generated"]
+      - ["repo:https://github.com/rust-lang/stdarch:core_arch", "crate::core_arch::x86::avx512fp16::_mm512_set_ph", "Argument[20]", "ReturnValue.Field[crate::core_arch::x86::__m512h(0)].Element", "value", "dfc-generated"]
+      - ["repo:https://github.com/rust-lang/stdarch:core_arch", "crate::core_arch::x86::avx512fp16::_mm512_set_ph", "Argument[21]", "ReturnValue.Field[crate::core_arch::x86::__m512h(0)].Element", "value", "dfc-generated"]
+      - ["repo:https://github.com/rust-lang/stdarch:core_arch", "crate::core_arch::x86::avx512fp16::_mm512_set_ph", "Argument[22]", "ReturnValue.Field[crate::core_arch::x86::__m512h(0)].Element", "value", "dfc-generated"]
+      - ["repo:https://github.com/rust-lang/stdarch:core_arch", "crate::core_arch::x86::avx512fp16::_mm512_set_ph", "Argument[23]", "ReturnValue.Field[crate::core_arch::x86::__m512h(0)].Element", "value", "dfc-generated"]
+      - ["repo:https://github.com/rust-lang/stdarch:core_arch", "crate::core_arch::x86::avx512fp16::_mm512_set_ph", "Argument[24]", "ReturnValue.Field[crate::core_arch::x86::__m512h(0)].Element", "value", "dfc-generated"]
+      - ["repo:https://github.com/rust-lang/stdarch:core_arch", "crate::core_arch::x86::avx512fp16::_mm512_set_ph", "Argument[25]", "ReturnValue.Field[crate::core_arch::x86::__m512h(0)].Element", "value", "dfc-generated"]
+      - ["repo:https://github.com/rust-lang/stdarch:core_arch", "crate::core_arch::x86::avx512fp16::_mm512_set_ph", "Argument[26]", "ReturnValue.Field[crate::core_arch::x86::__m512h(0)].Element", "value", "dfc-generated"]
+      - ["repo:https://github.com/rust-lang/stdarch:core_arch", "crate::core_arch::x86::avx512fp16::_mm512_set_ph", "Argument[27]", "ReturnValue.Field[crate::core_arch::x86::__m512h(0)].Element", "value", "dfc-generated"]
+      - ["repo:https://github.com/rust-lang/stdarch:core_arch", "crate::core_arch::x86::avx512fp16::_mm512_set_ph", "Argument[28]", "ReturnValue.Field[crate::core_arch::x86::__m512h(0)].Element", "value", "dfc-generated"]
+      - ["repo:https://github.com/rust-lang/stdarch:core_arch", "crate::core_arch::x86::avx512fp16::_mm512_set_ph", "Argument[29]", "ReturnValue.Field[crate::core_arch::x86::__m512h(0)].Element", "value", "dfc-generated"]
+      - ["repo:https://github.com/rust-lang/stdarch:core_arch", "crate::core_arch::x86::avx512fp16::_mm512_set_ph", "Argument[2]", "ReturnValue.Field[crate::core_arch::x86::__m512h(0)].Element", "value", "dfc-generated"]
+      - ["repo:https://github.com/rust-lang/stdarch:core_arch", "crate::core_arch::x86::avx512fp16::_mm512_set_ph", "Argument[30]", "ReturnValue.Field[crate::core_arch::x86::__m512h(0)].Element", "value", "dfc-generated"]
+      - ["repo:https://github.com/rust-lang/stdarch:core_arch", "crate::core_arch::x86::avx512fp16::_mm512_set_ph", "Argument[31]", "ReturnValue.Field[crate::core_arch::x86::__m512h(0)].Element", "value", "dfc-generated"]
+      - ["repo:https://github.com/rust-lang/stdarch:core_arch", "crate::core_arch::x86::avx512fp16::_mm512_set_ph", "Argument[3]", "ReturnValue.Field[crate::core_arch::x86::__m512h(0)].Element", "value", "dfc-generated"]
+      - ["repo:https://github.com/rust-lang/stdarch:core_arch", "crate::core_arch::x86::avx512fp16::_mm512_set_ph", "Argument[4]", "ReturnValue.Field[crate::core_arch::x86::__m512h(0)].Element", "value", "dfc-generated"]
+      - ["repo:https://github.com/rust-lang/stdarch:core_arch", "crate::core_arch::x86::avx512fp16::_mm512_set_ph", "Argument[5]", "ReturnValue.Field[crate::core_arch::x86::__m512h(0)].Element", "value", "dfc-generated"]
+      - ["repo:https://github.com/rust-lang/stdarch:core_arch", "crate::core_arch::x86::avx512fp16::_mm512_set_ph", "Argument[6]", "ReturnValue.Field[crate::core_arch::x86::__m512h(0)].Element", "value", "dfc-generated"]
+      - ["repo:https://github.com/rust-lang/stdarch:core_arch", "crate::core_arch::x86::avx512fp16::_mm512_set_ph", "Argument[7]", "ReturnValue.Field[crate::core_arch::x86::__m512h(0)].Element", "value", "dfc-generated"]
+      - ["repo:https://github.com/rust-lang/stdarch:core_arch", "crate::core_arch::x86::avx512fp16::_mm512_set_ph", "Argument[8]", "ReturnValue.Field[crate::core_arch::x86::__m512h(0)].Element", "value", "dfc-generated"]
+      - ["repo:https://github.com/rust-lang/stdarch:core_arch", "crate::core_arch::x86::avx512fp16::_mm512_set_ph", "Argument[9]", "ReturnValue.Field[crate::core_arch::x86::__m512h(0)].Element", "value", "dfc-generated"]
+      - ["repo:https://github.com/rust-lang/stdarch:core_arch", "crate::core_arch::x86::avx512fp16::_mm512_setr_ph", "Argument[0]", "ReturnValue.Field[crate::core_arch::x86::__m512h(0)].Element", "value", "dfc-generated"]
+      - ["repo:https://github.com/rust-lang/stdarch:core_arch", "crate::core_arch::x86::avx512fp16::_mm512_setr_ph", "Argument[10]", "ReturnValue.Field[crate::core_arch::x86::__m512h(0)].Element", "value", "dfc-generated"]
+      - ["repo:https://github.com/rust-lang/stdarch:core_arch", "crate::core_arch::x86::avx512fp16::_mm512_setr_ph", "Argument[11]", "ReturnValue.Field[crate::core_arch::x86::__m512h(0)].Element", "value", "dfc-generated"]
+      - ["repo:https://github.com/rust-lang/stdarch:core_arch", "crate::core_arch::x86::avx512fp16::_mm512_setr_ph", "Argument[12]", "ReturnValue.Field[crate::core_arch::x86::__m512h(0)].Element", "value", "dfc-generated"]
+      - ["repo:https://github.com/rust-lang/stdarch:core_arch", "crate::core_arch::x86::avx512fp16::_mm512_setr_ph", "Argument[13]", "ReturnValue.Field[crate::core_arch::x86::__m512h(0)].Element", "value", "dfc-generated"]
+      - ["repo:https://github.com/rust-lang/stdarch:core_arch", "crate::core_arch::x86::avx512fp16::_mm512_setr_ph", "Argument[14]", "ReturnValue.Field[crate::core_arch::x86::__m512h(0)].Element", "value", "dfc-generated"]
+      - ["repo:https://github.com/rust-lang/stdarch:core_arch", "crate::core_arch::x86::avx512fp16::_mm512_setr_ph", "Argument[15]", "ReturnValue.Field[crate::core_arch::x86::__m512h(0)].Element", "value", "dfc-generated"]
+      - ["repo:https://github.com/rust-lang/stdarch:core_arch", "crate::core_arch::x86::avx512fp16::_mm512_setr_ph", "Argument[16]", "ReturnValue.Field[crate::core_arch::x86::__m512h(0)].Element", "value", "dfc-generated"]
+      - ["repo:https://github.com/rust-lang/stdarch:core_arch", "crate::core_arch::x86::avx512fp16::_mm512_setr_ph", "Argument[17]", "ReturnValue.Field[crate::core_arch::x86::__m512h(0)].Element", "value", "dfc-generated"]
+      - ["repo:https://github.com/rust-lang/stdarch:core_arch", "crate::core_arch::x86::avx512fp16::_mm512_setr_ph", "Argument[18]", "ReturnValue.Field[crate::core_arch::x86::__m512h(0)].Element", "value", "dfc-generated"]
+      - ["repo:https://github.com/rust-lang/stdarch:core_arch", "crate::core_arch::x86::avx512fp16::_mm512_setr_ph", "Argument[19]", "ReturnValue.Field[crate::core_arch::x86::__m512h(0)].Element", "value", "dfc-generated"]
+      - ["repo:https://github.com/rust-lang/stdarch:core_arch", "crate::core_arch::x86::avx512fp16::_mm512_setr_ph", "Argument[1]", "ReturnValue.Field[crate::core_arch::x86::__m512h(0)].Element", "value", "dfc-generated"]
+      - ["repo:https://github.com/rust-lang/stdarch:core_arch", "crate::core_arch::x86::avx512fp16::_mm512_setr_ph", "Argument[20]", "ReturnValue.Field[crate::core_arch::x86::__m512h(0)].Element", "value", "dfc-generated"]
+      - ["repo:https://github.com/rust-lang/stdarch:core_arch", "crate::core_arch::x86::avx512fp16::_mm512_setr_ph", "Argument[21]", "ReturnValue.Field[crate::core_arch::x86::__m512h(0)].Element", "value", "dfc-generated"]
+      - ["repo:https://github.com/rust-lang/stdarch:core_arch", "crate::core_arch::x86::avx512fp16::_mm512_setr_ph", "Argument[22]", "ReturnValue.Field[crate::core_arch::x86::__m512h(0)].Element", "value", "dfc-generated"]
+      - ["repo:https://github.com/rust-lang/stdarch:core_arch", "crate::core_arch::x86::avx512fp16::_mm512_setr_ph", "Argument[23]", "ReturnValue.Field[crate::core_arch::x86::__m512h(0)].Element", "value", "dfc-generated"]
+      - ["repo:https://github.com/rust-lang/stdarch:core_arch", "crate::core_arch::x86::avx512fp16::_mm512_setr_ph", "Argument[24]", "ReturnValue.Field[crate::core_arch::x86::__m512h(0)].Element", "value", "dfc-generated"]
+      - ["repo:https://github.com/rust-lang/stdarch:core_arch", "crate::core_arch::x86::avx512fp16::_mm512_setr_ph", "Argument[25]", "ReturnValue.Field[crate::core_arch::x86::__m512h(0)].Element", "value", "dfc-generated"]
+      - ["repo:https://github.com/rust-lang/stdarch:core_arch", "crate::core_arch::x86::avx512fp16::_mm512_setr_ph", "Argument[26]", "ReturnValue.Field[crate::core_arch::x86::__m512h(0)].Element", "value", "dfc-generated"]
+      - ["repo:https://github.com/rust-lang/stdarch:core_arch", "crate::core_arch::x86::avx512fp16::_mm512_setr_ph", "Argument[27]", "ReturnValue.Field[crate::core_arch::x86::__m512h(0)].Element", "value", "dfc-generated"]
+      - ["repo:https://github.com/rust-lang/stdarch:core_arch", "crate::core_arch::x86::avx512fp16::_mm512_setr_ph", "Argument[28]", "ReturnValue.Field[crate::core_arch::x86::__m512h(0)].Element", "value", "dfc-generated"]
+      - ["repo:https://github.com/rust-lang/stdarch:core_arch", "crate::core_arch::x86::avx512fp16::_mm512_setr_ph", "Argument[29]", "ReturnValue.Field[crate::core_arch::x86::__m512h(0)].Element", "value", "dfc-generated"]
+      - ["repo:https://github.com/rust-lang/stdarch:core_arch", "crate::core_arch::x86::avx512fp16::_mm512_setr_ph", "Argument[2]", "ReturnValue.Field[crate::core_arch::x86::__m512h(0)].Element", "value", "dfc-generated"]
+      - ["repo:https://github.com/rust-lang/stdarch:core_arch", "crate::core_arch::x86::avx512fp16::_mm512_setr_ph", "Argument[30]", "ReturnValue.Field[crate::core_arch::x86::__m512h(0)].Element", "value", "dfc-generated"]
+      - ["repo:https://github.com/rust-lang/stdarch:core_arch", "crate::core_arch::x86::avx512fp16::_mm512_setr_ph", "Argument[31]", "ReturnValue.Field[crate::core_arch::x86::__m512h(0)].Element", "value", "dfc-generated"]
+      - ["repo:https://github.com/rust-lang/stdarch:core_arch", "crate::core_arch::x86::avx512fp16::_mm512_setr_ph", "Argument[3]", "ReturnValue.Field[crate::core_arch::x86::__m512h(0)].Element", "value", "dfc-generated"]
+      - ["repo:https://github.com/rust-lang/stdarch:core_arch", "crate::core_arch::x86::avx512fp16::_mm512_setr_ph", "Argument[4]", "ReturnValue.Field[crate::core_arch::x86::__m512h(0)].Element", "value", "dfc-generated"]
+      - ["repo:https://github.com/rust-lang/stdarch:core_arch", "crate::core_arch::x86::avx512fp16::_mm512_setr_ph", "Argument[5]", "ReturnValue.Field[crate::core_arch::x86::__m512h(0)].Element", "value", "dfc-generated"]
+      - ["repo:https://github.com/rust-lang/stdarch:core_arch", "crate::core_arch::x86::avx512fp16::_mm512_setr_ph", "Argument[6]", "ReturnValue.Field[crate::core_arch::x86::__m512h(0)].Element", "value", "dfc-generated"]
+      - ["repo:https://github.com/rust-lang/stdarch:core_arch", "crate::core_arch::x86::avx512fp16::_mm512_setr_ph", "Argument[7]", "ReturnValue.Field[crate::core_arch::x86::__m512h(0)].Element", "value", "dfc-generated"]
+      - ["repo:https://github.com/rust-lang/stdarch:core_arch", "crate::core_arch::x86::avx512fp16::_mm512_setr_ph", "Argument[8]", "ReturnValue.Field[crate::core_arch::x86::__m512h(0)].Element", "value", "dfc-generated"]
+      - ["repo:https://github.com/rust-lang/stdarch:core_arch", "crate::core_arch::x86::avx512fp16::_mm512_setr_ph", "Argument[9]", "ReturnValue.Field[crate::core_arch::x86::__m512h(0)].Element", "value", "dfc-generated"]
+      - ["repo:https://github.com/rust-lang/stdarch:core_arch", "crate::core_arch::x86::avx512fp16::_mm_load_sh", "Argument[0].Reference", "ReturnValue.Field[crate::core_arch::x86::__m128h(0)].Element", "value", "dfc-generated"]
+      - ["repo:https://github.com/rust-lang/stdarch:core_arch", "crate::core_arch::x86::avx512fp16::_mm_mask_load_sh", "Argument[0]", "ReturnValue", "value", "dfc-generated"]
+      - ["repo:https://github.com/rust-lang/stdarch:core_arch", "crate::core_arch::x86::avx512fp16::_mm_set_ph", "Argument[0]", "ReturnValue.Field[crate::core_arch::x86::__m128h(0)].Element", "value", "dfc-generated"]
+      - ["repo:https://github.com/rust-lang/stdarch:core_arch", "crate::core_arch::x86::avx512fp16::_mm_set_ph", "Argument[1]", "ReturnValue.Field[crate::core_arch::x86::__m128h(0)].Element", "value", "dfc-generated"]
+      - ["repo:https://github.com/rust-lang/stdarch:core_arch", "crate::core_arch::x86::avx512fp16::_mm_set_ph", "Argument[2]", "ReturnValue.Field[crate::core_arch::x86::__m128h(0)].Element", "value", "dfc-generated"]
+      - ["repo:https://github.com/rust-lang/stdarch:core_arch", "crate::core_arch::x86::avx512fp16::_mm_set_ph", "Argument[3]", "ReturnValue.Field[crate::core_arch::x86::__m128h(0)].Element", "value", "dfc-generated"]
+      - ["repo:https://github.com/rust-lang/stdarch:core_arch", "crate::core_arch::x86::avx512fp16::_mm_set_ph", "Argument[4]", "ReturnValue.Field[crate::core_arch::x86::__m128h(0)].Element", "value", "dfc-generated"]
+      - ["repo:https://github.com/rust-lang/stdarch:core_arch", "crate::core_arch::x86::avx512fp16::_mm_set_ph", "Argument[5]", "ReturnValue.Field[crate::core_arch::x86::__m128h(0)].Element", "value", "dfc-generated"]
+      - ["repo:https://github.com/rust-lang/stdarch:core_arch", "crate::core_arch::x86::avx512fp16::_mm_set_ph", "Argument[6]", "ReturnValue.Field[crate::core_arch::x86::__m128h(0)].Element", "value", "dfc-generated"]
+      - ["repo:https://github.com/rust-lang/stdarch:core_arch", "crate::core_arch::x86::avx512fp16::_mm_set_ph", "Argument[7]", "ReturnValue.Field[crate::core_arch::x86::__m128h(0)].Element", "value", "dfc-generated"]
+      - ["repo:https://github.com/rust-lang/stdarch:core_arch", "crate::core_arch::x86::avx512fp16::_mm_set_sh", "Argument[0]", "ReturnValue.Field[crate::core_arch::x86::__m128h(0)].Element", "value", "dfc-generated"]
+      - ["repo:https://github.com/rust-lang/stdarch:core_arch", "crate::core_arch::x86::avx512fp16::_mm_setr_ph", "Argument[0]", "ReturnValue.Field[crate::core_arch::x86::__m128h(0)].Element", "value", "dfc-generated"]
+      - ["repo:https://github.com/rust-lang/stdarch:core_arch", "crate::core_arch::x86::avx512fp16::_mm_setr_ph", "Argument[1]", "ReturnValue.Field[crate::core_arch::x86::__m128h(0)].Element", "value", "dfc-generated"]
+      - ["repo:https://github.com/rust-lang/stdarch:core_arch", "crate::core_arch::x86::avx512fp16::_mm_setr_ph", "Argument[2]", "ReturnValue.Field[crate::core_arch::x86::__m128h(0)].Element", "value", "dfc-generated"]
+      - ["repo:https://github.com/rust-lang/stdarch:core_arch", "crate::core_arch::x86::avx512fp16::_mm_setr_ph", "Argument[3]", "ReturnValue.Field[crate::core_arch::x86::__m128h(0)].Element", "value", "dfc-generated"]
+      - ["repo:https://github.com/rust-lang/stdarch:core_arch", "crate::core_arch::x86::avx512fp16::_mm_setr_ph", "Argument[4]", "ReturnValue.Field[crate::core_arch::x86::__m128h(0)].Element", "value", "dfc-generated"]
+      - ["repo:https://github.com/rust-lang/stdarch:core_arch", "crate::core_arch::x86::avx512fp16::_mm_setr_ph", "Argument[5]", "ReturnValue.Field[crate::core_arch::x86::__m128h(0)].Element", "value", "dfc-generated"]
+      - ["repo:https://github.com/rust-lang/stdarch:core_arch", "crate::core_arch::x86::avx512fp16::_mm_setr_ph", "Argument[6]", "ReturnValue.Field[crate::core_arch::x86::__m128h(0)].Element", "value", "dfc-generated"]
+      - ["repo:https://github.com/rust-lang/stdarch:core_arch", "crate::core_arch::x86::avx512fp16::_mm_setr_ph", "Argument[7]", "ReturnValue.Field[crate::core_arch::x86::__m128h(0)].Element", "value", "dfc-generated"]
+      - ["repo:https://github.com/rust-lang/stdarch:core_arch", "crate::core_arch::x86::avx::_mm256_broadcast_sd", "Argument[0].Reference", "ReturnValue.Field[crate::core_arch::x86::__m256d(0)].Element", "value", "dfc-generated"]
+      - ["repo:https://github.com/rust-lang/stdarch:core_arch", "crate::core_arch::x86::avx::_mm256_broadcast_ss", "Argument[0].Reference", "ReturnValue.Field[crate::core_arch::x86::__m256(0)].Element", "value", "dfc-generated"]
+      - ["repo:https://github.com/rust-lang/stdarch:core_arch", "crate::core_arch::x86::avx::_mm256_load_pd", "Argument[0]", "ReturnValue", "taint", "df-generated"]
+      - ["repo:https://github.com/rust-lang/stdarch:core_arch", "crate::core_arch::x86::avx::_mm256_load_ps", "Argument[0]", "ReturnValue", "taint", "df-generated"]
+      - ["repo:https://github.com/rust-lang/stdarch:core_arch", "crate::core_arch::x86::avx::_mm256_load_si256", "Argument[0].Reference", "ReturnValue", "value", "dfc-generated"]
+      - ["repo:https://github.com/rust-lang/stdarch:core_arch", "crate::core_arch::x86::avx::_mm256_set1_pd", "Argument[0]", "ReturnValue.Field[crate::core_arch::x86::__m256d(0)].Element", "value", "dfc-generated"]
+      - ["repo:https://github.com/rust-lang/stdarch:core_arch", "crate::core_arch::x86::avx::_mm256_set1_ps", "Argument[0]", "ReturnValue.Field[crate::core_arch::x86::__m256(0)].Element", "value", "dfc-generated"]
+      - ["repo:https://github.com/rust-lang/stdarch:core_arch", "crate::core_arch::x86::avx::_mm256_set_pd", "Argument[0]", "ReturnValue.Field[crate::core_arch::x86::__m256d(0)].Element", "value", "dfc-generated"]
+      - ["repo:https://github.com/rust-lang/stdarch:core_arch", "crate::core_arch::x86::avx::_mm256_set_pd", "Argument[1]", "ReturnValue.Field[crate::core_arch::x86::__m256d(0)].Element", "value", "dfc-generated"]
+      - ["repo:https://github.com/rust-lang/stdarch:core_arch", "crate::core_arch::x86::avx::_mm256_set_pd", "Argument[2]", "ReturnValue.Field[crate::core_arch::x86::__m256d(0)].Element", "value", "dfc-generated"]
+      - ["repo:https://github.com/rust-lang/stdarch:core_arch", "crate::core_arch::x86::avx::_mm256_set_pd", "Argument[3]", "ReturnValue.Field[crate::core_arch::x86::__m256d(0)].Element", "value", "dfc-generated"]
+      - ["repo:https://github.com/rust-lang/stdarch:core_arch", "crate::core_arch::x86::avx::_mm256_set_ps", "Argument[0]", "ReturnValue.Field[crate::core_arch::x86::__m256(0)].Element", "value", "dfc-generated"]
+      - ["repo:https://github.com/rust-lang/stdarch:core_arch", "crate::core_arch::x86::avx::_mm256_set_ps", "Argument[1]", "ReturnValue.Field[crate::core_arch::x86::__m256(0)].Element", "value", "dfc-generated"]
+      - ["repo:https://github.com/rust-lang/stdarch:core_arch", "crate::core_arch::x86::avx::_mm256_set_ps", "Argument[2]", "ReturnValue.Field[crate::core_arch::x86::__m256(0)].Element", "value", "dfc-generated"]
+      - ["repo:https://github.com/rust-lang/stdarch:core_arch", "crate::core_arch::x86::avx::_mm256_set_ps", "Argument[3]", "ReturnValue.Field[crate::core_arch::x86::__m256(0)].Element", "value", "dfc-generated"]
+      - ["repo:https://github.com/rust-lang/stdarch:core_arch", "crate::core_arch::x86::avx::_mm256_set_ps", "Argument[4]", "ReturnValue.Field[crate::core_arch::x86::__m256(0)].Element", "value", "dfc-generated"]
+      - ["repo:https://github.com/rust-lang/stdarch:core_arch", "crate::core_arch::x86::avx::_mm256_set_ps", "Argument[5]", "ReturnValue.Field[crate::core_arch::x86::__m256(0)].Element", "value", "dfc-generated"]
+      - ["repo:https://github.com/rust-lang/stdarch:core_arch", "crate::core_arch::x86::avx::_mm256_set_ps", "Argument[6]", "ReturnValue.Field[crate::core_arch::x86::__m256(0)].Element", "value", "dfc-generated"]
+      - ["repo:https://github.com/rust-lang/stdarch:core_arch", "crate::core_arch::x86::avx::_mm256_set_ps", "Argument[7]", "ReturnValue.Field[crate::core_arch::x86::__m256(0)].Element", "value", "dfc-generated"]
+      - ["repo:https://github.com/rust-lang/stdarch:core_arch", "crate::core_arch::x86::avx::_mm256_setr_pd", "Argument[0]", "ReturnValue.Field[crate::core_arch::x86::__m256d(0)].Element", "value", "dfc-generated"]
+      - ["repo:https://github.com/rust-lang/stdarch:core_arch", "crate::core_arch::x86::avx::_mm256_setr_pd", "Argument[1]", "ReturnValue.Field[crate::core_arch::x86::__m256d(0)].Element", "value", "dfc-generated"]
+      - ["repo:https://github.com/rust-lang/stdarch:core_arch", "crate::core_arch::x86::avx::_mm256_setr_pd", "Argument[2]", "ReturnValue.Field[crate::core_arch::x86::__m256d(0)].Element", "value", "dfc-generated"]
+      - ["repo:https://github.com/rust-lang/stdarch:core_arch", "crate::core_arch::x86::avx::_mm256_setr_pd", "Argument[3]", "ReturnValue.Field[crate::core_arch::x86::__m256d(0)].Element", "value", "dfc-generated"]
+      - ["repo:https://github.com/rust-lang/stdarch:core_arch", "crate::core_arch::x86::avx::_mm256_setr_ps", "Argument[0]", "ReturnValue.Field[crate::core_arch::x86::__m256(0)].Element", "value", "dfc-generated"]
+      - ["repo:https://github.com/rust-lang/stdarch:core_arch", "crate::core_arch::x86::avx::_mm256_setr_ps", "Argument[1]", "ReturnValue.Field[crate::core_arch::x86::__m256(0)].Element", "value", "dfc-generated"]
+      - ["repo:https://github.com/rust-lang/stdarch:core_arch", "crate::core_arch::x86::avx::_mm256_setr_ps", "Argument[2]", "ReturnValue.Field[crate::core_arch::x86::__m256(0)].Element", "value", "dfc-generated"]
+      - ["repo:https://github.com/rust-lang/stdarch:core_arch", "crate::core_arch::x86::avx::_mm256_setr_ps", "Argument[3]", "ReturnValue.Field[crate::core_arch::x86::__m256(0)].Element", "value", "dfc-generated"]
+      - ["repo:https://github.com/rust-lang/stdarch:core_arch", "crate::core_arch::x86::avx::_mm256_setr_ps", "Argument[4]", "ReturnValue.Field[crate::core_arch::x86::__m256(0)].Element", "value", "dfc-generated"]
+      - ["repo:https://github.com/rust-lang/stdarch:core_arch", "crate::core_arch::x86::avx::_mm256_setr_ps", "Argument[5]", "ReturnValue.Field[crate::core_arch::x86::__m256(0)].Element", "value", "dfc-generated"]
+      - ["repo:https://github.com/rust-lang/stdarch:core_arch", "crate::core_arch::x86::avx::_mm256_setr_ps", "Argument[6]", "ReturnValue.Field[crate::core_arch::x86::__m256(0)].Element", "value", "dfc-generated"]
+      - ["repo:https://github.com/rust-lang/stdarch:core_arch", "crate::core_arch::x86::avx::_mm256_setr_ps", "Argument[7]", "ReturnValue.Field[crate::core_arch::x86::__m256(0)].Element", "value", "dfc-generated"]
+      - ["repo:https://github.com/rust-lang/stdarch:core_arch", "crate::core_arch::x86::avx::_mm256_store_pd", "Argument[1]", "Argument[0]", "taint", "df-generated"]
+      - ["repo:https://github.com/rust-lang/stdarch:core_arch", "crate::core_arch::x86::avx::_mm256_store_ps", "Argument[1]", "Argument[0]", "taint", "df-generated"]
+      - ["repo:https://github.com/rust-lang/stdarch:core_arch", "crate::core_arch::x86::avx::_mm256_store_si256", "Argument[1]", "Argument[0].Reference", "value", "dfc-generated"]
+      - ["repo:https://github.com/rust-lang/stdarch:core_arch", "crate::core_arch::x86::avx::_mm_broadcast_ss", "Argument[0].Reference", "ReturnValue.Field[crate::core_arch::x86::__m128(0)].Element", "value", "dfc-generated"]
+      - ["repo:https://github.com/rust-lang/stdarch:core_arch", "crate::core_arch::x86::bmi1::_andn_u32", "Argument[0]", "ReturnValue", "taint", "df-generated"]
+      - ["repo:https://github.com/rust-lang/stdarch:core_arch", "crate::core_arch::x86::bmi1::_andn_u32", "Argument[1]", "ReturnValue", "taint", "df-generated"]
+      - ["repo:https://github.com/rust-lang/stdarch:core_arch", "crate::core_arch::x86::bmi1::_blsi_u32", "Argument[0]", "ReturnValue", "taint", "df-generated"]
+      - ["repo:https://github.com/rust-lang/stdarch:core_arch", "crate::core_arch::x86::bmi1::_blsmsk_u32", "Argument[0]", "ReturnValue", "taint", "df-generated"]
+      - ["repo:https://github.com/rust-lang/stdarch:core_arch", "crate::core_arch::x86::bmi1::_blsr_u32", "Argument[0]", "ReturnValue", "taint", "df-generated"]
+      - ["repo:https://github.com/rust-lang/stdarch:core_arch", "crate::core_arch::x86::bmi2::_mulx_u32", "Argument[0]", "Argument[2]", "taint", "df-generated"]
+      - ["repo:https://github.com/rust-lang/stdarch:core_arch", "crate::core_arch::x86::bmi2::_mulx_u32", "Argument[0]", "ReturnValue", "taint", "df-generated"]
+      - ["repo:https://github.com/rust-lang/stdarch:core_arch", "crate::core_arch::x86::bmi2::_mulx_u32", "Argument[1]", "Argument[2]", "taint", "df-generated"]
+      - ["repo:https://github.com/rust-lang/stdarch:core_arch", "crate::core_arch::x86::bmi2::_mulx_u32", "Argument[1]", "ReturnValue", "taint", "df-generated"]
+      - ["repo:https://github.com/rust-lang/stdarch:core_arch", "crate::core_arch::x86::rtm::_xabort_code", "Argument[0]", "ReturnValue", "taint", "df-generated"]
+      - ["repo:https://github.com/rust-lang/stdarch:core_arch", "crate::core_arch::x86::sse2::_mm_load1_pd", "Argument[0].Reference", "ReturnValue.Field[crate::core_arch::x86::__m128d(0)].Element", "value", "dfc-generated"]
+      - ["repo:https://github.com/rust-lang/stdarch:core_arch", "crate::core_arch::x86::sse2::_mm_load_pd1", "Argument[0].Reference", "ReturnValue.Field[crate::core_arch::x86::__m128d(0)].Element", "value", "dfc-generated"]
+      - ["repo:https://github.com/rust-lang/stdarch:core_arch", "crate::core_arch::x86::sse2::_mm_load_pd", "Argument[0]", "ReturnValue", "taint", "df-generated"]
+      - ["repo:https://github.com/rust-lang/stdarch:core_arch", "crate::core_arch::x86::sse2::_mm_load_sd", "Argument[0].Reference", "ReturnValue.Field[crate::core_arch::x86::__m128d(0)].Element", "value", "dfc-generated"]
+      - ["repo:https://github.com/rust-lang/stdarch:core_arch", "crate::core_arch::x86::sse2::_mm_load_si128", "Argument[0].Reference", "ReturnValue", "value", "dfc-generated"]
+      - ["repo:https://github.com/rust-lang/stdarch:core_arch", "crate::core_arch::x86::sse2::_mm_loadh_pd", "Argument[1].Reference", "ReturnValue.Field[crate::core_arch::x86::__m128d(0)].Element", "value", "dfc-generated"]
+      - ["repo:https://github.com/rust-lang/stdarch:core_arch", "crate::core_arch::x86::sse2::_mm_loadl_pd", "Argument[1].Reference", "ReturnValue.Field[crate::core_arch::x86::__m128d(0)].Element", "value", "dfc-generated"]
+      - ["repo:https://github.com/rust-lang/stdarch:core_arch", "crate::core_arch::x86::sse2::_mm_set1_pd", "Argument[0]", "ReturnValue.Field[crate::core_arch::x86::__m128d(0)].Element", "value", "dfc-generated"]
+      - ["repo:https://github.com/rust-lang/stdarch:core_arch", "crate::core_arch::x86::sse2::_mm_set_pd1", "Argument[0]", "ReturnValue.Field[crate::core_arch::x86::__m128d(0)].Element", "value", "dfc-generated"]
+      - ["repo:https://github.com/rust-lang/stdarch:core_arch", "crate::core_arch::x86::sse2::_mm_set_pd", "Argument[0]", "ReturnValue.Field[crate::core_arch::x86::__m128d(0)].Element", "value", "dfc-generated"]
+      - ["repo:https://github.com/rust-lang/stdarch:core_arch", "crate::core_arch::x86::sse2::_mm_set_pd", "Argument[1]", "ReturnValue.Field[crate::core_arch::x86::__m128d(0)].Element", "value", "dfc-generated"]
+      - ["repo:https://github.com/rust-lang/stdarch:core_arch", "crate::core_arch::x86::sse2::_mm_set_sd", "Argument[0]", "ReturnValue.Field[crate::core_arch::x86::__m128d(0)].Element", "value", "dfc-generated"]
+      - ["repo:https://github.com/rust-lang/stdarch:core_arch", "crate::core_arch::x86::sse2::_mm_setr_pd", "Argument[0]", "ReturnValue.Field[crate::core_arch::x86::__m128d(0)].Element", "value", "dfc-generated"]
+      - ["repo:https://github.com/rust-lang/stdarch:core_arch", "crate::core_arch::x86::sse2::_mm_setr_pd", "Argument[1]", "ReturnValue.Field[crate::core_arch::x86::__m128d(0)].Element", "value", "dfc-generated"]
+      - ["repo:https://github.com/rust-lang/stdarch:core_arch", "crate::core_arch::x86::sse2::_mm_store_pd", "Argument[1]", "Argument[0]", "taint", "df-generated"]
+      - ["repo:https://github.com/rust-lang/stdarch:core_arch", "crate::core_arch::x86::sse2::_mm_store_si128", "Argument[1]", "Argument[0].Reference", "value", "dfc-generated"]
+      - ["repo:https://github.com/rust-lang/stdarch:core_arch", "crate::core_arch::x86::sse3::_mm_loaddup_pd", "Argument[0].Reference", "ReturnValue.Field[crate::core_arch::x86::__m128d(0)].Element", "value", "dfc-generated"]
+      - ["repo:https://github.com/rust-lang/stdarch:core_arch", "crate::core_arch::x86::sse::_MM_SHUFFLE", "Argument[0]", "ReturnValue", "taint", "df-generated"]
+      - ["repo:https://github.com/rust-lang/stdarch:core_arch", "crate::core_arch::x86::sse::_MM_SHUFFLE", "Argument[1]", "ReturnValue", "taint", "df-generated"]
+      - ["repo:https://github.com/rust-lang/stdarch:core_arch", "crate::core_arch::x86::sse::_MM_SHUFFLE", "Argument[2]", "ReturnValue", "taint", "df-generated"]
+      - ["repo:https://github.com/rust-lang/stdarch:core_arch", "crate::core_arch::x86::sse::_MM_SHUFFLE", "Argument[3]", "ReturnValue", "taint", "df-generated"]
+      - ["repo:https://github.com/rust-lang/stdarch:core_arch", "crate::core_arch::x86::sse::_mm_load1_ps", "Argument[0].Reference", "ReturnValue.Field[crate::core_arch::x86::__m128(0)].Element", "value", "dfc-generated"]
+      - ["repo:https://github.com/rust-lang/stdarch:core_arch", "crate::core_arch::x86::sse::_mm_load_ps1", "Argument[0].Reference", "ReturnValue.Field[crate::core_arch::x86::__m128(0)].Element", "value", "dfc-generated"]
+      - ["repo:https://github.com/rust-lang/stdarch:core_arch", "crate::core_arch::x86::sse::_mm_load_ps", "Argument[0]", "ReturnValue", "taint", "df-generated"]
+      - ["repo:https://github.com/rust-lang/stdarch:core_arch", "crate::core_arch::x86::sse::_mm_load_ss", "Argument[0].Reference", "ReturnValue.Field[crate::core_arch::x86::__m128(0)].Element", "value", "dfc-generated"]
+      - ["repo:https://github.com/rust-lang/stdarch:core_arch", "crate::core_arch::x86::sse::_mm_set1_ps", "Argument[0]", "ReturnValue.Field[crate::core_arch::x86::__m128(0)].Element", "value", "dfc-generated"]
+      - ["repo:https://github.com/rust-lang/stdarch:core_arch", "crate::core_arch::x86::sse::_mm_set_ps1", "Argument[0]", "ReturnValue.Field[crate::core_arch::x86::__m128(0)].Element", "value", "dfc-generated"]
+      - ["repo:https://github.com/rust-lang/stdarch:core_arch", "crate::core_arch::x86::sse::_mm_set_ps", "Argument[0]", "ReturnValue.Field[crate::core_arch::x86::__m128(0)].Element", "value", "dfc-generated"]
+      - ["repo:https://github.com/rust-lang/stdarch:core_arch", "crate::core_arch::x86::sse::_mm_set_ps", "Argument[1]", "ReturnValue.Field[crate::core_arch::x86::__m128(0)].Element", "value", "dfc-generated"]
+      - ["repo:https://github.com/rust-lang/stdarch:core_arch", "crate::core_arch::x86::sse::_mm_set_ps", "Argument[2]", "ReturnValue.Field[crate::core_arch::x86::__m128(0)].Element", "value", "dfc-generated"]
+      - ["repo:https://github.com/rust-lang/stdarch:core_arch", "crate::core_arch::x86::sse::_mm_set_ps", "Argument[3]", "ReturnValue.Field[crate::core_arch::x86::__m128(0)].Element", "value", "dfc-generated"]
+      - ["repo:https://github.com/rust-lang/stdarch:core_arch", "crate::core_arch::x86::sse::_mm_set_ss", "Argument[0]", "ReturnValue.Field[crate::core_arch::x86::__m128(0)].Element", "value", "dfc-generated"]
+      - ["repo:https://github.com/rust-lang/stdarch:core_arch", "crate::core_arch::x86::sse::_mm_setr_ps", "Argument[0]", "ReturnValue.Field[crate::core_arch::x86::__m128(0)].Element", "value", "dfc-generated"]
+      - ["repo:https://github.com/rust-lang/stdarch:core_arch", "crate::core_arch::x86::sse::_mm_setr_ps", "Argument[1]", "ReturnValue.Field[crate::core_arch::x86::__m128(0)].Element", "value", "dfc-generated"]
+      - ["repo:https://github.com/rust-lang/stdarch:core_arch", "crate::core_arch::x86::sse::_mm_setr_ps", "Argument[2]", "ReturnValue.Field[crate::core_arch::x86::__m128(0)].Element", "value", "dfc-generated"]
+      - ["repo:https://github.com/rust-lang/stdarch:core_arch", "crate::core_arch::x86::sse::_mm_setr_ps", "Argument[3]", "ReturnValue.Field[crate::core_arch::x86::__m128(0)].Element", "value", "dfc-generated"]
+      - ["repo:https://github.com/rust-lang/stdarch:core_arch", "crate::core_arch::x86::sse::_mm_store_ps", "Argument[1]", "Argument[0]", "taint", "df-generated"]
+      - ["repo:https://github.com/rust-lang/stdarch:core_arch", "crate::core_arch::x86::tbm::_blcfill_u32", "Argument[0]", "ReturnValue", "taint", "df-generated"]
+      - ["repo:https://github.com/rust-lang/stdarch:core_arch", "crate::core_arch::x86::tbm::_blci_u32", "Argument[0]", "ReturnValue", "taint", "df-generated"]
+      - ["repo:https://github.com/rust-lang/stdarch:core_arch", "crate::core_arch::x86::tbm::_blcic_u32", "Argument[0]", "ReturnValue", "taint", "df-generated"]
+      - ["repo:https://github.com/rust-lang/stdarch:core_arch", "crate::core_arch::x86::tbm::_blcmsk_u32", "Argument[0]", "ReturnValue", "taint", "df-generated"]
+      - ["repo:https://github.com/rust-lang/stdarch:core_arch", "crate::core_arch::x86::tbm::_blcs_u32", "Argument[0]", "ReturnValue", "taint", "df-generated"]
+      - ["repo:https://github.com/rust-lang/stdarch:core_arch", "crate::core_arch::x86::tbm::_blsfill_u32", "Argument[0]", "ReturnValue", "taint", "df-generated"]
+      - ["repo:https://github.com/rust-lang/stdarch:core_arch", "crate::core_arch::x86::tbm::_blsic_u32", "Argument[0]", "ReturnValue", "taint", "df-generated"]
+      - ["repo:https://github.com/rust-lang/stdarch:core_arch", "crate::core_arch::x86::tbm::_t1mskc_u32", "Argument[0]", "ReturnValue", "taint", "df-generated"]
+      - ["repo:https://github.com/rust-lang/stdarch:core_arch", "crate::core_arch::x86::tbm::_tzmsk_u32", "Argument[0]", "ReturnValue", "taint", "df-generated"]
+      - ["repo:https://github.com/rust-lang/stdarch:core_arch", "crate::core_arch::x86_64::avx512bw::_cvtmask64_u64", "Argument[0]", "ReturnValue", "value", "dfc-generated"]
+      - ["repo:https://github.com/rust-lang/stdarch:core_arch", "crate::core_arch::x86_64::avx512bw::_cvtu64_mask64", "Argument[0]", "ReturnValue", "value", "dfc-generated"]
+      - ["repo:https://github.com/rust-lang/stdarch:core_arch", "crate::core_arch::x86_64::bmi2::_mulx_u64", "Argument[0]", "Argument[2]", "taint", "df-generated"]
+      - ["repo:https://github.com/rust-lang/stdarch:core_arch", "crate::core_arch::x86_64::bmi2::_mulx_u64", "Argument[0]", "ReturnValue", "taint", "df-generated"]
+      - ["repo:https://github.com/rust-lang/stdarch:core_arch", "crate::core_arch::x86_64::bmi2::_mulx_u64", "Argument[1]", "Argument[2]", "taint", "df-generated"]
+      - ["repo:https://github.com/rust-lang/stdarch:core_arch", "crate::core_arch::x86_64::bmi2::_mulx_u64", "Argument[1]", "ReturnValue", "taint", "df-generated"]
+      - ["repo:https://github.com/rust-lang/stdarch:core_arch", "crate::core_arch::x86_64::bmi::_andn_u64", "Argument[0]", "ReturnValue", "taint", "df-generated"]
+      - ["repo:https://github.com/rust-lang/stdarch:core_arch", "crate::core_arch::x86_64::bmi::_andn_u64", "Argument[1]", "ReturnValue", "taint", "df-generated"]
+      - ["repo:https://github.com/rust-lang/stdarch:core_arch", "crate::core_arch::x86_64::bmi::_blsi_u64", "Argument[0]", "ReturnValue", "taint", "df-generated"]
+      - ["repo:https://github.com/rust-lang/stdarch:core_arch", "crate::core_arch::x86_64::bmi::_blsmsk_u64", "Argument[0]", "ReturnValue", "taint", "df-generated"]
+      - ["repo:https://github.com/rust-lang/stdarch:core_arch", "crate::core_arch::x86_64::bmi::_blsr_u64", "Argument[0]", "ReturnValue", "taint", "df-generated"]
+      - ["repo:https://github.com/rust-lang/stdarch:core_arch", "crate::core_arch::x86_64::tbm::_blcfill_u64", "Argument[0]", "ReturnValue", "taint", "df-generated"]
+      - ["repo:https://github.com/rust-lang/stdarch:core_arch", "crate::core_arch::x86_64::tbm::_blci_u64", "Argument[0]", "ReturnValue", "taint", "df-generated"]
+      - ["repo:https://github.com/rust-lang/stdarch:core_arch", "crate::core_arch::x86_64::tbm::_blcic_u64", "Argument[0]", "ReturnValue", "taint", "df-generated"]
+      - ["repo:https://github.com/rust-lang/stdarch:core_arch", "crate::core_arch::x86_64::tbm::_blcmsk_u64", "Argument[0]", "ReturnValue", "taint", "df-generated"]
+      - ["repo:https://github.com/rust-lang/stdarch:core_arch", "crate::core_arch::x86_64::tbm::_blcs_u64", "Argument[0]", "ReturnValue", "taint", "df-generated"]
+      - ["repo:https://github.com/rust-lang/stdarch:core_arch", "crate::core_arch::x86_64::tbm::_blsfill_u64", "Argument[0]", "ReturnValue", "taint", "df-generated"]
+      - ["repo:https://github.com/rust-lang/stdarch:core_arch", "crate::core_arch::x86_64::tbm::_blsic_u64", "Argument[0]", "ReturnValue", "taint", "df-generated"]
+      - ["repo:https://github.com/rust-lang/stdarch:core_arch", "crate::core_arch::x86_64::tbm::_t1mskc_u64", "Argument[0]", "ReturnValue", "taint", "df-generated"]
+      - ["repo:https://github.com/rust-lang/stdarch:core_arch", "crate::core_arch::x86_64::tbm::_tzmsk_u64", "Argument[0]", "ReturnValue", "taint", "df-generated"]
+  - addsTo:
+      pack: codeql/rust-all
+      extensible: sinkModel
+    data:
+      - ["repo:https://github.com/rust-lang/stdarch:core_arch", "crate::core_arch::x86::avx512bw::_load_mask32", "Argument[0]", "pointer-access", "df-generated"]
+      - ["repo:https://github.com/rust-lang/stdarch:core_arch", "crate::core_arch::x86::avx512bw::_load_mask64", "Argument[0]", "pointer-access", "df-generated"]
+      - ["repo:https://github.com/rust-lang/stdarch:core_arch", "crate::core_arch::x86::avx512bw::_mm256_loadu_epi16", "Argument[0]", "pointer-access", "df-generated"]
+      - ["repo:https://github.com/rust-lang/stdarch:core_arch", "crate::core_arch::x86::avx512bw::_mm256_loadu_epi8", "Argument[0]", "pointer-access", "df-generated"]
+      - ["repo:https://github.com/rust-lang/stdarch:core_arch", "crate::core_arch::x86::avx512bw::_mm256_storeu_epi16", "Argument[0]", "pointer-access", "df-generated"]
+      - ["repo:https://github.com/rust-lang/stdarch:core_arch", "crate::core_arch::x86::avx512bw::_mm256_storeu_epi8", "Argument[0]", "pointer-access", "df-generated"]
+      - ["repo:https://github.com/rust-lang/stdarch:core_arch", "crate::core_arch::x86::avx512bw::_mm512_loadu_epi16", "Argument[0]", "pointer-access", "df-generated"]
+      - ["repo:https://github.com/rust-lang/stdarch:core_arch", "crate::core_arch::x86::avx512bw::_mm512_loadu_epi8", "Argument[0]", "pointer-access", "df-generated"]
+      - ["repo:https://github.com/rust-lang/stdarch:core_arch", "crate::core_arch::x86::avx512bw::_mm512_storeu_epi16", "Argument[0]", "pointer-access", "df-generated"]
+      - ["repo:https://github.com/rust-lang/stdarch:core_arch", "crate::core_arch::x86::avx512bw::_mm512_storeu_epi8", "Argument[0]", "pointer-access", "df-generated"]
+      - ["repo:https://github.com/rust-lang/stdarch:core_arch", "crate::core_arch::x86::avx512bw::_mm_loadu_epi16", "Argument[0]", "pointer-access", "df-generated"]
+      - ["repo:https://github.com/rust-lang/stdarch:core_arch", "crate::core_arch::x86::avx512bw::_mm_loadu_epi8", "Argument[0]", "pointer-access", "df-generated"]
+      - ["repo:https://github.com/rust-lang/stdarch:core_arch", "crate::core_arch::x86::avx512bw::_mm_storeu_epi16", "Argument[0]", "pointer-access", "df-generated"]
+      - ["repo:https://github.com/rust-lang/stdarch:core_arch", "crate::core_arch::x86::avx512bw::_mm_storeu_epi8", "Argument[0]", "pointer-access", "df-generated"]
+      - ["repo:https://github.com/rust-lang/stdarch:core_arch", "crate::core_arch::x86::avx512bw::_store_mask32", "Argument[0]", "pointer-access", "df-generated"]
+      - ["repo:https://github.com/rust-lang/stdarch:core_arch", "crate::core_arch::x86::avx512bw::_store_mask64", "Argument[0]", "pointer-access", "df-generated"]
+      - ["repo:https://github.com/rust-lang/stdarch:core_arch", "crate::core_arch::x86::avx512f::_mm256_load_epi32", "Argument[0]", "pointer-access", "df-generated"]
+      - ["repo:https://github.com/rust-lang/stdarch:core_arch", "crate::core_arch::x86::avx512f::_mm256_load_epi64", "Argument[0]", "pointer-access", "df-generated"]
+      - ["repo:https://github.com/rust-lang/stdarch:core_arch", "crate::core_arch::x86::avx512f::_mm256_loadu_epi32", "Argument[0]", "pointer-access", "df-generated"]
+      - ["repo:https://github.com/rust-lang/stdarch:core_arch", "crate::core_arch::x86::avx512f::_mm256_loadu_epi64", "Argument[0]", "pointer-access", "df-generated"]
+      - ["repo:https://github.com/rust-lang/stdarch:core_arch", "crate::core_arch::x86::avx512f::_mm256_store_epi32", "Argument[0]", "pointer-access", "df-generated"]
+      - ["repo:https://github.com/rust-lang/stdarch:core_arch", "crate::core_arch::x86::avx512f::_mm256_store_epi64", "Argument[0]", "pointer-access", "df-generated"]
+      - ["repo:https://github.com/rust-lang/stdarch:core_arch", "crate::core_arch::x86::avx512f::_mm256_storeu_epi32", "Argument[0]", "pointer-access", "df-generated"]
+      - ["repo:https://github.com/rust-lang/stdarch:core_arch", "crate::core_arch::x86::avx512f::_mm256_storeu_epi64", "Argument[0]", "pointer-access", "df-generated"]
+      - ["repo:https://github.com/rust-lang/stdarch:core_arch", "crate::core_arch::x86::avx512f::_mm512_load_epi32", "Argument[0]", "pointer-access", "df-generated"]
+      - ["repo:https://github.com/rust-lang/stdarch:core_arch", "crate::core_arch::x86::avx512f::_mm512_load_epi64", "Argument[0]", "pointer-access", "df-generated"]
+      - ["repo:https://github.com/rust-lang/stdarch:core_arch", "crate::core_arch::x86::avx512f::_mm512_load_pd", "Argument[0]", "pointer-access", "df-generated"]
+      - ["repo:https://github.com/rust-lang/stdarch:core_arch", "crate::core_arch::x86::avx512f::_mm512_load_ps", "Argument[0]", "pointer-access", "df-generated"]
+      - ["repo:https://github.com/rust-lang/stdarch:core_arch", "crate::core_arch::x86::avx512f::_mm512_load_si512", "Argument[0]", "pointer-access", "df-generated"]
+      - ["repo:https://github.com/rust-lang/stdarch:core_arch", "crate::core_arch::x86::avx512f::_mm512_loadu_epi32", "Argument[0]", "pointer-access", "df-generated"]
+      - ["repo:https://github.com/rust-lang/stdarch:core_arch", "crate::core_arch::x86::avx512f::_mm512_loadu_epi64", "Argument[0]", "pointer-access", "df-generated"]
+      - ["repo:https://github.com/rust-lang/stdarch:core_arch", "crate::core_arch::x86::avx512f::_mm512_loadu_pd", "Argument[0]", "pointer-access", "df-generated"]
+      - ["repo:https://github.com/rust-lang/stdarch:core_arch", "crate::core_arch::x86::avx512f::_mm512_loadu_ps", "Argument[0]", "pointer-access", "df-generated"]
+      - ["repo:https://github.com/rust-lang/stdarch:core_arch", "crate::core_arch::x86::avx512f::_mm512_loadu_si512", "Argument[0]", "pointer-access", "df-generated"]
+      - ["repo:https://github.com/rust-lang/stdarch:core_arch", "crate::core_arch::x86::avx512f::_mm512_store_epi32", "Argument[0]", "pointer-access", "df-generated"]
+      - ["repo:https://github.com/rust-lang/stdarch:core_arch", "crate::core_arch::x86::avx512f::_mm512_store_epi64", "Argument[0]", "pointer-access", "df-generated"]
+      - ["repo:https://github.com/rust-lang/stdarch:core_arch", "crate::core_arch::x86::avx512f::_mm512_store_pd", "Argument[0]", "pointer-access", "df-generated"]
+      - ["repo:https://github.com/rust-lang/stdarch:core_arch", "crate::core_arch::x86::avx512f::_mm512_store_ps", "Argument[0]", "pointer-access", "df-generated"]
+      - ["repo:https://github.com/rust-lang/stdarch:core_arch", "crate::core_arch::x86::avx512f::_mm512_store_si512", "Argument[0]", "pointer-access", "df-generated"]
+      - ["repo:https://github.com/rust-lang/stdarch:core_arch", "crate::core_arch::x86::avx512f::_mm512_storeu_epi32", "Argument[0]", "pointer-access", "df-generated"]
+      - ["repo:https://github.com/rust-lang/stdarch:core_arch", "crate::core_arch::x86::avx512f::_mm512_storeu_epi64", "Argument[0]", "pointer-access", "df-generated"]
+      - ["repo:https://github.com/rust-lang/stdarch:core_arch", "crate::core_arch::x86::avx512f::_mm512_storeu_pd", "Argument[0]", "pointer-access", "df-generated"]
+      - ["repo:https://github.com/rust-lang/stdarch:core_arch", "crate::core_arch::x86::avx512f::_mm512_storeu_ps", "Argument[0]", "pointer-access", "df-generated"]
+      - ["repo:https://github.com/rust-lang/stdarch:core_arch", "crate::core_arch::x86::avx512f::_mm512_storeu_si512", "Argument[0]", "pointer-access", "df-generated"]
+      - ["repo:https://github.com/rust-lang/stdarch:core_arch", "crate::core_arch::x86::avx512f::_mm_load_epi32", "Argument[0]", "pointer-access", "df-generated"]
+      - ["repo:https://github.com/rust-lang/stdarch:core_arch", "crate::core_arch::x86::avx512f::_mm_load_epi64", "Argument[0]", "pointer-access", "df-generated"]
+      - ["repo:https://github.com/rust-lang/stdarch:core_arch", "crate::core_arch::x86::avx512f::_mm_loadu_epi32", "Argument[0]", "pointer-access", "df-generated"]
+      - ["repo:https://github.com/rust-lang/stdarch:core_arch", "crate::core_arch::x86::avx512f::_mm_loadu_epi64", "Argument[0]", "pointer-access", "df-generated"]
+      - ["repo:https://github.com/rust-lang/stdarch:core_arch", "crate::core_arch::x86::avx512f::_mm_store_epi32", "Argument[0]", "pointer-access", "df-generated"]
+      - ["repo:https://github.com/rust-lang/stdarch:core_arch", "crate::core_arch::x86::avx512f::_mm_store_epi64", "Argument[0]", "pointer-access", "df-generated"]
+      - ["repo:https://github.com/rust-lang/stdarch:core_arch", "crate::core_arch::x86::avx512f::_mm_storeu_epi32", "Argument[0]", "pointer-access", "df-generated"]
+      - ["repo:https://github.com/rust-lang/stdarch:core_arch", "crate::core_arch::x86::avx512f::_mm_storeu_epi64", "Argument[0]", "pointer-access", "df-generated"]
+      - ["repo:https://github.com/rust-lang/stdarch:core_arch", "crate::core_arch::x86::sse2::_mm_loadl_epi64", "Argument[0]", "pointer-access", "df-generated"]
+      - ["repo:https://github.com/rust-lang/stdarch:core_arch", "crate::core_arch::x86::sse2::_mm_loadu_si16", "Argument[0]", "pointer-access", "df-generated"]
+      - ["repo:https://github.com/rust-lang/stdarch:core_arch", "crate::core_arch::x86::sse2::_mm_loadu_si32", "Argument[0]", "pointer-access", "df-generated"]
+      - ["repo:https://github.com/rust-lang/stdarch:core_arch", "crate::core_arch::x86::sse2::_mm_loadu_si64", "Argument[0]", "pointer-access", "df-generated"]
+      - ["repo:https://github.com/rust-lang/stdarch:core_arch", "crate::core_arch::x86::sse2::_mm_storeu_si16", "Argument[0]", "pointer-access", "df-generated"]
+      - ["repo:https://github.com/rust-lang/stdarch:core_arch", "crate::core_arch::x86::sse2::_mm_storeu_si32", "Argument[0]", "pointer-access", "df-generated"]
+      - ["repo:https://github.com/rust-lang/stdarch:core_arch", "crate::core_arch::x86::sse2::_mm_storeu_si64", "Argument[0]", "pointer-access", "df-generated"]
diff --git a/rust/ql/lib/ext/generated/rust/repo-intrinsic-test.model.yml b/rust/ql/lib/ext/generated/rust/repo-intrinsic-test.model.yml
new file mode 100644
index 00000000000..9ec477ca533
--- /dev/null
+++ b/rust/ql/lib/ext/generated/rust/repo-intrinsic-test.model.yml
@@ -0,0 +1,49 @@
+# THIS FILE IS AN AUTO-GENERATED MODELS AS DATA FILE. DO NOT EDIT.
+extensions:
+  - addsTo:
+      pack: codeql/rust-all
+      extensible: summaryModel
+    data:
+      - ["repo::intrinsic-test", "<crate::argument::Argument>::from_c", "Argument[0]", "ReturnValue.Field[crate::argument::Argument::pos]", "value", "dfc-generated"]
+      - ["repo::intrinsic-test", "<crate::argument::Argument>::from_c", "Argument[1].Element", "ReturnValue.Field[crate::argument::Argument::name].Reference", "value", "dfc-generated"]
+      - ["repo::intrinsic-test", "<crate::argument::Argument>::type_and_name_from_c", "Argument[0].Element", "ReturnValue.Field[1].Reference", "value", "dfc-generated"]
+      - ["repo::intrinsic-test", "<crate::argument::Constraint>::to_range", "Argument[self].Field[crate::argument::Constraint::Range(0)].Reference", "ReturnValue", "value", "dfc-generated"]
+      - ["repo::intrinsic-test", "<crate::intrinsic::Intrinsic>::generate_loop_c", "Argument[0]", "ReturnValue", "taint", "df-generated"]
+      - ["repo::intrinsic-test", "<crate::intrinsic::Intrinsic>::generate_loop_c", "Argument[1]", "ReturnValue", "taint", "df-generated"]
+      - ["repo::intrinsic-test", "<crate::intrinsic::Intrinsic>::generate_loop_c", "Argument[2]", "ReturnValue", "taint", "df-generated"]
+      - ["repo::intrinsic-test", "<crate::intrinsic::Intrinsic>::generate_loop_c", "Argument[self]", "ReturnValue", "taint", "df-generated"]
+      - ["repo::intrinsic-test", "<crate::intrinsic::Intrinsic>::generate_loop_rust", "Argument[0]", "ReturnValue", "taint", "df-generated"]
+      - ["repo::intrinsic-test", "<crate::intrinsic::Intrinsic>::generate_loop_rust", "Argument[1]", "ReturnValue", "taint", "df-generated"]
+      - ["repo::intrinsic-test", "<crate::intrinsic::Intrinsic>::generate_loop_rust", "Argument[2]", "ReturnValue", "taint", "df-generated"]
+      - ["repo::intrinsic-test", "<crate::intrinsic::Intrinsic>::generate_loop_rust", "Argument[self]", "ReturnValue", "taint", "df-generated"]
+      - ["repo::intrinsic-test", "<crate::intrinsic::Intrinsic>::print_result_c", "Argument[0]", "ReturnValue", "taint", "df-generated"]
+      - ["repo::intrinsic-test", "<crate::intrinsic::Intrinsic>::print_result_c", "Argument[1]", "ReturnValue", "taint", "df-generated"]
+      - ["repo::intrinsic-test", "<crate::types::IntrinsicType>::c_single_vector_type", "Argument[self]", "ReturnValue", "taint", "df-generated"]
+      - ["repo::intrinsic-test", "<crate::types::IntrinsicType>::c_type", "Argument[self]", "ReturnValue", "taint", "df-generated"]
+      - ["repo::intrinsic-test", "<crate::types::IntrinsicType>::kind", "Argument[self].Reference.Field[crate::types::IntrinsicType::Type::kind]", "ReturnValue", "value", "dfc-generated"]
+      - ["repo::intrinsic-test", "<crate::types::IntrinsicType>::populate_random", "Argument[0]", "ReturnValue", "taint", "df-generated"]
+      - ["repo::intrinsic-test", "<crate::types::IntrinsicType>::rust_type", "Argument[self]", "ReturnValue", "taint", "df-generated"]
+      - ["repo::intrinsic-test", "<crate::types::TypeKind as crate::str::traits::FromStr>::from_str", "Argument[0]", "ReturnValue", "taint", "df-generated"]
+  - addsTo:
+      pack: codeql/rust-all
+      extensible: sinkModel
+    data:
+      - ["repo::intrinsic-test", "<crate::argument::Argument>::from_c", "Argument[1]", "log-injection", "df-generated"]
+      - ["repo::intrinsic-test", "<crate::intrinsic::Intrinsic>::generate_loop_c", "Argument[self]", "log-injection", "df-generated"]
+      - ["repo::intrinsic-test", "<crate::intrinsic::Intrinsic>::print_result_c", "Argument[self]", "log-injection", "df-generated"]
+      - ["repo::intrinsic-test", "<crate::types::IntrinsicType>::c_scalar_type", "Argument[self]", "log-injection", "df-generated"]
+      - ["repo::intrinsic-test", "<crate::types::IntrinsicType>::c_type", "Argument[self]", "log-injection", "df-generated"]
+      - ["repo::intrinsic-test", "<crate::types::IntrinsicType>::get_lane_function", "Argument[self]", "log-injection", "df-generated"]
+      - ["repo::intrinsic-test", "<crate::types::IntrinsicType>::get_load_function", "Argument[self]", "log-injection", "df-generated"]
+      - ["repo::intrinsic-test", "<crate::types::IntrinsicType>::populate_random", "Argument[self]", "log-injection", "df-generated"]
+      - ["repo::intrinsic-test", "<crate::types::IntrinsicType>::rust_scalar_type", "Argument[self]", "log-injection", "df-generated"]
+      - ["repo::intrinsic-test", "<crate::types::IntrinsicType>::rust_type", "Argument[self]", "log-injection", "df-generated"]
+      - ["repo::intrinsic-test", "<crate::types::TypeKind>::c_prefix", "Argument[self]", "log-injection", "df-generated"]
+      - ["repo::intrinsic-test", "<crate::types::TypeKind>::rust_prefix", "Argument[self]", "log-injection", "df-generated"]
+      - ["repo::intrinsic-test", "crate::json_parser::get_neon_intrinsics", "Argument[0]", "path-injection", "df-generated"]
+      - ["repo::intrinsic-test", "crate::values::value_for_array", "Argument[0]", "log-injection", "df-generated"]
+  - addsTo:
+      pack: codeql/rust-all
+      extensible: sourceModel
+    data:
+      - ["repo::intrinsic-test", "crate::json_parser::get_neon_intrinsics", "ReturnValue", "file", "df-generated"]
diff --git a/rust/ql/lib/ext/generated/rust/repo-std_float.model.yml b/rust/ql/lib/ext/generated/rust/repo-std_float.model.yml
new file mode 100644
index 00000000000..8f7ea31908d
--- /dev/null
+++ b/rust/ql/lib/ext/generated/rust/repo-std_float.model.yml
@@ -0,0 +1,7 @@
+# THIS FILE IS AN AUTO-GENERATED MODELS AS DATA FILE. DO NOT EDIT.
+extensions:
+  - addsTo:
+      pack: codeql/rust-all
+      extensible: summaryModel
+    data:
+      - ["repo::std_float", "<crate::core_simd::vector::Simd as crate::StdFloat>::fract", "Argument[self]", "ReturnValue", "taint", "df-generated"]
diff --git a/rust/ql/lib/ext/generated/rust/repo-stdarch-gen-arm.model.yml b/rust/ql/lib/ext/generated/rust/repo-stdarch-gen-arm.model.yml
new file mode 100644
index 00000000000..100d8a968a4
--- /dev/null
+++ b/rust/ql/lib/ext/generated/rust/repo-stdarch-gen-arm.model.yml
@@ -0,0 +1,93 @@
+# THIS FILE IS AN AUTO-GENERATED MODELS AS DATA FILE. DO NOT EDIT.
+extensions:
+  - addsTo:
+      pack: codeql/rust-all
+      extensible: summaryModel
+    data:
+      - ["repo::stdarch-gen-arm", "<crate::context::LocalContext>::make_assertion_from_constraint", "Argument[0]", "ReturnValue", "taint", "df-generated"]
+      - ["repo::stdarch-gen-arm", "<crate::context::LocalContext>::make_assertion_from_constraint", "Argument[self]", "ReturnValue", "taint", "df-generated"]
+      - ["repo::stdarch-gen-arm", "<crate::context::LocalContext>::new", "Argument[0]", "ReturnValue.Field[crate::context::LocalContext::input]", "value", "dfc-generated"]
+      - ["repo::stdarch-gen-arm", "<crate::context::LocalContext>::new", "Argument[1].Field[crate::intrinsic::Intrinsic::signature].Reference", "ReturnValue.Field[crate::context::LocalContext::signature]", "value", "dfc-generated"]
+      - ["repo::stdarch-gen-arm", "<crate::context::LocalContext>::provide_substitution_wildcard", "Argument[0]", "ReturnValue", "taint", "df-generated"]
+      - ["repo::stdarch-gen-arm", "<crate::context::LocalContext>::provide_type_wildcard", "Argument[0]", "ReturnValue", "taint", "df-generated"]
+      - ["repo::stdarch-gen-arm", "<crate::context::LocalContext>::provide_type_wildcard", "Argument[self]", "ReturnValue", "taint", "df-generated"]
+      - ["repo::stdarch-gen-arm", "<crate::expression::Expression as crate::convert::From>::from", "Argument[0]", "ReturnValue.Field[crate::expression::Expression::FnCall(0)]", "value", "dfc-generated"]
+      - ["repo::stdarch-gen-arm", "<crate::expression::Expression as crate::convert::From>::from", "Argument[0]", "ReturnValue.Field[crate::expression::Expression::Identifier(0)]", "value", "dfc-generated"]
+      - ["repo::stdarch-gen-arm", "<crate::expression::Expression as crate::convert::TryFrom>::try_from", "Argument[0]", "ReturnValue", "taint", "df-generated"]
+      - ["repo::stdarch-gen-arm", "<crate::expression::Expression as crate::str::traits::FromStr>::from_str", "Argument[0]", "ReturnValue", "taint", "df-generated"]
+      - ["repo::stdarch-gen-arm", "<crate::fn_suffix::SuffixKind as crate::str::traits::FromStr>::from_str", "Argument[0]", "ReturnValue", "taint", "df-generated"]
+      - ["repo::stdarch-gen-arm", "<crate::input::InputType>::n_variant_op", "Argument[self].Field[crate::input::InputType::NVariantOp(0)].Field[crate::option::Option::Some(0)]", "ReturnValue.Field[crate::option::Option::Some(0)]", "value", "dfc-generated"]
+      - ["repo::stdarch-gen-arm", "<crate::input::InputType>::predicate_form", "Argument[self].Field[crate::input::InputType::PredicateForm(0)]", "ReturnValue.Field[crate::option::Option::Some(0)]", "value", "dfc-generated"]
+      - ["repo::stdarch-gen-arm", "<crate::input::InputType>::predicate_form_mut", "Argument[self].Field[crate::input::InputType::PredicateForm(0)]", "ReturnValue.Field[crate::option::Option::Some(0)]", "value", "dfc-generated"]
+      - ["repo::stdarch-gen-arm", "<crate::input::InputType>::typekind", "Argument[self].Field[crate::input::InputType::Type(0)]", "ReturnValue.Field[crate::option::Option::Some(0)]", "value", "dfc-generated"]
+      - ["repo::stdarch-gen-arm", "<crate::intrinsic::Argument as crate::str::traits::FromStr>::from_str", "Argument[0]", "ReturnValue", "taint", "df-generated"]
+      - ["repo::stdarch-gen-arm", "<crate::intrinsic::Constraint>::build", "Argument[self]", "ReturnValue", "taint", "df-generated"]
+      - ["repo::stdarch-gen-arm", "<crate::intrinsic::Intrinsic>::generate_variant", "Argument[self].Reference.Reference", "ReturnValue.Field[crate::result::Result::Ok(0)]", "value", "dfc-generated"]
+      - ["repo::stdarch-gen-arm", "<crate::intrinsic::Intrinsic>::generate_variant", "Argument[self].Reference", "ReturnValue.Field[crate::result::Result::Ok(0)]", "value", "dfc-generated"]
+      - ["repo::stdarch-gen-arm", "<crate::intrinsic::LLVMLink>::apply_conversions_to_call", "Argument[0]", "ReturnValue.Field[crate::result::Result::Ok(0)].Field[crate::expression::Expression::FnCall(0)]", "value", "dfc-generated"]
+      - ["repo::stdarch-gen-arm", "<crate::intrinsic::LLVMLink>::make_fn_call", "Argument[self].Field[crate::intrinsic::LLVMLink::signature].Field[crate::option::Option::Some(0)]", "ReturnValue.Reference", "value", "dfc-generated"]
+      - ["repo::stdarch-gen-arm", "<crate::intrinsic::LLVMLink>::resolve", "Argument[0]", "ReturnValue", "taint", "df-generated"]
+      - ["repo::stdarch-gen-arm", "<crate::intrinsic::LLVMLink>::resolve", "Argument[self]", "ReturnValue", "taint", "df-generated"]
+      - ["repo::stdarch-gen-arm", "<crate::intrinsic::Signature>::doc_name", "Argument[self]", "ReturnValue", "taint", "df-generated"]
+      - ["repo::stdarch-gen-arm", "<crate::intrinsic::Signature>::drop_argument", "Argument[0]", "ReturnValue", "taint", "df-generated"]
+      - ["repo::stdarch-gen-arm", "<crate::intrinsic::StaticDefinition as crate::str::traits::FromStr>::from_str", "Argument[0]", "ReturnValue", "taint", "df-generated"]
+      - ["repo::stdarch-gen-arm", "<crate::intrinsic::Test>::get_typeset_index", "Argument[self].Reference.Field[crate::intrinsic::Test::Load(0)]", "ReturnValue.Field[crate::option::Option::Some(0)]", "value", "dfc-generated"]
+      - ["repo::stdarch-gen-arm", "<crate::intrinsic::Test>::get_typeset_index", "Argument[self].Reference.Field[crate::intrinsic::Test::Store(0)]", "ReturnValue.Field[crate::option::Option::Some(0)]", "value", "dfc-generated"]
+      - ["repo::stdarch-gen-arm", "<crate::matching::MatchKindValues>::get", "Argument[self].Field[crate::matching::MatchKindValues::default]", "ReturnValue.Field[crate::result::Result::Ok(0)].Reference", "value", "dfc-generated"]
+      - ["repo::stdarch-gen-arm", "<crate::matching::MatchSizeValues>::get", "Argument[self].Field[crate::matching::MatchSizeValues::default]", "ReturnValue.Field[crate::result::Result::Ok(0)].Reference", "value", "dfc-generated"]
+      - ["repo::stdarch-gen-arm", "<crate::predicate_forms::PredicationMask>::has_dont_care", "Argument[self].Field[crate::predicate_forms::PredicationMask::x]", "ReturnValue", "value", "dfc-generated"]
+      - ["repo::stdarch-gen-arm", "<crate::predicate_forms::PredicationMask>::has_merging", "Argument[self].Field[crate::predicate_forms::PredicationMask::m]", "ReturnValue", "value", "dfc-generated"]
+      - ["repo::stdarch-gen-arm", "<crate::predicate_forms::PredicationMask>::has_zeroing", "Argument[self].Field[crate::predicate_forms::PredicationMask::z]", "ReturnValue", "value", "dfc-generated"]
+      - ["repo::stdarch-gen-arm", "<crate::typekinds::BaseType as crate::str::traits::FromStr>::from_str", "Argument[0]", "ReturnValue", "taint", "df-generated"]
+      - ["repo::stdarch-gen-arm", "<crate::typekinds::BaseType as crate::typekinds::ToRepr>::repr", "Argument[self]", "ReturnValue", "taint", "df-generated"]
+      - ["repo::stdarch-gen-arm", "<crate::typekinds::BaseType>::get_size", "Argument[self]", "ReturnValue", "taint", "df-generated"]
+      - ["repo::stdarch-gen-arm", "<crate::typekinds::BaseType>::kind", "Argument[self].Field[crate::typekinds::BaseType::Sized(0)]", "ReturnValue", "value", "dfc-generated"]
+      - ["repo::stdarch-gen-arm", "<crate::typekinds::BaseType>::kind", "Argument[self].Field[crate::typekinds::BaseType::Unsized(0)]", "ReturnValue", "value", "dfc-generated"]
+      - ["repo::stdarch-gen-arm", "<crate::typekinds::BaseTypeKind as crate::str::traits::FromStr>::from_str", "Argument[0]", "ReturnValue", "taint", "df-generated"]
+      - ["repo::stdarch-gen-arm", "<crate::typekinds::TypeKind as crate::str::traits::FromStr>::from_str", "Argument[0]", "ReturnValue", "taint", "df-generated"]
+      - ["repo::stdarch-gen-arm", "<crate::typekinds::TypeKind>::make_vector", "Argument[0]", "ReturnValue", "taint", "df-generated"]
+      - ["repo::stdarch-gen-arm", "<crate::typekinds::TypeKind>::populate_wildcard", "Argument[0]", "Argument[self].Reference", "value", "dfc-generated"]
+      - ["repo::stdarch-gen-arm", "<crate::typekinds::TypeKindOptions>::contains", "Argument[self]", "ReturnValue", "taint", "df-generated"]
+      - ["repo::stdarch-gen-arm", "<crate::typekinds::VectorTupleSize as crate::convert::TryFrom>::try_from", "Argument[0]", "ReturnValue", "taint", "df-generated"]
+      - ["repo::stdarch-gen-arm", "<crate::typekinds::VectorTupleSize as crate::str::traits::FromStr>::from_str", "Argument[0]", "ReturnValue", "taint", "df-generated"]
+      - ["repo::stdarch-gen-arm", "<crate::typekinds::VectorType as crate::str::traits::FromStr>::from_str", "Argument[0]", "ReturnValue", "taint", "df-generated"]
+      - ["repo::stdarch-gen-arm", "<crate::typekinds::VectorType as crate::typekinds::ToRepr>::repr", "Argument[self]", "ReturnValue", "taint", "df-generated"]
+      - ["repo::stdarch-gen-arm", "<crate::typekinds::VectorType>::base_type", "Argument[self].Field[crate::typekinds::VectorType::base_type]", "ReturnValue.Reference", "value", "dfc-generated"]
+      - ["repo::stdarch-gen-arm", "<crate::typekinds::VectorType>::base_type_mut", "Argument[self].Field[crate::typekinds::VectorType::base_type]", "ReturnValue.Reference", "value", "dfc-generated"]
+      - ["repo::stdarch-gen-arm", "<crate::typekinds::VectorType>::cast_base_type_as", "Argument[0]", "Argument[self].Field[crate::typekinds::VectorType::base_type]", "value", "dfc-generated"]
+      - ["repo::stdarch-gen-arm", "<crate::typekinds::VectorType>::lanes", "Argument[self].Field[crate::typekinds::VectorType::lanes]", "ReturnValue", "value", "dfc-generated"]
+      - ["repo::stdarch-gen-arm", "<crate::typekinds::VectorType>::make_from_base", "Argument[0].Field[crate::typekinds::BaseType::Sized(1)]", "ReturnValue.Field[crate::typekinds::VectorType::lanes]", "value", "dfc-generated"]
+      - ["repo::stdarch-gen-arm", "<crate::typekinds::VectorType>::make_from_base", "Argument[0]", "ReturnValue.Field[crate::typekinds::VectorType::base_type]", "value", "dfc-generated"]
+      - ["repo::stdarch-gen-arm", "<crate::typekinds::VectorType>::make_from_base", "Argument[1]", "ReturnValue.Field[crate::typekinds::VectorType::is_scalable]", "value", "dfc-generated"]
+      - ["repo::stdarch-gen-arm", "<crate::typekinds::VectorType>::make_from_base", "Argument[2]", "ReturnValue.Field[crate::typekinds::VectorType::tuple_size]", "value", "dfc-generated"]
+      - ["repo::stdarch-gen-arm", "<crate::typekinds::VectorType>::make_predicate_from_bitsize", "Argument[0]", "ReturnValue.Field[crate::typekinds::VectorType::base_type].Field[crate::typekinds::BaseType::Sized(1)]", "value", "dfc-generated"]
+      - ["repo::stdarch-gen-arm", "<crate::typekinds::VectorType>::tuple_size", "Argument[self].Field[crate::typekinds::VectorType::tuple_size]", "ReturnValue", "value", "dfc-generated"]
+      - ["repo::stdarch-gen-arm", "<crate::wildcards::Wildcard as crate::str::traits::FromStr>::from_str", "Argument[0]", "ReturnValue", "taint", "df-generated"]
+      - ["repo::stdarch-gen-arm", "<crate::wildstring::WildString as crate::str::traits::FromStr>::from_str", "Argument[0]", "ReturnValue", "taint", "df-generated"]
+      - ["repo::stdarch-gen-arm", "crate::big_endian::create_let_variable", "Argument[1].Reference", "ReturnValue.Field[crate::expression::Expression::Let(0)].Field[crate::expression::LetVariant::WithType(1)]", "value", "dfc-generated"]
+      - ["repo::stdarch-gen-arm", "crate::big_endian::create_mut_let_variable", "Argument[1].Reference", "ReturnValue.Field[crate::expression::Expression::Let(0)].Field[crate::expression::LetVariant::MutWithType(1)]", "value", "dfc-generated"]
+      - ["repo::stdarch-gen-arm", "crate::fn_suffix::make_neon_suffix", "Argument[0]", "ReturnValue", "taint", "df-generated"]
+  - addsTo:
+      pack: codeql/rust-all
+      extensible: sinkModel
+    data:
+      - ["repo::stdarch-gen-arm", "<crate::assert_instr::InstructionAssertionsForBaseType as crate::to_tokens::ToTokens>::to_tokens", "Argument[self]", "log-injection", "df-generated"]
+      - ["repo::stdarch-gen-arm", "<crate::expression::Expression as crate::to_tokens::ToTokens>::to_tokens", "Argument[self]", "log-injection", "df-generated"]
+      - ["repo::stdarch-gen-arm", "<crate::expression::Expression>::is_static_assert", "Argument[self]", "log-injection", "df-generated"]
+      - ["repo::stdarch-gen-arm", "<crate::expression::Expression>::requires_unsafe_wrapper", "Argument[0]", "log-injection", "df-generated"]
+      - ["repo::stdarch-gen-arm", "<crate::expression::Expression>::requires_unsafe_wrapper", "Argument[self]", "log-injection", "df-generated"]
+      - ["repo::stdarch-gen-arm", "<crate::intrinsic::Intrinsic>::generate_variant", "Argument[self]", "log-injection", "df-generated"]
+      - ["repo::stdarch-gen-arm", "<crate::intrinsic::Intrinsic>::generate_variants", "Argument[self]", "log-injection", "df-generated"]
+      - ["repo::stdarch-gen-arm", "<crate::intrinsic::LLVMLink as crate::to_tokens::ToTokens>::to_tokens", "Argument[self]", "log-injection", "df-generated"]
+      - ["repo::stdarch-gen-arm", "<crate::matching::KindMatchable as crate::convert::AsMut>::as_mut", "Argument[self]", "log-injection", "df-generated"]
+      - ["repo::stdarch-gen-arm", "<crate::matching::KindMatchable as crate::convert::AsRef>::as_ref", "Argument[self]", "log-injection", "df-generated"]
+      - ["repo::stdarch-gen-arm", "<crate::matching::KindMatchable as crate::to_tokens::ToTokens>::to_tokens", "Argument[self]", "log-injection", "df-generated"]
+      - ["repo::stdarch-gen-arm", "<crate::matching::SizeMatchable as crate::convert::AsMut>::as_mut", "Argument[self]", "log-injection", "df-generated"]
+      - ["repo::stdarch-gen-arm", "<crate::matching::SizeMatchable as crate::convert::AsRef>::as_ref", "Argument[self]", "log-injection", "df-generated"]
+      - ["repo::stdarch-gen-arm", "<crate::matching::SizeMatchable as crate::to_tokens::ToTokens>::to_tokens", "Argument[self]", "log-injection", "df-generated"]
+      - ["repo::stdarch-gen-arm", "<crate::typekinds::BaseType as crate::typekinds::ToRepr>::repr", "Argument[self]", "log-injection", "df-generated"]
+      - ["repo::stdarch-gen-arm", "<crate::typekinds::BaseTypeKind as crate::typekinds::ToRepr>::repr", "Argument[0]", "log-injection", "df-generated"]
+      - ["repo::stdarch-gen-arm", "<crate::wildstring::WildString as crate::to_tokens::ToTokens>::to_tokens", "Argument[self]", "log-injection", "df-generated"]
+      - ["repo::stdarch-gen-arm", "crate::fn_suffix::make_neon_suffix", "Argument[0]", "log-injection", "df-generated"]
+      - ["repo::stdarch-gen-arm", "crate::fn_suffix::type_to_size", "Argument[0]", "log-injection", "df-generated"]
+      - ["repo::stdarch-gen-arm", "crate::load_store_tests::generate_load_store_tests", "Argument[2]", "path-injection", "df-generated"]
diff --git a/rust/ql/lib/ext/generated/rust/repo-stdarch-gen-loongarch.model.yml b/rust/ql/lib/ext/generated/rust/repo-stdarch-gen-loongarch.model.yml
new file mode 100644
index 00000000000..b4db99849b5
--- /dev/null
+++ b/rust/ql/lib/ext/generated/rust/repo-stdarch-gen-loongarch.model.yml
@@ -0,0 +1,7 @@
+# THIS FILE IS AN AUTO-GENERATED MODELS AS DATA FILE. DO NOT EDIT.
+extensions:
+  - addsTo:
+      pack: codeql/rust-all
+      extensible: summaryModel
+    data:
+      - ["repo::stdarch-gen-loongarch", "<crate::Lines as crate::convert::From>::from", "Argument[0]", "ReturnValue.Field[crate::Lines::lines]", "value", "dfc-generated"]
diff --git a/rust/ql/lib/ext/generated/rust/repo-stdarch-test.model.yml b/rust/ql/lib/ext/generated/rust/repo-stdarch-test.model.yml
new file mode 100644
index 00000000000..25fa198710e
--- /dev/null
+++ b/rust/ql/lib/ext/generated/rust/repo-stdarch-test.model.yml
@@ -0,0 +1,10 @@
+# THIS FILE IS AN AUTO-GENERATED MODELS AS DATA FILE. DO NOT EDIT.
+extensions:
+  - addsTo:
+      pack: codeql/rust-all
+      extensible: sinkModel
+    data:
+      - ["repo::stdarch-test", "crate::assert", "Argument[1]", "log-injection", "df-generated"]
+      - ["repo::stdarch-test", "crate::assert", "Argument[2]", "log-injection", "df-generated"]
+      - ["repo::stdarch-test", "crate::assert_skip_test_ok", "Argument[0]", "log-injection", "df-generated"]
+      - ["repo::stdarch-test", "crate::assert_skip_test_ok", "Argument[1]", "log-injection", "df-generated"]
diff --git a/rust/ql/lib/ext/generated/rust/repo-stdarch_examples.model.yml b/rust/ql/lib/ext/generated/rust/repo-stdarch_examples.model.yml
new file mode 100644
index 00000000000..3df74c09729
--- /dev/null
+++ b/rust/ql/lib/ext/generated/rust/repo-stdarch_examples.model.yml
@@ -0,0 +1,8 @@
+# THIS FILE IS AN AUTO-GENERATED MODELS AS DATA FILE. DO NOT EDIT.
+extensions:
+  - addsTo:
+      pack: codeql/rust-all
+      extensible: summaryModel
+    data:
+      - ["repo::stdarch_examples", "<crate::List>::add", "Argument[0]", "Argument[self].Field[crate::List::p_move].Element", "value", "dfc-generated"]
+      - ["repo::stdarch_examples", "<crate::List>::size", "Argument[self].Field[crate::List::p_size]", "ReturnValue", "value", "dfc-generated"]
diff --git a/rust/ql/lib/ext/generated/rust/repo-test_helpers.model.yml b/rust/ql/lib/ext/generated/rust/repo-test_helpers.model.yml
new file mode 100644
index 00000000000..abd558c419b
--- /dev/null
+++ b/rust/ql/lib/ext/generated/rust/repo-test_helpers.model.yml
@@ -0,0 +1,12 @@
+# THIS FILE IS AN AUTO-GENERATED MODELS AS DATA FILE. DO NOT EDIT.
+extensions:
+  - addsTo:
+      pack: codeql/rust-all
+      extensible: summaryModel
+    data:
+      - ["repo::test_helpers", "<crate::array::ArrayValueTree as crate::strategy::traits::ValueTree>::simplify", "Argument[self].Field[crate::array::ArrayValueTree::shrinker]", "Argument[self].Field[crate::array::ArrayValueTree::last_shrinker].Field[crate::option::Option::Some(0)]", "value", "dfc-generated"]
+      - ["repo::test_helpers", "<crate::array::UniformArrayStrategy>::new", "Argument[0]", "ReturnValue.Field[crate::array::UniformArrayStrategy::strategy]", "value", "dfc-generated"]
+      - ["repo::test_helpers", "<f32 as crate::subnormals::FlushSubnormals>::flush", "Argument[self]", "ReturnValue", "value", "dfc-generated"]
+      - ["repo::test_helpers", "<f64 as crate::subnormals::FlushSubnormals>::flush", "Argument[self]", "ReturnValue", "value", "dfc-generated"]
+      - ["repo::test_helpers", "crate::subnormals::flush", "Argument[0]", "ReturnValue", "value", "dfc-generated"]
+      - ["repo::test_helpers", "crate::subnormals::flush_in", "Argument[0]", "ReturnValue", "value", "dfc-generated"]
diff --git a/rust/ql/lib/ext/generated/serde/repo-https-github.com-serde-rs-serde-serde.model.yml b/rust/ql/lib/ext/generated/serde/repo-https-github.com-serde-rs-serde-serde.model.yml
index 68cd535dce3..0ed861dcd2f 100644
--- a/rust/ql/lib/ext/generated/serde/repo-https-github.com-serde-rs-serde-serde.model.yml
+++ b/rust/ql/lib/ext/generated/serde/repo-https-github.com-serde-rs-serde-serde.model.yml
@@ -7,6 +7,7 @@ extensions:
       - ["repo:https://github.com/serde-rs/serde:serde", "<&[u8] as crate::__private::de::IdentifierDeserializer>::from", "Argument[self]", "ReturnValue.Field[crate::de::value::BytesDeserializer::value]", "value", "dfc-generated"]
       - ["repo:https://github.com/serde-rs/serde:serde", "<&[u8] as crate::de::IntoDeserializer>::into_deserializer", "Argument[self]", "ReturnValue.Field[crate::de::value::BytesDeserializer::value]", "value", "dfc-generated"]
       - ["repo:https://github.com/serde-rs/serde:serde", "<&crate::__private::de::content::Content as crate::de::IntoDeserializer>::into_deserializer", "Argument[self]", "ReturnValue.Field[crate::__private::de::content::ContentRefDeserializer::content]", "value", "dfc-generated"]
+      - ["repo:https://github.com/serde-rs/serde:serde", "<&mut crate::fmt::Formatter as crate::ser::Serializer>::serialize_unit_variant", "Argument[2]", "ReturnValue", "taint", "df-generated"]
       - ["repo:https://github.com/serde-rs/serde:serde", "<&str as crate::__private::de::IdentifierDeserializer>::from", "Argument[self]", "ReturnValue.Field[crate::__private::de::StrDeserializer::value]", "value", "dfc-generated"]
       - ["repo:https://github.com/serde-rs/serde:serde", "<&str as crate::de::IntoDeserializer>::into_deserializer", "Argument[self]", "ReturnValue.Field[crate::de::value::StrDeserializer::value]", "value", "dfc-generated"]
       - ["repo:https://github.com/serde-rs/serde:serde", "<bool as crate::de::IntoDeserializer>::into_deserializer", "Argument[self]", "ReturnValue.Field[crate::de::value::BoolDeserializer::value]", "value", "dfc-generated"]
@@ -198,6 +199,7 @@ extensions:
       - ["repo:https://github.com/serde-rs/serde:serde", "<u128 as crate::de::IntoDeserializer>::into_deserializer", "Argument[self]", "ReturnValue.Field[crate::de::value::U128Deserializer::value]", "value", "dfc-generated"]
       - ["repo:https://github.com/serde-rs/serde:serde", "<u16 as crate::de::IntoDeserializer>::into_deserializer", "Argument[self]", "ReturnValue.Field[crate::de::value::U16Deserializer::value]", "value", "dfc-generated"]
       - ["repo:https://github.com/serde-rs/serde:serde", "<u32 as crate::de::IntoDeserializer>::into_deserializer", "Argument[self]", "ReturnValue.Field[crate::de::value::U32Deserializer::value]", "value", "dfc-generated"]
+      - ["repo:https://github.com/serde-rs/serde:serde", "<u64 as crate::__private::de::IdentifierDeserializer>::from", "Argument[self]", "ReturnValue.Field[crate::de::value::U64Deserializer::value]", "value", "dfc-generated"]
       - ["repo:https://github.com/serde-rs/serde:serde", "<u64 as crate::de::IntoDeserializer>::into_deserializer", "Argument[self]", "ReturnValue.Field[crate::de::value::U64Deserializer::value]", "value", "dfc-generated"]
       - ["repo:https://github.com/serde-rs/serde:serde", "<u8 as crate::de::IntoDeserializer>::into_deserializer", "Argument[self]", "ReturnValue.Field[crate::de::value::U8Deserializer::value]", "value", "dfc-generated"]
       - ["repo:https://github.com/serde-rs/serde:serde", "<usize as crate::de::IntoDeserializer>::into_deserializer", "Argument[self]", "ReturnValue.Field[crate::de::value::UsizeDeserializer::value]", "value", "dfc-generated"]
@@ -205,3 +207,8 @@ extensions:
       - ["repo:https://github.com/serde-rs/serde:serde", "crate::de::size_hint::cautious", "Argument[0].Field[crate::option::Option::Some(0)]", "ReturnValue", "value", "dfc-generated"]
       - ["repo:https://github.com/serde-rs/serde:serde", "crate::de::value::private::map_as_enum", "Argument[0]", "ReturnValue.Field[crate::de::value::private::MapAsEnum::map]", "value", "dfc-generated"]
       - ["repo:https://github.com/serde-rs/serde:serde", "crate::de::value::private::unit_only", "Argument[0]", "ReturnValue.Field[0]", "value", "dfc-generated"]
+  - addsTo:
+      pack: codeql/rust-all
+      extensible: sinkModel
+    data:
+      - ["repo:https://github.com/serde-rs/serde:serde", "<crate::__private::ser::TaggedSerializer as crate::ser::Serializer>::serialize_map", "Argument[0]", "pointer-access", "df-generated"]
diff --git a/rust/ql/lib/ext/generated/serde/repo-https-github.com-serde-rs-serde-serde_derive.model.yml b/rust/ql/lib/ext/generated/serde/repo-https-github.com-serde-rs-serde-serde_derive.model.yml
index f60417ee9fb..f905c601f06 100644
--- a/rust/ql/lib/ext/generated/serde/repo-https-github.com-serde-rs-serde-serde_derive.model.yml
+++ b/rust/ql/lib/ext/generated/serde/repo-https-github.com-serde-rs-serde-serde_derive.model.yml
@@ -7,7 +7,6 @@ extensions:
       - ["repo:https://github.com/serde-rs/serde:serde_derive", "<crate::fragment::Fragment as crate::convert::AsRef>::as_ref", "Argument[self].Field[crate::fragment::Fragment::Block(0)]", "ReturnValue", "value", "dfc-generated"]
       - ["repo:https://github.com/serde-rs/serde:serde_derive", "<crate::fragment::Fragment as crate::convert::AsRef>::as_ref", "Argument[self].Field[crate::fragment::Fragment::Expr(0)]", "ReturnValue", "value", "dfc-generated"]
       - ["repo:https://github.com/serde-rs/serde:serde_derive", "<crate::internals::ast::Container>::from_ast", "Argument[1].Reference", "ReturnValue.Field[crate::option::Option::Some(0)].Field[crate::internals::ast::Container::ident]", "value", "dfc-generated"]
-      - ["repo:https://github.com/serde-rs/serde:serde_derive", "<crate::internals::ast::Container>::from_ast", "Argument[1]", "ReturnValue.Field[crate::option::Option::Some(0)].Field[crate::internals::ast::Container::ident]", "value", "dfc-generated"]
       - ["repo:https://github.com/serde-rs/serde:serde_derive", "<crate::internals::ast::Container>::from_ast", "Argument[1]", "ReturnValue.Field[crate::option::Option::Some(0)].Field[crate::internals::ast::Container::original]", "value", "dfc-generated"]
       - ["repo:https://github.com/serde-rs/serde:serde_derive", "<crate::internals::attr::Attr>::get", "Argument[self].Field[crate::internals::attr::Attr::value]", "ReturnValue", "value", "dfc-generated"]
       - ["repo:https://github.com/serde-rs/serde:serde_derive", "<crate::internals::attr::Container>::custom_serde_path", "Argument[self].Field[crate::internals::attr::Container::serde_path].Field[crate::option::Option::Some(0)]", "ReturnValue.Field[crate::option::Option::Some(0)].Reference", "value", "dfc-generated"]
@@ -23,6 +22,7 @@ extensions:
       - ["repo:https://github.com/serde-rs/serde:serde_derive", "<crate::internals::attr::Container>::rename_all_fields_rules", "Argument[self].Field[crate::internals::attr::Container::rename_all_fields_rules]", "ReturnValue", "value", "dfc-generated"]
       - ["repo:https://github.com/serde-rs/serde:serde_derive", "<crate::internals::attr::Container>::rename_all_rules", "Argument[self].Field[crate::internals::attr::Container::rename_all_rules]", "ReturnValue", "value", "dfc-generated"]
       - ["repo:https://github.com/serde-rs/serde:serde_derive", "<crate::internals::attr::Container>::ser_bound", "Argument[self]", "ReturnValue", "taint", "df-generated"]
+      - ["repo:https://github.com/serde-rs/serde:serde_derive", "<crate::internals::attr::Container>::serde_path", "Argument[self].Field[crate::internals::attr::Container::serde_path].Field[crate::option::Option::Some(0)]", "ReturnValue.Field[crate::result::Result::Ok(0)]", "value", "dfc-generated"]
       - ["repo:https://github.com/serde-rs/serde:serde_derive", "<crate::internals::attr::Container>::tag", "Argument[self].Field[crate::internals::attr::Container::tag]", "ReturnValue.Reference", "value", "dfc-generated"]
       - ["repo:https://github.com/serde-rs/serde:serde_derive", "<crate::internals::attr::Container>::transparent", "Argument[self].Field[crate::internals::attr::Container::transparent]", "ReturnValue", "value", "dfc-generated"]
       - ["repo:https://github.com/serde-rs/serde:serde_derive", "<crate::internals::attr::Container>::type_from", "Argument[self].Field[crate::internals::attr::Container::type_from].Field[crate::option::Option::Some(0)]", "ReturnValue.Field[crate::option::Option::Some(0)].Reference", "value", "dfc-generated"]
@@ -66,7 +66,6 @@ extensions:
       - ["repo:https://github.com/serde-rs/serde:serde_derive", "<crate::internals::name::MultiName>::deserialize_name", "Argument[self].Field[crate::internals::name::MultiName::deserialize]", "ReturnValue.Reference", "value", "dfc-generated"]
       - ["repo:https://github.com/serde-rs/serde:serde_derive", "<crate::internals::name::MultiName>::from_attrs", "Argument[0].Reference", "ReturnValue.Field[crate::internals::name::MultiName::serialize]", "value", "dfc-generated"]
       - ["repo:https://github.com/serde-rs/serde:serde_derive", "<crate::internals::name::MultiName>::from_attrs", "Argument[0]", "ReturnValue.Field[crate::internals::name::MultiName::deserialize]", "value", "dfc-generated"]
-      - ["repo:https://github.com/serde-rs/serde:serde_derive", "<crate::internals::name::MultiName>::from_attrs", "Argument[0]", "ReturnValue.Field[crate::internals::name::MultiName::serialize]", "value", "dfc-generated"]
       - ["repo:https://github.com/serde-rs/serde:serde_derive", "<crate::internals::name::MultiName>::from_attrs", "Argument[1].Field[crate::internals::attr::Attr::value].Field[crate::option::Option::Some(0)]", "ReturnValue.Field[crate::internals::name::MultiName::serialize]", "value", "dfc-generated"]
       - ["repo:https://github.com/serde-rs/serde:serde_derive", "<crate::internals::name::MultiName>::from_attrs", "Argument[2].Field[crate::internals::attr::Attr::value].Field[crate::option::Option::Some(0)]", "ReturnValue.Field[crate::internals::name::MultiName::deserialize]", "value", "dfc-generated"]
       - ["repo:https://github.com/serde-rs/serde:serde_derive", "<crate::internals::name::MultiName>::serialize_name", "Argument[self].Field[crate::internals::name::MultiName::serialize]", "ReturnValue.Reference", "value", "dfc-generated"]
diff --git a/rust/ql/lib/ext/generated/smallvec/repo-https-github.com-servo-rust-smallvec-smallvec.model.yml b/rust/ql/lib/ext/generated/smallvec/repo-https-github.com-servo-rust-smallvec-smallvec.model.yml
index d0ca9a01761..06b8cdda4be 100644
--- a/rust/ql/lib/ext/generated/smallvec/repo-https-github.com-servo-rust-smallvec-smallvec.model.yml
+++ b/rust/ql/lib/ext/generated/smallvec/repo-https-github.com-servo-rust-smallvec-smallvec.model.yml
@@ -17,15 +17,20 @@ extensions:
       - ["repo:https://github.com/servo/rust-smallvec:smallvec", "<crate::SmallVec as crate::ops::index::IndexMut>::index_mut", "Argument[self]", "ReturnValue", "taint", "df-generated"]
       - ["repo:https://github.com/servo/rust-smallvec:smallvec", "<crate::SmallVec>::as_mut_slice", "Argument[self]", "ReturnValue", "value", "dfc-generated"]
       - ["repo:https://github.com/servo/rust-smallvec:smallvec", "<crate::SmallVec>::as_slice", "Argument[self]", "ReturnValue", "value", "dfc-generated"]
-      - ["repo:https://github.com/servo/rust-smallvec:smallvec", "<crate::SmallVec>::drain", "Argument[self]", "ReturnValue", "taint", "df-generated"]
+      - ["repo:https://github.com/servo/rust-smallvec:smallvec", "<crate::SmallVec>::capacity", "Argument[self].Field[crate::SmallVec::capacity]", "ReturnValue", "value", "dfc-generated"]
+      - ["repo:https://github.com/servo/rust-smallvec:smallvec", "<crate::SmallVec>::drain", "Argument[self].Field[crate::SmallVec::capacity]", "ReturnValue.Field[crate::Drain::tail_start]", "value", "dfc-generated"]
       - ["repo:https://github.com/servo/rust-smallvec:smallvec", "<crate::SmallVec>::drain_filter", "Argument[0]", "ReturnValue.Field[crate::DrainFilter::pred]", "value", "dfc-generated"]
+      - ["repo:https://github.com/servo/rust-smallvec:smallvec", "<crate::SmallVec>::drain_filter", "Argument[self].Field[crate::SmallVec::capacity]", "ReturnValue.Field[crate::DrainFilter::old_len]", "value", "dfc-generated"]
       - ["repo:https://github.com/servo/rust-smallvec:smallvec", "<crate::SmallVec>::drain_filter", "Argument[self]", "ReturnValue.Field[crate::DrainFilter::vec]", "value", "dfc-generated"]
       - ["repo:https://github.com/servo/rust-smallvec:smallvec", "<crate::SmallVec>::from_buf_and_len", "Argument[1]", "ReturnValue.Field[crate::SmallVec::capacity]", "value", "dfc-generated"]
       - ["repo:https://github.com/servo/rust-smallvec:smallvec", "<crate::SmallVec>::from_buf_and_len_unchecked", "Argument[1]", "ReturnValue.Field[crate::SmallVec::capacity]", "value", "dfc-generated"]
       - ["repo:https://github.com/servo/rust-smallvec:smallvec", "<crate::SmallVec>::from_const_with_len_unchecked", "Argument[1]", "ReturnValue.Field[crate::SmallVec::capacity]", "value", "dfc-generated"]
       - ["repo:https://github.com/servo/rust-smallvec:smallvec", "<crate::SmallVec>::from_raw_parts", "Argument[2]", "ReturnValue.Field[crate::SmallVec::capacity]", "value", "dfc-generated"]
+      - ["repo:https://github.com/servo/rust-smallvec:smallvec", "<crate::SmallVec>::grow", "Argument[0]", "Argument[self].Field[crate::SmallVec::capacity]", "value", "dfc-generated"]
       - ["repo:https://github.com/servo/rust-smallvec:smallvec", "<crate::SmallVec>::into_inner", "Argument[self]", "ReturnValue.Field[crate::result::Result::Err(0)]", "value", "dfc-generated"]
+      - ["repo:https://github.com/servo/rust-smallvec:smallvec", "<crate::SmallVec>::len", "Argument[self].Field[crate::SmallVec::capacity]", "ReturnValue", "value", "dfc-generated"]
       - ["repo:https://github.com/servo/rust-smallvec:smallvec", "<crate::SmallVec>::retain", "Argument[self].Element", "Argument[0].Parameter[0].Reference", "value", "dfc-generated"]
+      - ["repo:https://github.com/servo/rust-smallvec:smallvec", "<crate::SmallVec>::retain_mut", "Argument[self].Element", "Argument[0].Parameter[0].Reference", "value", "dfc-generated"]
       - ["repo:https://github.com/servo/rust-smallvec:smallvec", "<crate::SmallVec>::try_grow", "Argument[0]", "Argument[self].Field[crate::SmallVec::capacity]", "value", "dfc-generated"]
       - ["repo:https://github.com/servo/rust-smallvec:smallvec", "<crate::tests::MockHintIter as crate::iter::traits::iterator::Iterator>::next", "Argument[self].Field[crate::tests::MockHintIter::x].Element", "ReturnValue.Field[crate::option::Option::Some(0)]", "value", "dfc-generated"]
       - ["repo:https://github.com/servo/rust-smallvec:smallvec", "<crate::tests::MockHintIter as crate::iter::traits::iterator::Iterator>::size_hint", "Argument[self].Field[crate::tests::MockHintIter::hint]", "ReturnValue.Field[0]", "value", "dfc-generated"]
@@ -35,6 +40,10 @@ extensions:
       extensible: sinkModel
     data:
       - ["repo:https://github.com/servo/rust-smallvec:smallvec", "<crate::SmallVec>::into_inner", "Argument[self]", "pointer-access", "df-generated"]
+      - ["repo:https://github.com/servo/rust-smallvec:smallvec", "<crate::vec::Vec as crate::Vector>::insert", "Argument[0]", "log-injection", "df-generated"]
+      - ["repo:https://github.com/servo/rust-smallvec:smallvec", "<crate::vec::Vec as crate::Vector>::insert", "Argument[self]", "log-injection", "df-generated"]
+      - ["repo:https://github.com/servo/rust-smallvec:smallvec", "<crate::vec::Vec as crate::Vector>::remove", "Argument[0]", "log-injection", "df-generated"]
+      - ["repo:https://github.com/servo/rust-smallvec:smallvec", "<crate::vec::Vec as crate::Vector>::remove", "Argument[self]", "log-injection", "df-generated"]
   - addsTo:
       pack: codeql/rust-all
       extensible: sourceModel
diff --git a/rust/ql/lib/ext/generated/tokio/repo-examples.model.yml b/rust/ql/lib/ext/generated/tokio/repo-examples.model.yml
new file mode 100644
index 00000000000..6ad582e06bf
--- /dev/null
+++ b/rust/ql/lib/ext/generated/tokio/repo-examples.model.yml
@@ -0,0 +1,7 @@
+# THIS FILE IS AN AUTO-GENERATED MODELS AS DATA FILE. DO NOT EDIT.
+extensions:
+  - addsTo:
+      pack: codeql/rust-all
+      extensible: sourceModel
+    data:
+      - ["repo::examples", "crate::connect", "ReturnValue", "remote", "df-generated"]
diff --git a/rust/ql/lib/ext/generated/tokio/repo-https-github.com-tokio-rs-tokio-tokio-stream.model.yml b/rust/ql/lib/ext/generated/tokio/repo-https-github.com-tokio-rs-tokio-tokio-stream.model.yml
index 76217f9951f..d66baaafdba 100644
--- a/rust/ql/lib/ext/generated/tokio/repo-https-github.com-tokio-rs-tokio-tokio-stream.model.yml
+++ b/rust/ql/lib/ext/generated/tokio/repo-https-github.com-tokio-rs-tokio-tokio-stream.model.yml
@@ -28,13 +28,10 @@ extensions:
       - ["repo:https://github.com/tokio-rs/tokio:tokio-stream", "<crate::stream_ext::map_while::MapWhile>::new", "Argument[0]", "ReturnValue.Field[crate::stream_ext::map_while::MapWhile::stream]", "value", "dfc-generated"]
       - ["repo:https://github.com/tokio-rs/tokio:tokio-stream", "<crate::stream_ext::map_while::MapWhile>::new", "Argument[1]", "ReturnValue.Field[crate::stream_ext::map_while::MapWhile::f]", "value", "dfc-generated"]
       - ["repo:https://github.com/tokio-rs/tokio:tokio-stream", "<crate::stream_ext::next::Next>::new", "Argument[0]", "ReturnValue.Field[crate::stream_ext::next::Next::stream]", "value", "dfc-generated"]
-      - ["repo:https://github.com/tokio-rs/tokio:tokio-stream", "<crate::stream_ext::peekable::Peekable>::peek", "Argument[self].Field[crate::stream_ext::peekable::Peekable::peek].Field[crate::option::Option::Some(0)]", "ReturnValue.Field[crate::option::Option::Some(0)].Reference", "value", "dfc-generated"]
-      - ["repo:https://github.com/tokio-rs/tokio:tokio-stream", "<crate::stream_ext::skip::Skip as crate::stream::Stream>::size_hint", "Argument[self]", "ReturnValue", "taint", "df-generated"]
       - ["repo:https://github.com/tokio-rs/tokio:tokio-stream", "<crate::stream_ext::skip::Skip>::new", "Argument[0]", "ReturnValue.Field[crate::stream_ext::skip::Skip::stream]", "value", "dfc-generated"]
       - ["repo:https://github.com/tokio-rs/tokio:tokio-stream", "<crate::stream_ext::skip::Skip>::new", "Argument[1]", "ReturnValue.Field[crate::stream_ext::skip::Skip::remaining]", "value", "dfc-generated"]
       - ["repo:https://github.com/tokio-rs/tokio:tokio-stream", "<crate::stream_ext::skip_while::SkipWhile>::new", "Argument[0]", "ReturnValue.Field[crate::stream_ext::skip_while::SkipWhile::stream]", "value", "dfc-generated"]
       - ["repo:https://github.com/tokio-rs/tokio:tokio-stream", "<crate::stream_ext::skip_while::SkipWhile>::new", "Argument[1]", "ReturnValue.Field[crate::stream_ext::skip_while::SkipWhile::predicate].Field[crate::option::Option::Some(0)]", "value", "dfc-generated"]
-      - ["repo:https://github.com/tokio-rs/tokio:tokio-stream", "<crate::stream_ext::take::Take as crate::stream::Stream>::size_hint", "Argument[self].Field[crate::stream_ext::take::Take::remaining]", "ReturnValue.Field[0]", "value", "dfc-generated"]
       - ["repo:https://github.com/tokio-rs/tokio:tokio-stream", "<crate::stream_ext::take::Take as crate::stream::Stream>::size_hint", "Argument[self].Field[crate::stream_ext::take::Take::remaining]", "ReturnValue.Field[1].Field[crate::option::Option::Some(0)]", "value", "dfc-generated"]
       - ["repo:https://github.com/tokio-rs/tokio:tokio-stream", "<crate::stream_ext::take::Take>::new", "Argument[0]", "ReturnValue.Field[crate::stream_ext::take::Take::stream]", "value", "dfc-generated"]
       - ["repo:https://github.com/tokio-rs/tokio:tokio-stream", "<crate::stream_ext::take::Take>::new", "Argument[1]", "ReturnValue.Field[crate::stream_ext::take::Take::remaining]", "value", "dfc-generated"]
@@ -48,8 +45,6 @@ extensions:
       - ["repo:https://github.com/tokio-rs/tokio:tokio-stream", "<crate::stream_ext::timeout::Timeout>::new", "Argument[1]", "ReturnValue.Field[crate::stream_ext::timeout::Timeout::duration]", "value", "dfc-generated"]
       - ["repo:https://github.com/tokio-rs/tokio:tokio-stream", "<crate::stream_ext::timeout_repeating::TimeoutRepeating>::new", "Argument[1]", "ReturnValue.Field[crate::stream_ext::timeout_repeating::TimeoutRepeating::interval]", "value", "dfc-generated"]
       - ["repo:https://github.com/tokio-rs/tokio:tokio-stream", "<crate::stream_ext::try_next::TryNext>::new", "Argument[0]", "ReturnValue.Field[crate::stream_ext::try_next::TryNext::inner].Field[crate::stream_ext::next::Next::stream]", "value", "dfc-generated"]
-      - ["repo:https://github.com/tokio-rs/tokio:tokio-stream", "<crate::string::String as crate::stream_ext::collect::sealed::FromStreamPriv>::finalize", "Argument[1].Reference", "ReturnValue", "value", "dfc-generated"]
-      - ["repo:https://github.com/tokio-rs/tokio:tokio-stream", "<crate::vec::Vec as crate::stream_ext::collect::sealed::FromStreamPriv>::finalize", "Argument[1].Reference", "ReturnValue", "value", "dfc-generated"]
       - ["repo:https://github.com/tokio-rs/tokio:tokio-stream", "<crate::wrappers::interval::IntervalStream as crate::convert::AsMut>::as_mut", "Argument[self].Field[crate::wrappers::interval::IntervalStream::inner]", "ReturnValue.Reference", "value", "dfc-generated"]
       - ["repo:https://github.com/tokio-rs/tokio:tokio-stream", "<crate::wrappers::interval::IntervalStream as crate::convert::AsRef>::as_ref", "Argument[self].Field[crate::wrappers::interval::IntervalStream::inner]", "ReturnValue.Reference", "value", "dfc-generated"]
       - ["repo:https://github.com/tokio-rs/tokio:tokio-stream", "<crate::wrappers::interval::IntervalStream>::into_inner", "Argument[self].Field[crate::wrappers::interval::IntervalStream::inner]", "ReturnValue", "value", "dfc-generated"]
diff --git a/rust/ql/lib/ext/generated/tokio/repo-https-github.com-tokio-rs-tokio-tokio-test.model.yml b/rust/ql/lib/ext/generated/tokio/repo-https-github.com-tokio-rs-tokio-tokio-test.model.yml
index cff2c622acf..22e6b5e0018 100644
--- a/rust/ql/lib/ext/generated/tokio/repo-https-github.com-tokio-rs-tokio-tokio-test.model.yml
+++ b/rust/ql/lib/ext/generated/tokio/repo-https-github.com-tokio-rs-tokio-tokio-test.model.yml
@@ -22,3 +22,5 @@ extensions:
       - ["repo:https://github.com/tokio-rs/tokio:tokio-test", "<crate::task::Spawn as crate::ops::deref::Deref>::deref", "Argument[self].Field[crate::task::Spawn::future]", "ReturnValue.Reference", "value", "dfc-generated"]
       - ["repo:https://github.com/tokio-rs/tokio:tokio-test", "<crate::task::Spawn as crate::ops::deref::DerefMut>::deref_mut", "Argument[self].Field[crate::task::Spawn::future]", "ReturnValue.Reference", "value", "dfc-generated"]
       - ["repo:https://github.com/tokio-rs/tokio:tokio-test", "<crate::task::Spawn>::enter", "Argument[0].ReturnValue", "ReturnValue", "value", "dfc-generated"]
+      - ["repo:https://github.com/tokio-rs/tokio:tokio-test", "<crate::task::Spawn>::into_inner", "Argument[self].Field[crate::task::Spawn::future].Reference", "ReturnValue", "value", "dfc-generated"]
+      - ["repo:https://github.com/tokio-rs/tokio:tokio-test", "crate::task::spawn", "Argument[0]", "ReturnValue.Field[crate::task::Spawn::future].Reference", "value", "dfc-generated"]
diff --git a/rust/ql/lib/ext/generated/tokio/repo-https-github.com-tokio-rs-tokio-tokio-util.model.yml b/rust/ql/lib/ext/generated/tokio/repo-https-github.com-tokio-rs-tokio-tokio-util.model.yml
index db6e6afc944..dac75811184 100644
--- a/rust/ql/lib/ext/generated/tokio/repo-https-github.com-tokio-rs-tokio-tokio-util.model.yml
+++ b/rust/ql/lib/ext/generated/tokio/repo-https-github.com-tokio-rs-tokio-tokio-util.model.yml
@@ -118,6 +118,12 @@ extensions:
       - ["repo:https://github.com/tokio-rs/tokio:tokio-util", "<crate::io::stream_reader::StreamReader>::new", "Argument[0]", "ReturnValue.Field[crate::io::stream_reader::StreamReader::inner]", "value", "dfc-generated"]
       - ["repo:https://github.com/tokio-rs/tokio:tokio-util", "<crate::io::sync_bridge::SyncIoBridge as crate::convert::AsMut>::as_mut", "Argument[self].Field[crate::io::sync_bridge::SyncIoBridge::src]", "ReturnValue.Reference", "value", "dfc-generated"]
       - ["repo:https://github.com/tokio-rs/tokio:tokio-util", "<crate::io::sync_bridge::SyncIoBridge as crate::convert::AsRef>::as_ref", "Argument[self].Field[crate::io::sync_bridge::SyncIoBridge::src]", "ReturnValue.Reference", "value", "dfc-generated"]
+      - ["repo:https://github.com/tokio-rs/tokio:tokio-util", "<crate::io::sync_bridge::SyncIoBridge as crate::io::BufRead>::read_line", "Argument[self]", "Argument[0]", "taint", "df-generated"]
+      - ["repo:https://github.com/tokio-rs/tokio:tokio-util", "<crate::io::sync_bridge::SyncIoBridge as crate::io::BufRead>::read_until", "Argument[self]", "Argument[1]", "taint", "df-generated"]
+      - ["repo:https://github.com/tokio-rs/tokio:tokio-util", "<crate::io::sync_bridge::SyncIoBridge as crate::io::Read>::read", "Argument[self]", "Argument[0]", "taint", "df-generated"]
+      - ["repo:https://github.com/tokio-rs/tokio:tokio-util", "<crate::io::sync_bridge::SyncIoBridge as crate::io::Read>::read_exact", "Argument[self]", "Argument[0]", "taint", "df-generated"]
+      - ["repo:https://github.com/tokio-rs/tokio:tokio-util", "<crate::io::sync_bridge::SyncIoBridge as crate::io::Read>::read_to_end", "Argument[self]", "Argument[0]", "taint", "df-generated"]
+      - ["repo:https://github.com/tokio-rs/tokio:tokio-util", "<crate::io::sync_bridge::SyncIoBridge as crate::io::Read>::read_to_string", "Argument[self]", "Argument[0]", "taint", "df-generated"]
       - ["repo:https://github.com/tokio-rs/tokio:tokio-util", "<crate::io::sync_bridge::SyncIoBridge>::into_inner", "Argument[self].Field[crate::io::sync_bridge::SyncIoBridge::src]", "ReturnValue", "value", "dfc-generated"]
       - ["repo:https://github.com/tokio-rs/tokio:tokio-util", "<crate::io::sync_bridge::SyncIoBridge>::new", "Argument[0]", "ReturnValue.Field[crate::io::sync_bridge::SyncIoBridge::src]", "value", "dfc-generated"]
       - ["repo:https://github.com/tokio-rs/tokio:tokio-util", "<crate::io::sync_bridge::SyncIoBridge>::new_with_handle", "Argument[0]", "ReturnValue.Field[crate::io::sync_bridge::SyncIoBridge::src]", "value", "dfc-generated"]
@@ -128,7 +134,6 @@ extensions:
       - ["repo:https://github.com/tokio-rs/tokio:tokio-util", "<crate::sync::cancellation_token::CancellationToken>::cancelled", "Argument[self]", "ReturnValue.Field[crate::sync::cancellation_token::WaitForCancellationFuture::cancellation_token]", "value", "dfc-generated"]
       - ["repo:https://github.com/tokio-rs/tokio:tokio-util", "<crate::sync::cancellation_token::CancellationToken>::cancelled_owned", "Argument[self]", "ReturnValue.Field[crate::sync::cancellation_token::WaitForCancellationFutureOwned::cancellation_token]", "value", "dfc-generated"]
       - ["repo:https://github.com/tokio-rs/tokio:tokio-util", "<crate::sync::cancellation_token::CancellationToken>::drop_guard", "Argument[self]", "ReturnValue.Field[crate::sync::cancellation_token::guard::DropGuard::inner].Field[crate::option::Option::Some(0)]", "value", "dfc-generated"]
-      - ["repo:https://github.com/tokio-rs/tokio:tokio-util", "<crate::sync::cancellation_token::guard::DropGuard>::disarm", "Argument[self].Field[crate::sync::cancellation_token::guard::DropGuard::inner].Field[crate::option::Option::Some(0)]", "ReturnValue", "value", "dfc-generated"]
       - ["repo:https://github.com/tokio-rs/tokio:tokio-util", "<crate::sync::cancellation_token::tree_node::TreeNode>::notified", "Argument[self].Field[crate::sync::cancellation_token::tree_node::TreeNode::waker]", "ReturnValue.Field[crate::sync::notify::Notified::notify].Reference", "value", "dfc-generated"]
       - ["repo:https://github.com/tokio-rs/tokio:tokio-util", "<crate::sync::cancellation_token::tree_node::TreeNode>::notified", "Argument[self].Field[crate::sync::cancellation_token::tree_node::TreeNode::waker]", "ReturnValue.Field[crate::sync::notify::Notified::notify]", "value", "dfc-generated"]
       - ["repo:https://github.com/tokio-rs/tokio:tokio-util", "<crate::sync::mpsc::PollSendError>::into_inner", "Argument[self].Field[0]", "ReturnValue", "value", "dfc-generated"]
@@ -136,7 +141,6 @@ extensions:
       - ["repo:https://github.com/tokio-rs/tokio:tokio-util", "<crate::sync::mpsc::PollSender as crate::clone::Clone>::clone", "Argument[self].Field[crate::sync::mpsc::PollSender::sender].Field[crate::option::Option::Some(0)]", "ReturnValue.Field[crate::sync::mpsc::PollSender::sender].Field[crate::option::Option::Some(0)]", "value", "dfc-generated"]
       - ["repo:https://github.com/tokio-rs/tokio:tokio-util", "<crate::sync::mpsc::PollSender as crate::clone::Clone>::clone", "Argument[self].Field[crate::sync::mpsc::PollSender::sender].Field[crate::option::Option::Some(0)]", "ReturnValue.Field[crate::sync::mpsc::PollSender::state].Field[crate::sync::mpsc::State::Idle(0)]", "value", "dfc-generated"]
       - ["repo:https://github.com/tokio-rs/tokio:tokio-util", "<crate::sync::mpsc::PollSender>::abort_send", "Argument[self].Field[crate::sync::mpsc::PollSender::sender].Field[crate::option::Option::Some(0)]", "Argument[self].Field[crate::sync::mpsc::PollSender::state].Field[crate::sync::mpsc::State::Idle(0)]", "value", "dfc-generated"]
-      - ["repo:https://github.com/tokio-rs/tokio:tokio-util", "<crate::sync::mpsc::PollSender>::get_ref", "Argument[self].Field[crate::sync::mpsc::PollSender::sender].Field[crate::option::Option::Some(0)]", "ReturnValue.Field[crate::option::Option::Some(0)].Reference", "value", "dfc-generated"]
       - ["repo:https://github.com/tokio-rs/tokio:tokio-util", "<crate::sync::mpsc::PollSender>::new", "Argument[0].Reference", "ReturnValue.Field[crate::sync::mpsc::PollSender::sender].Field[crate::option::Option::Some(0)]", "value", "dfc-generated"]
       - ["repo:https://github.com/tokio-rs/tokio:tokio-util", "<crate::sync::mpsc::PollSender>::new", "Argument[0]", "ReturnValue.Field[crate::sync::mpsc::PollSender::sender].Field[crate::option::Option::Some(0)]", "value", "dfc-generated"]
       - ["repo:https://github.com/tokio-rs/tokio:tokio-util", "<crate::sync::mpsc::PollSender>::new", "Argument[0]", "ReturnValue.Field[crate::sync::mpsc::PollSender::state].Field[crate::sync::mpsc::State::Idle(0)]", "value", "dfc-generated"]
@@ -145,6 +149,7 @@ extensions:
       - ["repo:https://github.com/tokio-rs/tokio:tokio-util", "<crate::sync::poll_semaphore::PollSemaphore>::clone_inner", "Argument[self].Field[crate::sync::poll_semaphore::PollSemaphore::semaphore].Reference", "ReturnValue", "value", "dfc-generated"]
       - ["repo:https://github.com/tokio-rs/tokio:tokio-util", "<crate::sync::poll_semaphore::PollSemaphore>::into_inner", "Argument[self].Field[crate::sync::poll_semaphore::PollSemaphore::semaphore]", "ReturnValue", "value", "dfc-generated"]
       - ["repo:https://github.com/tokio-rs/tokio:tokio-util", "<crate::sync::poll_semaphore::PollSemaphore>::new", "Argument[0]", "ReturnValue.Field[crate::sync::poll_semaphore::PollSemaphore::semaphore]", "value", "dfc-generated"]
+      - ["repo:https://github.com/tokio-rs/tokio:tokio-util", "<crate::sync::reusable_box::ReusableBoxFuture>::new", "Argument[0]", "ReturnValue.Field[crate::sync::reusable_box::ReusableBoxFuture::boxed].Reference", "value", "dfc-generated"]
       - ["repo:https://github.com/tokio-rs/tokio:tokio-util", "<crate::sync::reusable_box::ReusableBoxFuture>::try_set", "Argument[0]", "ReturnValue.Field[crate::result::Result::Err(0)]", "value", "dfc-generated"]
       - ["repo:https://github.com/tokio-rs/tokio:tokio-util", "<crate::task::abort_on_drop::AbortOnDropHandle as crate::convert::AsRef>::as_ref", "Argument[self].Field[0]", "ReturnValue.Reference", "value", "dfc-generated"]
       - ["repo:https://github.com/tokio-rs/tokio:tokio-util", "<crate::task::abort_on_drop::AbortOnDropHandle as crate::convert::AsRef>::as_ref", "Argument[self].Field[crate::task::abort_on_drop::AbortOnDropHandle(0)]", "ReturnValue.Reference", "value", "dfc-generated"]
@@ -160,8 +165,6 @@ extensions:
       - ["repo:https://github.com/tokio-rs/tokio:tokio-util", "<crate::task::task_tracker::TaskTrackerToken as crate::clone::Clone>::clone", "Argument[self].Field[crate::task::task_tracker::TaskTrackerToken::task_tracker]", "ReturnValue.Field[crate::task::task_tracker::TaskTrackerToken::task_tracker]", "value", "dfc-generated"]
       - ["repo:https://github.com/tokio-rs/tokio:tokio-util", "<crate::task::task_tracker::TaskTrackerToken>::task_tracker", "Argument[self].Field[crate::task::task_tracker::TaskTrackerToken::task_tracker]", "ReturnValue.Reference", "value", "dfc-generated"]
       - ["repo:https://github.com/tokio-rs/tokio:tokio-util", "<crate::time::delay_queue::DelayQueue>::deadline", "Argument[self]", "ReturnValue", "taint", "df-generated"]
-      - ["repo:https://github.com/tokio-rs/tokio:tokio-util", "<crate::time::delay_queue::DelayQueue>::peek", "Argument[self].Field[crate::time::delay_queue::DelayQueue::expired].Field[crate::time::delay_queue::Stack::head]", "ReturnValue", "value", "dfc-generated"]
-      - ["repo:https://github.com/tokio-rs/tokio:tokio-util", "<crate::time::delay_queue::DelayQueue>::poll_expired", "Argument[self]", "ReturnValue", "taint", "df-generated"]
       - ["repo:https://github.com/tokio-rs/tokio:tokio-util", "<crate::time::delay_queue::DelayQueue>::remove", "Argument[0].Field[crate::time::delay_queue::Key::index]", "ReturnValue.Field[crate::time::delay_queue::Expired::key].Field[crate::time::delay_queue::Key::index]", "value", "dfc-generated"]
       - ["repo:https://github.com/tokio-rs/tokio:tokio-util", "<crate::time::delay_queue::DelayQueue>::try_remove", "Argument[self]", "ReturnValue", "taint", "df-generated"]
       - ["repo:https://github.com/tokio-rs/tokio:tokio-util", "<crate::time::delay_queue::Expired>::deadline", "Argument[self].Field[crate::time::delay_queue::Expired::deadline]", "ReturnValue", "value", "dfc-generated"]
@@ -179,6 +182,7 @@ extensions:
       - ["repo:https://github.com/tokio-rs/tokio:tokio-util", "<crate::time::delay_queue::Stack as crate::time::wheel::stack::Stack>::push", "Argument[0]", "Argument[self].Field[crate::time::delay_queue::Stack::head].Field[crate::option::Option::Some(0)]", "value", "dfc-generated"]
       - ["repo:https://github.com/tokio-rs/tokio:tokio-util", "<crate::time::wheel::Wheel>::elapsed", "Argument[self].Field[crate::time::wheel::Wheel::elapsed]", "ReturnValue", "value", "dfc-generated"]
       - ["repo:https://github.com/tokio-rs/tokio:tokio-util", "<crate::time::wheel::Wheel>::insert", "Argument[1]", "ReturnValue.Field[crate::result::Result::Err(0)].Field[0]", "value", "dfc-generated"]
+      - ["repo:https://github.com/tokio-rs/tokio:tokio-util", "<crate::time::wheel::Wheel>::poll", "Argument[0]", "Argument[self].Field[crate::time::wheel::Wheel::elapsed]", "value", "dfc-generated"]
       - ["repo:https://github.com/tokio-rs/tokio:tokio-util", "<crate::time::wheel::level::Level>::new", "Argument[0]", "ReturnValue.Field[crate::time::wheel::level::Level::level]", "value", "dfc-generated"]
       - ["repo:https://github.com/tokio-rs/tokio:tokio-util", "<crate::time::wheel::level::Level>::next_expiration", "Argument[self].Field[crate::time::wheel::level::Level::level]", "ReturnValue.Field[crate::option::Option::Some(0)].Field[crate::time::wheel::level::Expiration::level]", "value", "dfc-generated"]
       - ["repo:https://github.com/tokio-rs/tokio:tokio-util", "<crate::udp::frame::UdpFramed>::codec", "Argument[self].Field[crate::udp::frame::UdpFramed::codec]", "ReturnValue.Reference", "value", "dfc-generated"]
@@ -199,8 +203,15 @@ extensions:
       - ["repo:https://github.com/tokio-rs/tokio:tokio-util", "<crate::Mock as crate::io::async_write::AsyncWrite>::poll_write", "Argument[1]", "log-injection", "df-generated"]
       - ["repo:https://github.com/tokio-rs/tokio:tokio-util", "<crate::SmallReader as crate::io::async_read::AsyncRead>::poll_read", "Argument[1]", "log-injection", "df-generated"]
       - ["repo:https://github.com/tokio-rs/tokio:tokio-util", "<crate::io::stream_reader::StreamReader as crate::io::async_read::AsyncRead>::poll_read", "Argument[1]", "log-injection", "df-generated"]
+      - ["repo:https://github.com/tokio-rs/tokio:tokio-util", "<crate::time::delay_queue::DelayQueue>::poll_expired", "Argument[self]", "log-injection", "df-generated"]
+      - ["repo:https://github.com/tokio-rs/tokio:tokio-util", "<crate::time::delay_queue::DelayQueue>::remove", "Argument[self]", "log-injection", "df-generated"]
+      - ["repo:https://github.com/tokio-rs/tokio:tokio-util", "<crate::time::delay_queue::DelayQueue>::reset", "Argument[self]", "log-injection", "df-generated"]
+      - ["repo:https://github.com/tokio-rs/tokio:tokio-util", "<crate::time::delay_queue::DelayQueue>::reset_at", "Argument[self]", "log-injection", "df-generated"]
+      - ["repo:https://github.com/tokio-rs/tokio:tokio-util", "<crate::time::delay_queue::DelayQueue>::try_remove", "Argument[self]", "log-injection", "df-generated"]
       - ["repo:https://github.com/tokio-rs/tokio:tokio-util", "<crate::time::delay_queue::SlabStorage as crate::ops::index::Index>::index", "Argument[0]", "log-injection", "df-generated"]
       - ["repo:https://github.com/tokio-rs/tokio:tokio-util", "<crate::time::delay_queue::SlabStorage as crate::ops::index::IndexMut>::index_mut", "Argument[0]", "log-injection", "df-generated"]
+      - ["repo:https://github.com/tokio-rs/tokio:tokio-util", "<crate::time::wheel::Wheel>::poll", "Argument[0]", "log-injection", "df-generated"]
+      - ["repo:https://github.com/tokio-rs/tokio:tokio-util", "<crate::time::wheel::Wheel>::poll", "Argument[self]", "log-injection", "df-generated"]
       - ["repo:https://github.com/tokio-rs/tokio:tokio-util", "<crate::time::wheel::Wheel>::remove", "Argument[self]", "log-injection", "df-generated"]
       - ["repo:https://github.com/tokio-rs/tokio:tokio-util", "<crate::time::wheel::level::Level>::next_expiration", "Argument[0]", "log-injection", "df-generated"]
       - ["repo:https://github.com/tokio-rs/tokio:tokio-util", "<crate::time::wheel::level::Level>::next_expiration", "Argument[self]", "log-injection", "df-generated"]
diff --git a/rust/ql/lib/ext/generated/tokio/repo-https-github.com-tokio-rs-tokio-tokio.model.yml b/rust/ql/lib/ext/generated/tokio/repo-https-github.com-tokio-rs-tokio-tokio.model.yml
index 6790d9d9711..953f797c729 100644
--- a/rust/ql/lib/ext/generated/tokio/repo-https-github.com-tokio-rs-tokio-tokio.model.yml
+++ b/rust/ql/lib/ext/generated/tokio/repo-https-github.com-tokio-rs-tokio-tokio.model.yml
@@ -9,8 +9,6 @@ extensions:
       - ["repo:https://github.com/tokio-rs/tokio:tokio", "<&crate::task::wake::Waker as crate::sync::task::atomic_waker::WakerRef>::into_waker", "Argument[self].Reference", "ReturnValue", "value", "dfc-generated"]
       - ["repo:https://github.com/tokio-rs/tokio:tokio", "<&mut crate::runtime::scheduler::inject::synced::Synced as crate::runtime::scheduler::lock::Lock>::lock", "Argument[self]", "ReturnValue", "value", "dfc-generated"]
       - ["repo:https://github.com/tokio-rs/tokio:tokio", "<crate::MockWriter as crate::io::async_write::AsyncWrite>::is_write_vectored", "Argument[self].Field[crate::MockWriter::vectored]", "ReturnValue", "value", "dfc-generated"]
-      - ["repo:https://github.com/tokio-rs/tokio:tokio", "<crate::TempFifo as crate::convert::AsRef>::as_ref", "Argument[self].Field[crate::TempFifo::path]", "ReturnValue.Reference", "value", "dfc-generated"]
-      - ["repo:https://github.com/tokio-rs/tokio:tokio", "<crate::TempFifo as crate::convert::AsRef>::as_ref", "Argument[self].Field[crate::TempFifo::path]", "ReturnValue", "value", "dfc-generated"]
       - ["repo:https://github.com/tokio-rs/tokio:tokio", "<crate::fs::dir_builder::DirBuilder>::mode", "Argument[0]", "Argument[self].Field[crate::fs::dir_builder::DirBuilder::mode].Field[crate::option::Option::Some(0)]", "value", "dfc-generated"]
       - ["repo:https://github.com/tokio-rs/tokio:tokio", "<crate::fs::dir_builder::DirBuilder>::mode", "Argument[0]", "ReturnValue.Field[crate::fs::dir_builder::DirBuilder::mode].Field[crate::option::Option::Some(0)]", "value", "dfc-generated"]
       - ["repo:https://github.com/tokio-rs/tokio:tokio", "<crate::fs::dir_builder::DirBuilder>::mode", "Argument[self]", "ReturnValue", "value", "dfc-generated"]
@@ -18,7 +16,6 @@ extensions:
       - ["repo:https://github.com/tokio-rs/tokio:tokio", "<crate::fs::dir_builder::DirBuilder>::recursive", "Argument[0]", "ReturnValue.Field[crate::fs::dir_builder::DirBuilder::recursive]", "value", "dfc-generated"]
       - ["repo:https://github.com/tokio-rs/tokio:tokio", "<crate::fs::dir_builder::DirBuilder>::recursive", "Argument[self]", "ReturnValue", "value", "dfc-generated"]
       - ["repo:https://github.com/tokio-rs/tokio:tokio", "<crate::fs::file::File>::set_max_buf_size", "Argument[0]", "Argument[self].Field[crate::fs::file::File::max_buf_size]", "value", "dfc-generated"]
-      - ["repo:https://github.com/tokio-rs/tokio:tokio", "<crate::fs::file::File>::try_into_std", "Argument[self].Field[crate::fs::file::File::std]", "ReturnValue.Field[crate::result::Result::Err(0)].Field[crate::fs::file::File::std]", "value", "dfc-generated"]
       - ["repo:https://github.com/tokio-rs/tokio:tokio", "<crate::fs::file::File>::try_into_std", "Argument[self]", "ReturnValue.Field[crate::result::Result::Err(0)]", "value", "dfc-generated"]
       - ["repo:https://github.com/tokio-rs/tokio:tokio", "<crate::fs::open_options::OpenOptions as crate::convert::From>::from", "Argument[0]", "ReturnValue.Field[crate::fs::open_options::OpenOptions(0)]", "value", "dfc-generated"]
       - ["repo:https://github.com/tokio-rs/tokio:tokio", "<crate::fs::open_options::OpenOptions>::append", "Argument[self]", "ReturnValue", "value", "dfc-generated"]
@@ -32,8 +29,6 @@ extensions:
       - ["repo:https://github.com/tokio-rs/tokio:tokio", "<crate::fs::open_options::OpenOptions>::truncate", "Argument[self]", "ReturnValue", "value", "dfc-generated"]
       - ["repo:https://github.com/tokio-rs/tokio:tokio", "<crate::fs::open_options::OpenOptions>::write", "Argument[self]", "ReturnValue", "value", "dfc-generated"]
       - ["repo:https://github.com/tokio-rs/tokio:tokio", "<crate::fs::read_dir::DirEntry>::as_inner", "Argument[self].Field[crate::fs::read_dir::DirEntry::std]", "ReturnValue.Reference", "value", "dfc-generated"]
-      - ["repo:https://github.com/tokio-rs/tokio:tokio", "<crate::io::async_fd::AsyncFd>::get_mut", "Argument[self].Field[crate::io::async_fd::AsyncFd::inner].Field[crate::option::Option::Some(0)]", "ReturnValue.Reference", "value", "dfc-generated"]
-      - ["repo:https://github.com/tokio-rs/tokio:tokio", "<crate::io::async_fd::AsyncFd>::get_ref", "Argument[self].Field[crate::io::async_fd::AsyncFd::inner].Field[crate::option::Option::Some(0)]", "ReturnValue.Reference", "value", "dfc-generated"]
       - ["repo:https://github.com/tokio-rs/tokio:tokio", "<crate::io::async_fd::AsyncFd>::ready", "Argument[self]", "ReturnValue.Field[crate::result::Result::Ok(0)].Field[crate::io::async_fd::AsyncFdReadyGuard::async_fd]", "value", "dfc-generated"]
       - ["repo:https://github.com/tokio-rs/tokio:tokio", "<crate::io::async_fd::AsyncFd>::ready_mut", "Argument[self]", "ReturnValue.Field[crate::result::Result::Ok(0)].Field[crate::io::async_fd::AsyncFdReadyMutGuard::async_fd]", "value", "dfc-generated"]
       - ["repo:https://github.com/tokio-rs/tokio:tokio", "<crate::io::async_fd::AsyncFd>::try_io", "Argument[1].ReturnValue", "ReturnValue", "value", "dfc-generated"]
@@ -53,10 +48,7 @@ extensions:
       - ["repo:https://github.com/tokio-rs/tokio:tokio", "<crate::io::async_fd::AsyncFdTryNewError>::into_parts", "Argument[self].Field[crate::io::async_fd::AsyncFdTryNewError::inner]", "ReturnValue.Field[0]", "value", "dfc-generated"]
       - ["repo:https://github.com/tokio-rs/tokio:tokio", "<crate::io::blocking::Blocking>::new", "Argument[0]", "ReturnValue.Field[crate::io::blocking::Blocking::inner].Field[crate::option::Option::Some(0)]", "value", "dfc-generated"]
       - ["repo:https://github.com/tokio-rs/tokio:tokio", "<crate::io::blocking::Buf>::bytes", "Argument[self].Field[crate::io::blocking::Buf::buf].Element", "ReturnValue.Reference", "value", "dfc-generated"]
-      - ["repo:https://github.com/tokio-rs/tokio:tokio", "<crate::io::blocking::Buf>::copy_from", "Argument[1]", "ReturnValue", "value", "dfc-generated"]
       - ["repo:https://github.com/tokio-rs/tokio:tokio", "<crate::io::blocking::Buf>::copy_from_bufs", "Argument[1]", "ReturnValue", "taint", "df-generated"]
-      - ["repo:https://github.com/tokio-rs/tokio:tokio", "<crate::io::blocking::Buf>::copy_to", "Argument[0]", "ReturnValue", "taint", "df-generated"]
-      - ["repo:https://github.com/tokio-rs/tokio:tokio", "<crate::io::blocking::Buf>::copy_to", "Argument[self]", "ReturnValue", "taint", "df-generated"]
       - ["repo:https://github.com/tokio-rs/tokio:tokio", "<crate::io::blocking::Buf>::len", "Argument[self]", "ReturnValue", "taint", "df-generated"]
       - ["repo:https://github.com/tokio-rs/tokio:tokio", "<crate::io::error::Error as crate::convert::From>::from", "Argument[0].Field[crate::io::async_fd::AsyncFdTryNewError::cause]", "ReturnValue", "value", "dfc-generated"]
       - ["repo:https://github.com/tokio-rs/tokio:tokio", "<crate::io::error::Error as crate::convert::From>::from", "Argument[0].Field[crate::runtime::blocking::pool::SpawnError::NoThreads(0)]", "ReturnValue", "value", "dfc-generated"]
@@ -68,8 +60,6 @@ extensions:
       - ["repo:https://github.com/tokio-rs/tokio:tokio", "<crate::io::join::Join>::reader_mut", "Argument[self].Field[crate::io::join::Join::reader]", "ReturnValue.Reference", "value", "dfc-generated"]
       - ["repo:https://github.com/tokio-rs/tokio:tokio", "<crate::io::join::Join>::writer", "Argument[self].Field[crate::io::join::Join::writer]", "ReturnValue.Reference", "value", "dfc-generated"]
       - ["repo:https://github.com/tokio-rs/tokio:tokio", "<crate::io::join::Join>::writer_mut", "Argument[self].Field[crate::io::join::Join::writer]", "ReturnValue.Reference", "value", "dfc-generated"]
-      - ["repo:https://github.com/tokio-rs/tokio:tokio", "<crate::io::poll_evented::PollEvented as crate::ops::deref::Deref>::deref", "Argument[self].Field[crate::io::poll_evented::PollEvented::io].Field[crate::option::Option::Some(0)]", "ReturnValue.Reference", "value", "dfc-generated"]
-      - ["repo:https://github.com/tokio-rs/tokio:tokio", "<crate::io::poll_evented::PollEvented>::into_inner", "Argument[self].Field[crate::io::poll_evented::PollEvented::io].Field[crate::option::Option::Some(0)]", "ReturnValue.Field[crate::result::Result::Ok(0)]", "value", "dfc-generated"]
       - ["repo:https://github.com/tokio-rs/tokio:tokio", "<crate::io::poll_evented::PollEvented>::new_with_interest_and_handle", "Argument[2]", "ReturnValue.Field[crate::runtime::io::registration::Registration::handle]", "value", "dfc-generated"]
       - ["repo:https://github.com/tokio-rs/tokio:tokio", "<crate::io::poll_evented::PollEvented>::registration", "Argument[self].Field[crate::io::poll_evented::PollEvented::registration]", "ReturnValue.Reference", "value", "dfc-generated"]
       - ["repo:https://github.com/tokio-rs/tokio:tokio", "<crate::io::read_buf::ReadBuf as crate::buf::buf_mut::BufMut>::advance_mut", "Argument[0]", "Argument[self]", "taint", "df-generated"]
@@ -102,6 +92,7 @@ extensions:
       - ["repo:https://github.com/tokio-rs/tokio:tokio", "<crate::io::util::buf_reader::BufReader>::with_capacity", "Argument[1]", "ReturnValue.Field[crate::io::util::buf_reader::BufReader::inner]", "value", "dfc-generated"]
       - ["repo:https://github.com/tokio-rs/tokio:tokio", "<crate::io::util::buf_stream::BufStream as crate::convert::From>::from", "Argument[0]", "ReturnValue.Field[crate::io::util::buf_stream::BufStream::inner]", "value", "dfc-generated"]
       - ["repo:https://github.com/tokio-rs/tokio:tokio", "<crate::io::util::buf_stream::BufStream as crate::convert::From>::from", "Argument[0]", "ReturnValue", "taint", "df-generated"]
+      - ["repo:https://github.com/tokio-rs/tokio:tokio", "<crate::io::util::buf_stream::BufStream>::new", "Argument[0]", "ReturnValue", "taint", "df-generated"]
       - ["repo:https://github.com/tokio-rs/tokio:tokio", "<crate::io::util::buf_writer::BufWriter>::buffer", "Argument[self].Field[crate::io::util::buf_writer::BufWriter::buf]", "ReturnValue.Reference", "value", "dfc-generated"]
       - ["repo:https://github.com/tokio-rs/tokio:tokio", "<crate::io::util::buf_writer::BufWriter>::get_mut", "Argument[self].Field[crate::io::util::buf_writer::BufWriter::inner]", "ReturnValue.Reference", "value", "dfc-generated"]
       - ["repo:https://github.com/tokio-rs/tokio:tokio", "<crate::io::util::buf_writer::BufWriter>::get_ref", "Argument[self].Field[crate::io::util::buf_writer::BufWriter::inner]", "ReturnValue.Reference", "value", "dfc-generated"]
@@ -149,7 +140,6 @@ extensions:
       - ["repo:https://github.com/tokio-rs/tokio:tokio", "<crate::io::util::vec_with_initialized::VecWithInitialized>::apply_read_buf", "Argument[0].Field[crate::io::util::vec_with_initialized::ReadBufParts::initialized]", "Argument[self].Field[crate::io::util::vec_with_initialized::VecWithInitialized::num_initialized]", "value", "dfc-generated"]
       - ["repo:https://github.com/tokio-rs/tokio:tokio", "<crate::io::util::vec_with_initialized::VecWithInitialized>::get_read_buf", "Argument[self]", "ReturnValue", "taint", "df-generated"]
       - ["repo:https://github.com/tokio-rs/tokio:tokio", "<crate::io::util::vec_with_initialized::VecWithInitialized>::new", "Argument[0]", "ReturnValue.Field[crate::io::util::vec_with_initialized::VecWithInitialized::vec]", "value", "dfc-generated"]
-      - ["repo:https://github.com/tokio-rs/tokio:tokio", "<crate::io::util::vec_with_initialized::VecWithInitialized>::take", "Argument[self].Field[crate::io::util::vec_with_initialized::VecWithInitialized::vec]", "ReturnValue", "value", "dfc-generated"]
       - ["repo:https://github.com/tokio-rs/tokio:tokio", "<crate::io::util::write_int::WriteF32>::new", "Argument[0]", "ReturnValue.Field[crate::io::util::write_int::WriteF32::dst]", "value", "dfc-generated"]
       - ["repo:https://github.com/tokio-rs/tokio:tokio", "<crate::io::util::write_int::WriteF32Le>::new", "Argument[0]", "ReturnValue.Field[crate::io::util::write_int::WriteF32Le::dst]", "value", "dfc-generated"]
       - ["repo:https://github.com/tokio-rs/tokio:tokio", "<crate::io::util::write_int::WriteF64>::new", "Argument[0]", "ReturnValue.Field[crate::io::util::write_int::WriteF64::dst]", "value", "dfc-generated"]
@@ -174,36 +164,34 @@ extensions:
       - ["repo:https://github.com/tokio-rs/tokio:tokio", "<crate::io::util::write_int::WriteU64Le>::new", "Argument[0]", "ReturnValue.Field[crate::io::util::write_int::WriteU64Le::dst]", "value", "dfc-generated"]
       - ["repo:https://github.com/tokio-rs/tokio:tokio", "<crate::io::util::write_int::WriteU8>::new", "Argument[0]", "ReturnValue.Field[crate::io::util::write_int::WriteU8::dst]", "value", "dfc-generated"]
       - ["repo:https://github.com/tokio-rs/tokio:tokio", "<crate::io::util::write_int::WriteU8>::new", "Argument[1]", "ReturnValue.Field[crate::io::util::write_int::WriteU8::byte]", "value", "dfc-generated"]
-      - ["repo:https://github.com/tokio-rs/tokio:tokio", "<crate::loom::std::atomic_u16::AtomicU16 as crate::ops::deref::Deref>::deref", "Argument[self]", "ReturnValue", "taint", "df-generated"]
-      - ["repo:https://github.com/tokio-rs/tokio:tokio", "<crate::loom::std::atomic_u16::AtomicU16>::unsync_load", "Argument[self]", "ReturnValue", "taint", "df-generated"]
-      - ["repo:https://github.com/tokio-rs/tokio:tokio", "<crate::loom::std::atomic_u32::AtomicU32 as crate::ops::deref::Deref>::deref", "Argument[self]", "ReturnValue", "taint", "df-generated"]
-      - ["repo:https://github.com/tokio-rs/tokio:tokio", "<crate::loom::std::atomic_u32::AtomicU32>::unsync_load", "Argument[self]", "ReturnValue", "taint", "df-generated"]
-      - ["repo:https://github.com/tokio-rs/tokio:tokio", "<crate::loom::std::atomic_usize::AtomicUsize as crate::ops::deref::Deref>::deref", "Argument[self]", "ReturnValue", "taint", "df-generated"]
-      - ["repo:https://github.com/tokio-rs/tokio:tokio", "<crate::loom::std::atomic_usize::AtomicUsize as crate::ops::deref::DerefMut>::deref_mut", "Argument[self]", "ReturnValue", "taint", "df-generated"]
-      - ["repo:https://github.com/tokio-rs/tokio:tokio", "<crate::loom::std::atomic_usize::AtomicUsize>::unsync_load", "Argument[self]", "ReturnValue", "taint", "df-generated"]
       - ["repo:https://github.com/tokio-rs/tokio:tokio", "<crate::loom::std::atomic_usize::AtomicUsize>::with_mut", "Argument[0].ReturnValue", "ReturnValue", "value", "dfc-generated"]
       - ["repo:https://github.com/tokio-rs/tokio:tokio", "<crate::loom::std::barrier::Barrier>::new", "Argument[0]", "ReturnValue.Field[crate::loom::std::barrier::Barrier::num_threads]", "value", "dfc-generated"]
       - ["repo:https://github.com/tokio-rs/tokio:tokio", "<crate::loom::std::barrier::BarrierWaitResult>::is_leader", "Argument[self].Field[0]", "ReturnValue", "value", "dfc-generated"]
       - ["repo:https://github.com/tokio-rs/tokio:tokio", "<crate::loom::std::barrier::BarrierWaitResult>::is_leader", "Argument[self].Field[crate::loom::std::barrier::BarrierWaitResult(0)]", "ReturnValue", "value", "dfc-generated"]
       - ["repo:https://github.com/tokio-rs/tokio:tokio", "<crate::loom::std::parking_lot::Condvar>::wait", "Argument[0]", "ReturnValue.Field[crate::result::Result::Ok(0)]", "value", "dfc-generated"]
       - ["repo:https://github.com/tokio-rs/tokio:tokio", "<crate::loom::std::parking_lot::Condvar>::wait_timeout", "Argument[0]", "ReturnValue.Field[crate::result::Result::Ok(0)].Field[0]", "value", "dfc-generated"]
-      - ["repo:https://github.com/tokio-rs/tokio:tokio", "<crate::loom::std::rwlock::RwLock>::read", "Argument[self]", "ReturnValue", "taint", "df-generated"]
       - ["repo:https://github.com/tokio-rs/tokio:tokio", "<crate::loom::std::unsafe_cell::UnsafeCell>::with", "Argument[0].ReturnValue", "ReturnValue", "value", "dfc-generated"]
       - ["repo:https://github.com/tokio-rs/tokio:tokio", "<crate::loom::std::unsafe_cell::UnsafeCell>::with_mut", "Argument[0].ReturnValue", "ReturnValue", "value", "dfc-generated"]
       - ["repo:https://github.com/tokio-rs/tokio:tokio", "<crate::net::tcp::listener::TcpListener>::new", "Argument[0]", "ReturnValue.Field[crate::io::poll_evented::PollEvented::io].Field[crate::option::Option::Some(0)]", "value", "dfc-generated"]
       - ["repo:https://github.com/tokio-rs/tokio:tokio", "<crate::net::tcp::split::ReadHalf as crate::convert::AsRef>::as_ref", "Argument[self].Field[0]", "ReturnValue", "value", "dfc-generated"]
       - ["repo:https://github.com/tokio-rs/tokio:tokio", "<crate::net::tcp::split::ReadHalf as crate::convert::AsRef>::as_ref", "Argument[self].Field[crate::net::tcp::split::ReadHalf(0)]", "ReturnValue", "value", "dfc-generated"]
+      - ["repo:https://github.com/tokio-rs/tokio:tokio", "<crate::net::tcp::split::ReadHalf>::try_read", "Argument[self]", "Argument[0]", "taint", "df-generated"]
+      - ["repo:https://github.com/tokio-rs/tokio:tokio", "<crate::net::tcp::split::ReadHalf>::try_read_buf", "Argument[self]", "Argument[0]", "taint", "df-generated"]
       - ["repo:https://github.com/tokio-rs/tokio:tokio", "<crate::net::tcp::split::WriteHalf as crate::convert::AsRef>::as_ref", "Argument[self].Field[0]", "ReturnValue", "value", "dfc-generated"]
       - ["repo:https://github.com/tokio-rs/tokio:tokio", "<crate::net::tcp::split::WriteHalf as crate::convert::AsRef>::as_ref", "Argument[self].Field[crate::net::tcp::split::WriteHalf(0)]", "ReturnValue", "value", "dfc-generated"]
       - ["repo:https://github.com/tokio-rs/tokio:tokio", "<crate::net::tcp::split_owned::OwnedReadHalf as crate::convert::AsRef>::as_ref", "Argument[self].Field[crate::net::tcp::split_owned::OwnedReadHalf::inner]", "ReturnValue.Reference", "value", "dfc-generated"]
       - ["repo:https://github.com/tokio-rs/tokio:tokio", "<crate::net::tcp::split_owned::OwnedReadHalf>::reunite", "Argument[0]", "ReturnValue.Field[crate::result::Result::Err(0)].Field[crate::net::tcp::split_owned::ReuniteError(1)]", "value", "dfc-generated"]
       - ["repo:https://github.com/tokio-rs/tokio:tokio", "<crate::net::tcp::split_owned::OwnedReadHalf>::reunite", "Argument[self]", "ReturnValue.Field[crate::result::Result::Err(0)].Field[crate::net::tcp::split_owned::ReuniteError(0)]", "value", "dfc-generated"]
+      - ["repo:https://github.com/tokio-rs/tokio:tokio", "<crate::net::tcp::split_owned::OwnedReadHalf>::try_read", "Argument[self]", "Argument[0]", "taint", "df-generated"]
       - ["repo:https://github.com/tokio-rs/tokio:tokio", "<crate::net::tcp::split_owned::OwnedWriteHalf as crate::convert::AsRef>::as_ref", "Argument[self].Field[crate::net::tcp::split_owned::OwnedWriteHalf::inner]", "ReturnValue.Reference", "value", "dfc-generated"]
       - ["repo:https://github.com/tokio-rs/tokio:tokio", "<crate::net::tcp::split_owned::OwnedWriteHalf>::reunite", "Argument[0]", "ReturnValue.Field[crate::result::Result::Err(0)].Field[crate::net::tcp::split_owned::ReuniteError(0)]", "value", "dfc-generated"]
       - ["repo:https://github.com/tokio-rs/tokio:tokio", "<crate::net::tcp::split_owned::OwnedWriteHalf>::reunite", "Argument[self]", "ReturnValue.Field[crate::result::Result::Err(0)].Field[crate::net::tcp::split_owned::ReuniteError(1)]", "value", "dfc-generated"]
       - ["repo:https://github.com/tokio-rs/tokio:tokio", "<crate::net::tcp::stream::TcpStream>::new", "Argument[0]", "ReturnValue.Field[crate::io::poll_evented::PollEvented::io].Field[crate::option::Option::Some(0)]", "value", "dfc-generated"]
       - ["repo:https://github.com/tokio-rs/tokio:tokio", "<crate::net::tcp::stream::TcpStream>::split", "Argument[self]", "ReturnValue", "taint", "df-generated"]
       - ["repo:https://github.com/tokio-rs/tokio:tokio", "<crate::net::unix::listener::UnixListener>::new", "Argument[0]", "ReturnValue.Field[crate::io::poll_evented::PollEvented::io].Field[crate::option::Option::Some(0)]", "value", "dfc-generated"]
+      - ["repo:https://github.com/tokio-rs/tokio:tokio", "<crate::net::unix::pipe::OpenOptions>::read_write", "Argument[0]", "Argument[self].Field[crate::net::unix::pipe::OpenOptions::read_write]", "value", "dfc-generated"]
+      - ["repo:https://github.com/tokio-rs/tokio:tokio", "<crate::net::unix::pipe::OpenOptions>::read_write", "Argument[0]", "ReturnValue.Field[crate::net::unix::pipe::OpenOptions::read_write]", "value", "dfc-generated"]
+      - ["repo:https://github.com/tokio-rs/tokio:tokio", "<crate::net::unix::pipe::OpenOptions>::read_write", "Argument[self]", "ReturnValue", "value", "dfc-generated"]
       - ["repo:https://github.com/tokio-rs/tokio:tokio", "<crate::net::unix::pipe::OpenOptions>::unchecked", "Argument[0]", "Argument[self].Field[crate::net::unix::pipe::OpenOptions::unchecked]", "value", "dfc-generated"]
       - ["repo:https://github.com/tokio-rs/tokio:tokio", "<crate::net::unix::pipe::OpenOptions>::unchecked", "Argument[0]", "ReturnValue.Field[crate::net::unix::pipe::OpenOptions::unchecked]", "value", "dfc-generated"]
       - ["repo:https://github.com/tokio-rs/tokio:tokio", "<crate::net::unix::pipe::OpenOptions>::unchecked", "Argument[self]", "ReturnValue", "value", "dfc-generated"]
@@ -226,7 +214,6 @@ extensions:
       - ["repo:https://github.com/tokio-rs/tokio:tokio", "<crate::net::unix::ucred::UCred>::uid", "Argument[self].Field[crate::net::unix::ucred::UCred::uid]", "ReturnValue", "value", "dfc-generated"]
       - ["repo:https://github.com/tokio-rs/tokio:tokio", "<crate::os::unix::net::addr::SocketAddr as crate::convert::From>::from", "Argument[0].Field[0]", "ReturnValue", "value", "dfc-generated"]
       - ["repo:https://github.com/tokio-rs/tokio:tokio", "<crate::os::unix::net::addr::SocketAddr as crate::convert::From>::from", "Argument[0].Field[crate::net::unix::socketaddr::SocketAddr(0)]", "ReturnValue", "value", "dfc-generated"]
-      - ["repo:https://github.com/tokio-rs/tokio:tokio", "<crate::process::Child as crate::process::imp::orphan::Wait>::id", "Argument[self]", "ReturnValue", "taint", "df-generated"]
       - ["repo:https://github.com/tokio-rs/tokio:tokio", "<crate::process::Command as crate::convert::From>::from", "Argument[0]", "ReturnValue.Field[crate::process::Command::std]", "value", "dfc-generated"]
       - ["repo:https://github.com/tokio-rs/tokio:tokio", "<crate::process::Command>::arg0", "Argument[self]", "ReturnValue", "value", "dfc-generated"]
       - ["repo:https://github.com/tokio-rs/tokio:tokio", "<crate::process::Command>::arg", "Argument[self]", "ReturnValue", "value", "dfc-generated"]
@@ -250,7 +237,8 @@ extensions:
       - ["repo:https://github.com/tokio-rs/tokio:tokio", "<crate::process::Command>::stdin", "Argument[self]", "ReturnValue", "value", "dfc-generated"]
       - ["repo:https://github.com/tokio-rs/tokio:tokio", "<crate::process::Command>::stdout", "Argument[self]", "ReturnValue", "value", "dfc-generated"]
       - ["repo:https://github.com/tokio-rs/tokio:tokio", "<crate::process::Command>::uid", "Argument[self]", "ReturnValue", "value", "dfc-generated"]
-      - ["repo:https://github.com/tokio-rs/tokio:tokio", "<crate::process::imp::reap::Reaper>::inner_mut", "Argument[self].Field[crate::process::imp::reap::Reaper::inner].Field[crate::option::Option::Some(0)]", "ReturnValue.Reference", "value", "dfc-generated"]
+      - ["repo:https://github.com/tokio-rs/tokio:tokio", "<crate::process::imp::pidfd_reaper::PidfdReaper>::new", "Argument[0]", "ReturnValue.Field[crate::result::Result::Err(0)].Field[1]", "value", "dfc-generated"]
+      - ["repo:https://github.com/tokio-rs/tokio:tokio", "<crate::process::imp::pidfd_reaper::PidfdReaper>::new", "Argument[1]", "ReturnValue.Field[crate::result::Result::Ok(0)].Field[crate::process::imp::pidfd_reaper::PidfdReaper::orphan_queue]", "value", "dfc-generated"]
       - ["repo:https://github.com/tokio-rs/tokio:tokio", "<crate::process::imp::reap::Reaper>::new", "Argument[0]", "ReturnValue.Field[crate::process::imp::reap::Reaper::inner].Field[crate::option::Option::Some(0)]", "value", "dfc-generated"]
       - ["repo:https://github.com/tokio-rs/tokio:tokio", "<crate::process::imp::reap::Reaper>::new", "Argument[1]", "ReturnValue.Field[crate::process::imp::reap::Reaper::orphan_queue]", "value", "dfc-generated"]
       - ["repo:https://github.com/tokio-rs/tokio:tokio", "<crate::process::imp::reap::Reaper>::new", "Argument[2]", "ReturnValue.Field[crate::process::imp::reap::Reaper::signal]", "value", "dfc-generated"]
@@ -333,7 +321,6 @@ extensions:
       - ["repo:https://github.com/tokio-rs/tokio:tokio", "<crate::runtime::scheduler::inject::shared::Shared>::pop", "Argument[0].Field[crate::runtime::scheduler::inject::synced::Synced::head].Field[crate::option::Option::Some(0)]", "ReturnValue", "value", "dfc-generated"]
       - ["repo:https://github.com/tokio-rs/tokio:tokio", "<crate::runtime::scheduler::inject::shared::Shared>::pop", "Argument[0].Field[crate::runtime::scheduler::inject::synced::Synced::head].Field[crate::result::Result::Ok(0)]", "ReturnValue", "value", "dfc-generated"]
       - ["repo:https://github.com/tokio-rs/tokio:tokio", "<crate::runtime::scheduler::inject::shared::Shared>::pop_n", "Argument[0]", "ReturnValue.Field[crate::runtime::scheduler::inject::pop::Pop::synced]", "value", "dfc-generated"]
-      - ["repo:https://github.com/tokio-rs/tokio:tokio", "<crate::runtime::scheduler::inject::shared::Shared>::pop_n", "Argument[1]", "ReturnValue.Field[crate::runtime::scheduler::inject::pop::Pop::len]", "value", "dfc-generated"]
       - ["repo:https://github.com/tokio-rs/tokio:tokio", "<crate::runtime::scheduler::inject::shared::Shared>::push", "Argument[1]", "Argument[0]", "taint", "df-generated"]
       - ["repo:https://github.com/tokio-rs/tokio:tokio", "<crate::runtime::scheduler::inject::synced::Synced as crate::convert::AsMut>::as_mut", "Argument[self]", "ReturnValue", "value", "dfc-generated"]
       - ["repo:https://github.com/tokio-rs/tokio:tokio", "<crate::runtime::scheduler::inject::synced::Synced>::pop", "Argument[self].Field[crate::runtime::scheduler::inject::synced::Synced::head].Field[crate::option::Option::Some(0)]", "ReturnValue", "value", "dfc-generated"]
@@ -351,7 +338,11 @@ extensions:
       - ["repo:https://github.com/tokio-rs/tokio:tokio", "<crate::runtime::task::Notified>::into_raw", "Argument[self].Field[crate::runtime::task::Notified(0)].Field[crate::runtime::task::Task::raw]", "ReturnValue", "value", "dfc-generated"]
       - ["repo:https://github.com/tokio-rs/tokio:tokio", "<crate::runtime::task::Task as crate::util::linked_list::Link>::as_raw", "Argument[0].Field[crate::runtime::task::Task::raw].Field[crate::runtime::task::raw::RawTask::ptr]", "ReturnValue", "value", "dfc-generated"]
       - ["repo:https://github.com/tokio-rs/tokio:tokio", "<crate::runtime::task::Task as crate::util::linked_list::Link>::from_raw", "Argument[0]", "ReturnValue.Field[crate::runtime::task::Task::raw].Field[crate::runtime::task::raw::RawTask::ptr]", "value", "dfc-generated"]
+      - ["repo:https://github.com/tokio-rs/tokio:tokio", "<crate::runtime::task::UnownedTask>::into_notified", "Argument[self].Field[crate::runtime::task::UnownedTask::raw]", "ReturnValue.Field[crate::runtime::task::Notified(0)].Field[crate::runtime::task::Task::raw]", "value", "dfc-generated"]
       - ["repo:https://github.com/tokio-rs/tokio:tokio", "<crate::runtime::task::abort::AbortHandle>::new", "Argument[0]", "ReturnValue.Field[crate::runtime::task::abort::AbortHandle::raw]", "value", "dfc-generated"]
+      - ["repo:https://github.com/tokio-rs/tokio:tokio", "<crate::runtime::task::core::Cell>::new", "Argument[1]", "ReturnValue", "taint", "df-generated"]
+      - ["repo:https://github.com/tokio-rs/tokio:tokio", "<crate::runtime::task::core::Cell>::new", "Argument[2]", "ReturnValue", "taint", "df-generated"]
+      - ["repo:https://github.com/tokio-rs/tokio:tokio", "<crate::runtime::task::core::Cell>::new", "Argument[3]", "ReturnValue", "taint", "df-generated"]
       - ["repo:https://github.com/tokio-rs/tokio:tokio", "<crate::runtime::task::core::CoreStage>::with_mut", "Argument[0].ReturnValue", "ReturnValue", "value", "dfc-generated"]
       - ["repo:https://github.com/tokio-rs/tokio:tokio", "<crate::runtime::task::error::JoinError>::cancelled", "Argument[0]", "ReturnValue.Field[crate::runtime::task::error::JoinError::id]", "value", "dfc-generated"]
       - ["repo:https://github.com/tokio-rs/tokio:tokio", "<crate::runtime::task::error::JoinError>::id", "Argument[self].Field[crate::runtime::task::error::JoinError::id]", "ReturnValue", "value", "dfc-generated"]
@@ -375,21 +366,15 @@ extensions:
       - ["repo:https://github.com/tokio-rs/tokio:tokio", "<crate::runtime::time::entry::TimerEntry>::new", "Argument[1]", "ReturnValue.Field[crate::runtime::time::entry::TimerEntry::deadline]", "value", "dfc-generated"]
       - ["repo:https://github.com/tokio-rs/tokio:tokio", "<crate::runtime::time::entry::TimerShared as crate::util::linked_list::Link>::as_raw", "Argument[0].Field[crate::runtime::time::entry::TimerHandle::inner]", "ReturnValue", "value", "dfc-generated"]
       - ["repo:https://github.com/tokio-rs/tokio:tokio", "<crate::runtime::time::entry::TimerShared as crate::util::linked_list::Link>::from_raw", "Argument[0]", "ReturnValue.Field[crate::runtime::time::entry::TimerHandle::inner]", "value", "dfc-generated"]
-      - ["repo:https://github.com/tokio-rs/tokio:tokio", "<crate::runtime::time::entry::TimerShared>::handle", "Argument[self]", "ReturnValue", "taint", "df-generated"]
       - ["repo:https://github.com/tokio-rs/tokio:tokio", "<crate::runtime::time::handle::Handle>::time_source", "Argument[self].Field[crate::runtime::time::handle::Handle::time_source]", "ReturnValue.Reference", "value", "dfc-generated"]
       - ["repo:https://github.com/tokio-rs/tokio:tokio", "<crate::runtime::time::source::TimeSource>::start_time", "Argument[self].Field[crate::runtime::time::source::TimeSource::start_time]", "ReturnValue", "value", "dfc-generated"]
-      - ["repo:https://github.com/tokio-rs/tokio:tokio", "<crate::runtime::time::source::TimeSource>::tick_to_duration", "Argument[0]", "ReturnValue", "taint", "df-generated"]
       - ["repo:https://github.com/tokio-rs/tokio:tokio", "<crate::runtime::time::wheel::Wheel>::elapsed", "Argument[self].Field[crate::runtime::time::wheel::Wheel::elapsed]", "ReturnValue", "value", "dfc-generated"]
       - ["repo:https://github.com/tokio-rs/tokio:tokio", "<crate::runtime::time::wheel::Wheel>::insert", "Argument[0]", "ReturnValue.Field[crate::result::Result::Err(0)].Field[0]", "value", "dfc-generated"]
-      - ["repo:https://github.com/tokio-rs/tokio:tokio", "<crate::runtime::time::wheel::Wheel>::next_expiration_time", "Argument[self]", "ReturnValue", "taint", "df-generated"]
       - ["repo:https://github.com/tokio-rs/tokio:tokio", "<crate::runtime::time::wheel::Wheel>::poll", "Argument[0]", "Argument[self].Field[crate::runtime::time::wheel::Wheel::elapsed]", "value", "dfc-generated"]
-      - ["repo:https://github.com/tokio-rs/tokio:tokio", "<crate::runtime::time::wheel::Wheel>::poll_at", "Argument[self]", "ReturnValue", "taint", "df-generated"]
       - ["repo:https://github.com/tokio-rs/tokio:tokio", "<crate::runtime::time::wheel::level::Level>::new", "Argument[0]", "ReturnValue.Field[crate::runtime::time::wheel::level::Level::level]", "value", "dfc-generated"]
       - ["repo:https://github.com/tokio-rs/tokio:tokio", "<crate::runtime::time::wheel::level::Level>::next_expiration", "Argument[self].Field[crate::runtime::time::wheel::level::Level::level]", "ReturnValue.Field[crate::option::Option::Some(0)].Field[crate::runtime::time::wheel::level::Expiration::level]", "value", "dfc-generated"]
-      - ["repo:https://github.com/tokio-rs/tokio:tokio", "<crate::runtime::time::wheel::level::Level>::take_slot", "Argument[self].Field[crate::runtime::time::wheel::level::Level::slot].Element", "ReturnValue", "value", "dfc-generated"]
       - ["repo:https://github.com/tokio-rs/tokio:tokio", "<crate::signal::registry::Globals as crate::ops::deref::Deref>::deref", "Argument[self].Field[crate::signal::registry::Globals::extra]", "ReturnValue.Reference", "value", "dfc-generated"]
       - ["repo:https://github.com/tokio-rs/tokio:tokio", "<crate::signal::registry::Globals>::storage", "Argument[self].Field[crate::signal::registry::Globals::registry].Field[crate::signal::registry::Registry::storage]", "ReturnValue.Reference", "value", "dfc-generated"]
-      - ["repo:https://github.com/tokio-rs/tokio:tokio", "<crate::signal::reusable_box::ReusableBoxFuture>::set", "Argument[0]", "Argument[self]", "taint", "df-generated"]
       - ["repo:https://github.com/tokio-rs/tokio:tokio", "<crate::signal::reusable_box::ReusableBoxFuture>::try_set", "Argument[0]", "ReturnValue.Field[crate::result::Result::Err(0)]", "value", "dfc-generated"]
       - ["repo:https://github.com/tokio-rs/tokio:tokio", "<crate::signal::unix::SignalKind>::as_raw_value", "Argument[self].Field[0]", "ReturnValue", "value", "dfc-generated"]
       - ["repo:https://github.com/tokio-rs/tokio:tokio", "<crate::signal::unix::SignalKind>::as_raw_value", "Argument[self].Field[crate::signal::unix::SignalKind(0)]", "ReturnValue", "value", "dfc-generated"]
@@ -402,7 +387,6 @@ extensions:
       - ["repo:https://github.com/tokio-rs/tokio:tokio", "<crate::sync::barrier::BarrierWaitResult>::is_leader", "Argument[self].Field[crate::sync::barrier::BarrierWaitResult(0)]", "ReturnValue", "value", "dfc-generated"]
       - ["repo:https://github.com/tokio-rs/tokio:tokio", "<crate::sync::batch_semaphore::Semaphore>::acquire", "Argument[0]", "ReturnValue.Field[crate::sync::batch_semaphore::Acquire::num_permits]", "value", "dfc-generated"]
       - ["repo:https://github.com/tokio-rs/tokio:tokio", "<crate::sync::batch_semaphore::Semaphore>::acquire", "Argument[self]", "ReturnValue.Field[crate::sync::batch_semaphore::Acquire::semaphore]", "value", "dfc-generated"]
-      - ["repo:https://github.com/tokio-rs/tokio:tokio", "<crate::sync::batch_semaphore::Semaphore>::forget_permits", "Argument[0]", "ReturnValue", "value", "dfc-generated"]
       - ["repo:https://github.com/tokio-rs/tokio:tokio", "<crate::sync::batch_semaphore::Waiter as crate::util::linked_list::Link>::as_raw", "Argument[0].Reference", "ReturnValue", "value", "dfc-generated"]
       - ["repo:https://github.com/tokio-rs/tokio:tokio", "<crate::sync::batch_semaphore::Waiter as crate::util::linked_list::Link>::from_raw", "Argument[0]", "ReturnValue", "value", "dfc-generated"]
       - ["repo:https://github.com/tokio-rs/tokio:tokio", "<crate::sync::broadcast::Receiver>::len", "Argument[self]", "ReturnValue", "taint", "df-generated"]
@@ -415,8 +399,6 @@ extensions:
       - ["repo:https://github.com/tokio-rs/tokio:tokio", "<crate::sync::broadcast::Waiter as crate::util::linked_list::Link>::from_raw", "Argument[0]", "ReturnValue", "value", "dfc-generated"]
       - ["repo:https://github.com/tokio-rs/tokio:tokio", "<crate::sync::broadcast::WeakSender as crate::clone::Clone>::clone", "Argument[self].Field[crate::sync::broadcast::WeakSender::shared].Reference", "ReturnValue.Field[crate::sync::broadcast::WeakSender::shared]", "value", "dfc-generated"]
       - ["repo:https://github.com/tokio-rs/tokio:tokio", "<crate::sync::broadcast::WeakSender>::upgrade", "Argument[self].Field[crate::sync::broadcast::WeakSender::shared].Reference", "ReturnValue.Field[crate::option::Option::Some(0)].Field[crate::sync::broadcast::Sender::shared]", "value", "dfc-generated"]
-      - ["repo:https://github.com/tokio-rs/tokio:tokio", "<crate::sync::mpsc::bounded::OwnedPermit>::release", "Argument[self].Field[crate::sync::mpsc::bounded::OwnedPermit::chan].Field[crate::option::Option::Some(0)]", "ReturnValue.Field[crate::sync::mpsc::bounded::Sender::chan]", "value", "dfc-generated"]
-      - ["repo:https://github.com/tokio-rs/tokio:tokio", "<crate::sync::mpsc::bounded::OwnedPermit>::send", "Argument[self].Field[crate::sync::mpsc::bounded::OwnedPermit::chan].Field[crate::option::Option::Some(0)]", "ReturnValue.Field[crate::sync::mpsc::bounded::Sender::chan]", "value", "dfc-generated"]
       - ["repo:https://github.com/tokio-rs/tokio:tokio", "<crate::sync::mpsc::bounded::PermitIterator as crate::iter::traits::iterator::Iterator>::next", "Argument[self].Field[crate::sync::mpsc::bounded::PermitIterator::chan]", "ReturnValue.Field[crate::option::Option::Some(0)].Field[crate::sync::mpsc::bounded::Permit::chan]", "value", "dfc-generated"]
       - ["repo:https://github.com/tokio-rs/tokio:tokio", "<crate::sync::mpsc::bounded::PermitIterator as crate::iter::traits::iterator::Iterator>::size_hint", "Argument[self].Field[crate::sync::mpsc::bounded::PermitIterator::n]", "ReturnValue.Field[0]", "value", "dfc-generated"]
       - ["repo:https://github.com/tokio-rs/tokio:tokio", "<crate::sync::mpsc::bounded::PermitIterator as crate::iter::traits::iterator::Iterator>::size_hint", "Argument[self].Field[crate::sync::mpsc::bounded::PermitIterator::n]", "ReturnValue.Field[1].Field[crate::option::Option::Some(0)]", "value", "dfc-generated"]
@@ -436,7 +418,6 @@ extensions:
       - ["repo:https://github.com/tokio-rs/tokio:tokio", "<crate::sync::mpsc::bounded::Sender>::try_send", "Argument[0]", "ReturnValue.Field[crate::result::Result::Err(0)].Field[crate::sync::mpsc::error::TrySendError::Closed(0)]", "value", "dfc-generated"]
       - ["repo:https://github.com/tokio-rs/tokio:tokio", "<crate::sync::mpsc::bounded::Sender>::try_send", "Argument[0]", "ReturnValue.Field[crate::result::Result::Err(0)].Field[crate::sync::mpsc::error::TrySendError::Full(0)]", "value", "dfc-generated"]
       - ["repo:https://github.com/tokio-rs/tokio:tokio", "<crate::sync::mpsc::bounded::WeakSender as crate::clone::Clone>::clone", "Argument[self].Field[crate::sync::mpsc::bounded::WeakSender::chan].Reference", "ReturnValue.Field[crate::sync::mpsc::bounded::WeakSender::chan]", "value", "dfc-generated"]
-      - ["repo:https://github.com/tokio-rs/tokio:tokio", "<crate::sync::mpsc::bounded::WeakSender>::upgrade", "Argument[self]", "ReturnValue", "taint", "df-generated"]
       - ["repo:https://github.com/tokio-rs/tokio:tokio", "<crate::sync::mpsc::chan::Tx as crate::clone::Clone>::clone", "Argument[self].Field[crate::sync::mpsc::chan::Tx::inner].Reference", "ReturnValue.Field[crate::sync::mpsc::chan::Tx::inner]", "value", "dfc-generated"]
       - ["repo:https://github.com/tokio-rs/tokio:tokio", "<crate::sync::mpsc::chan::Tx>::downgrade", "Argument[self].Field[crate::sync::mpsc::chan::Tx::inner].Reference", "ReturnValue", "value", "dfc-generated"]
       - ["repo:https://github.com/tokio-rs/tokio:tokio", "<crate::sync::mpsc::chan::Tx>::upgrade", "Argument[0]", "ReturnValue.Field[crate::option::Option::Some(0)].Field[crate::sync::mpsc::chan::Tx::inner]", "value", "dfc-generated"]
@@ -453,13 +434,11 @@ extensions:
       - ["repo:https://github.com/tokio-rs/tokio:tokio", "<crate::sync::mpsc::unbounded::UnboundedSender>::new", "Argument[0]", "ReturnValue.Field[crate::sync::mpsc::unbounded::UnboundedSender::chan]", "value", "dfc-generated"]
       - ["repo:https://github.com/tokio-rs/tokio:tokio", "<crate::sync::mpsc::unbounded::UnboundedSender>::send", "Argument[0]", "ReturnValue.Field[crate::result::Result::Err(0)].Field[crate::sync::mpsc::error::SendError(0)]", "value", "dfc-generated"]
       - ["repo:https://github.com/tokio-rs/tokio:tokio", "<crate::sync::mpsc::unbounded::WeakUnboundedSender as crate::clone::Clone>::clone", "Argument[self].Field[crate::sync::mpsc::unbounded::WeakUnboundedSender::chan].Reference", "ReturnValue.Field[crate::sync::mpsc::unbounded::WeakUnboundedSender::chan]", "value", "dfc-generated"]
-      - ["repo:https://github.com/tokio-rs/tokio:tokio", "<crate::sync::mpsc::unbounded::WeakUnboundedSender>::upgrade", "Argument[self]", "ReturnValue", "taint", "df-generated"]
       - ["repo:https://github.com/tokio-rs/tokio:tokio", "<crate::sync::mutex::MappedMutexGuard as crate::ops::deref::Deref>::deref", "Argument[self].Field[crate::sync::mutex::MappedMutexGuard::data].Reference", "ReturnValue.Reference", "value", "dfc-generated"]
       - ["repo:https://github.com/tokio-rs/tokio:tokio", "<crate::sync::mutex::MappedMutexGuard as crate::ops::deref::DerefMut>::deref_mut", "Argument[self].Field[crate::sync::mutex::MappedMutexGuard::data].Reference", "ReturnValue.Reference", "value", "dfc-generated"]
       - ["repo:https://github.com/tokio-rs/tokio:tokio", "<crate::sync::mutex::MappedMutexGuard>::map", "Argument[0].Reference", "Argument[1].Parameter[0].Reference", "value", "dfc-generated"]
       - ["repo:https://github.com/tokio-rs/tokio:tokio", "<crate::sync::mutex::MappedMutexGuard>::try_map", "Argument[0].Reference", "Argument[1].Parameter[0].Reference", "value", "dfc-generated"]
       - ["repo:https://github.com/tokio-rs/tokio:tokio", "<crate::sync::mutex::MappedMutexGuard>::try_map", "Argument[0]", "ReturnValue.Field[crate::result::Result::Err(0)]", "value", "dfc-generated"]
-      - ["repo:https://github.com/tokio-rs/tokio:tokio", "<crate::sync::mutex::Mutex>::get_mut", "Argument[self]", "ReturnValue", "taint", "df-generated"]
       - ["repo:https://github.com/tokio-rs/tokio:tokio", "<crate::sync::mutex::Mutex>::try_lock", "Argument[self]", "ReturnValue.Field[crate::result::Result::Ok(0)].Field[crate::sync::mutex::MutexGuard::lock]", "value", "dfc-generated"]
       - ["repo:https://github.com/tokio-rs/tokio:tokio", "<crate::sync::mutex::Mutex>::try_lock_owned", "Argument[self]", "ReturnValue.Field[crate::result::Result::Ok(0)].Field[crate::sync::mutex::OwnedMutexGuard::lock]", "value", "dfc-generated"]
       - ["repo:https://github.com/tokio-rs/tokio:tokio", "<crate::sync::mutex::MutexGuard>::map", "Argument[0].Reference", "Argument[1].Parameter[0].Reference", "value", "dfc-generated"]
@@ -481,7 +460,6 @@ extensions:
       - ["repo:https://github.com/tokio-rs/tokio:tokio", "<crate::sync::once_cell::OnceCell>::set", "Argument[0]", "ReturnValue.Field[crate::result::Result::Err(0)].Field[crate::sync::once_cell::SetError::AlreadyInitializedError(0)]", "value", "dfc-generated"]
       - ["repo:https://github.com/tokio-rs/tokio:tokio", "<crate::sync::once_cell::OnceCell>::set", "Argument[0]", "ReturnValue.Field[crate::result::Result::Err(0)].Field[crate::sync::once_cell::SetError::InitializingError(0)]", "value", "dfc-generated"]
       - ["repo:https://github.com/tokio-rs/tokio:tokio", "<crate::sync::rwlock::RwLock>::const_with_max_readers", "Argument[1]", "ReturnValue.Field[crate::sync::rwlock::RwLock::mr]", "value", "dfc-generated"]
-      - ["repo:https://github.com/tokio-rs/tokio:tokio", "<crate::sync::rwlock::RwLock>::get_mut", "Argument[self]", "ReturnValue", "taint", "df-generated"]
       - ["repo:https://github.com/tokio-rs/tokio:tokio", "<crate::sync::rwlock::RwLock>::try_read", "Argument[self]", "ReturnValue", "taint", "df-generated"]
       - ["repo:https://github.com/tokio-rs/tokio:tokio", "<crate::sync::rwlock::RwLock>::try_read_owned", "Argument[self]", "ReturnValue.Field[crate::result::Result::Ok(0)].Field[crate::sync::rwlock::owned_read_guard::OwnedRwLockReadGuard::lock]", "value", "dfc-generated"]
       - ["repo:https://github.com/tokio-rs/tokio:tokio", "<crate::sync::rwlock::RwLock>::try_write", "Argument[self].Field[crate::sync::rwlock::RwLock::mr]", "ReturnValue.Field[crate::result::Result::Ok(0)].Field[crate::sync::rwlock::write_guard::RwLockWriteGuard::permits_acquired]", "value", "dfc-generated"]
@@ -535,7 +513,6 @@ extensions:
       - ["repo:https://github.com/tokio-rs/tokio:tokio", "<crate::sync::semaphore::Semaphore>::acquire_many_owned", "Argument[0]", "ReturnValue.Field[crate::result::Result::Ok(0)].Field[crate::sync::semaphore::OwnedSemaphorePermit::permits]", "value", "dfc-generated"]
       - ["repo:https://github.com/tokio-rs/tokio:tokio", "<crate::sync::semaphore::Semaphore>::acquire_many_owned", "Argument[self]", "ReturnValue.Field[crate::result::Result::Ok(0)].Field[crate::sync::semaphore::OwnedSemaphorePermit::sem]", "value", "dfc-generated"]
       - ["repo:https://github.com/tokio-rs/tokio:tokio", "<crate::sync::semaphore::Semaphore>::acquire_owned", "Argument[self]", "ReturnValue.Field[crate::result::Result::Ok(0)].Field[crate::sync::semaphore::OwnedSemaphorePermit::sem]", "value", "dfc-generated"]
-      - ["repo:https://github.com/tokio-rs/tokio:tokio", "<crate::sync::semaphore::Semaphore>::forget_permits", "Argument[0]", "ReturnValue", "value", "dfc-generated"]
       - ["repo:https://github.com/tokio-rs/tokio:tokio", "<crate::sync::semaphore::Semaphore>::try_acquire", "Argument[self]", "ReturnValue.Field[crate::result::Result::Ok(0)].Field[crate::sync::semaphore::SemaphorePermit::sem]", "value", "dfc-generated"]
       - ["repo:https://github.com/tokio-rs/tokio:tokio", "<crate::sync::semaphore::Semaphore>::try_acquire_many", "Argument[0]", "ReturnValue.Field[crate::result::Result::Ok(0)].Field[crate::sync::semaphore::SemaphorePermit::permits]", "value", "dfc-generated"]
       - ["repo:https://github.com/tokio-rs/tokio:tokio", "<crate::sync::semaphore::Semaphore>::try_acquire_many", "Argument[self]", "ReturnValue.Field[crate::result::Result::Ok(0)].Field[crate::sync::semaphore::SemaphorePermit::sem]", "value", "dfc-generated"]
@@ -559,8 +536,6 @@ extensions:
       - ["repo:https://github.com/tokio-rs/tokio:tokio", "<crate::task::task_local::LocalKey>::scope", "Argument[1]", "ReturnValue.Field[crate::task::task_local::TaskLocalFuture::future].Field[crate::option::Option::Some(0)]", "value", "dfc-generated"]
       - ["repo:https://github.com/tokio-rs/tokio:tokio", "<crate::task::task_local::LocalKey>::scope", "Argument[self]", "ReturnValue.Field[crate::task::task_local::TaskLocalFuture::local]", "value", "dfc-generated"]
       - ["repo:https://github.com/tokio-rs/tokio:tokio", "<crate::task::task_local::LocalKey>::sync_scope", "Argument[1].ReturnValue", "ReturnValue", "value", "dfc-generated"]
-      - ["repo:https://github.com/tokio-rs/tokio:tokio", "<crate::task::task_local::LocalKey>::try_with", "Argument[0]", "ReturnValue", "taint", "df-generated"]
-      - ["repo:https://github.com/tokio-rs/tokio:tokio", "<crate::task::task_local::LocalKey>::with", "Argument[0]", "ReturnValue", "taint", "df-generated"]
       - ["repo:https://github.com/tokio-rs/tokio:tokio", "<crate::task::wake::Waker as crate::sync::task::atomic_waker::WakerRef>::into_waker", "Argument[self]", "ReturnValue", "value", "dfc-generated"]
       - ["repo:https://github.com/tokio-rs/tokio:tokio", "<crate::time::Instant as crate::convert::From>::from", "Argument[0].Field[crate::time::instant::Instant::std]", "ReturnValue", "value", "dfc-generated"]
       - ["repo:https://github.com/tokio-rs/tokio:tokio", "<crate::time::error::Error as crate::convert::From>::from", "Argument[0]", "ReturnValue.Field[crate::time::error::Error(0)]", "value", "dfc-generated"]
@@ -596,7 +571,6 @@ extensions:
       - ["repo:https://github.com/tokio-rs/tokio:tokio", "<crate::util::linked_list::LinkedList>::drain_filter", "Argument[0]", "ReturnValue.Field[crate::util::linked_list::DrainFilter::filter]", "value", "dfc-generated"]
       - ["repo:https://github.com/tokio-rs/tokio:tokio", "<crate::util::linked_list::LinkedList>::drain_filter", "Argument[self].Field[crate::util::linked_list::LinkedList::head]", "ReturnValue.Field[crate::util::linked_list::DrainFilter::curr]", "value", "dfc-generated"]
       - ["repo:https://github.com/tokio-rs/tokio:tokio", "<crate::util::linked_list::LinkedList>::drain_filter", "Argument[self]", "ReturnValue.Field[crate::util::linked_list::DrainFilter::list]", "value", "dfc-generated"]
-      - ["repo:https://github.com/tokio-rs/tokio:tokio", "<crate::util::linked_list::LinkedList>::last", "Argument[self].Field[crate::util::linked_list::LinkedList::tail].Field[crate::option::Option::Some(0)]", "ReturnValue.Reference", "value", "dfc-generated"]
       - ["repo:https://github.com/tokio-rs/tokio:tokio", "<crate::util::linked_list::LinkedList>::pop_back", "Argument[self].Field[crate::util::linked_list::LinkedList::tail].Field[crate::option::Option::Some(0)]", "ReturnValue", "value", "dfc-generated"]
       - ["repo:https://github.com/tokio-rs/tokio:tokio", "<crate::util::linked_list::LinkedList>::pop_back", "Argument[self].Field[crate::util::linked_list::LinkedList::tail].Field[crate::result::Result::Ok(0)]", "ReturnValue", "value", "dfc-generated"]
       - ["repo:https://github.com/tokio-rs/tokio:tokio", "<crate::util::linked_list::LinkedList>::pop_front", "Argument[self].Field[crate::util::linked_list::LinkedList::head].Field[crate::option::Option::Some(0)]", "ReturnValue", "value", "dfc-generated"]
@@ -640,16 +614,13 @@ extensions:
       - ["repo:https://github.com/tokio-rs/tokio:tokio", "crate::io::util::read_line::finish_string_read", "Argument[1].Field[crate::result::Result::Ok(0)]", "Argument[3].Reference", "value", "dfc-generated"]
       - ["repo:https://github.com/tokio-rs/tokio:tokio", "crate::io::util::read_line::read_line", "Argument[0]", "ReturnValue.Field[crate::io::util::read_line::ReadLine::reader]", "value", "dfc-generated"]
       - ["repo:https://github.com/tokio-rs/tokio:tokio", "crate::io::util::read_line::read_line", "Argument[1]", "ReturnValue.Field[crate::io::util::read_line::ReadLine::output]", "value", "dfc-generated"]
-      - ["repo:https://github.com/tokio-rs/tokio:tokio", "crate::io::util::read_line::read_line_internal", "Argument[4].Reference", "ReturnValue.Field[crate::result::Result::Ok(0)]", "value", "dfc-generated"]
       - ["repo:https://github.com/tokio-rs/tokio:tokio", "crate::io::util::read_to_end::read_to_end", "Argument[0]", "ReturnValue.Field[crate::io::util::read_to_end::ReadToEnd::reader]", "value", "dfc-generated"]
       - ["repo:https://github.com/tokio-rs/tokio:tokio", "crate::io::util::read_to_end::read_to_end", "Argument[1]", "ReturnValue.Field[crate::io::util::read_to_end::ReadToEnd::buf].Field[crate::io::util::vec_with_initialized::VecWithInitialized::vec]", "value", "dfc-generated"]
-      - ["repo:https://github.com/tokio-rs/tokio:tokio", "crate::io::util::read_to_end::read_to_end_internal", "Argument[2].Reference", "ReturnValue.Field[crate::result::Result::Ok(0)]", "value", "dfc-generated"]
       - ["repo:https://github.com/tokio-rs/tokio:tokio", "crate::io::util::read_to_string::read_to_string", "Argument[0]", "ReturnValue.Field[crate::io::util::read_to_string::ReadToString::reader]", "value", "dfc-generated"]
       - ["repo:https://github.com/tokio-rs/tokio:tokio", "crate::io::util::read_to_string::read_to_string", "Argument[1]", "ReturnValue.Field[crate::io::util::read_to_string::ReadToString::output]", "value", "dfc-generated"]
       - ["repo:https://github.com/tokio-rs/tokio:tokio", "crate::io::util::read_until::read_until", "Argument[0]", "ReturnValue.Field[crate::io::util::read_until::ReadUntil::reader]", "value", "dfc-generated"]
       - ["repo:https://github.com/tokio-rs/tokio:tokio", "crate::io::util::read_until::read_until", "Argument[1]", "ReturnValue.Field[crate::io::util::read_until::ReadUntil::delimiter]", "value", "dfc-generated"]
       - ["repo:https://github.com/tokio-rs/tokio:tokio", "crate::io::util::read_until::read_until", "Argument[2]", "ReturnValue.Field[crate::io::util::read_until::ReadUntil::buf]", "value", "dfc-generated"]
-      - ["repo:https://github.com/tokio-rs/tokio:tokio", "crate::io::util::read_until::read_until_internal", "Argument[4].Reference", "ReturnValue.Field[crate::result::Result::Ok(0)]", "value", "dfc-generated"]
       - ["repo:https://github.com/tokio-rs/tokio:tokio", "crate::io::util::repeat::repeat", "Argument[0]", "ReturnValue.Field[crate::io::util::repeat::Repeat::byte]", "value", "dfc-generated"]
       - ["repo:https://github.com/tokio-rs/tokio:tokio", "crate::io::util::shutdown::shutdown", "Argument[0]", "ReturnValue.Field[crate::io::util::shutdown::Shutdown::a]", "value", "dfc-generated"]
       - ["repo:https://github.com/tokio-rs/tokio:tokio", "crate::io::util::split::split", "Argument[0]", "ReturnValue.Field[crate::io::util::split::Split::reader]", "value", "dfc-generated"]
@@ -673,13 +644,9 @@ extensions:
       - ["repo:https://github.com/tokio-rs/tokio:tokio", "crate::net::unix::split::split", "Argument[0]", "ReturnValue.Field[1].Field[crate::net::unix::split::WriteHalf(0)]", "value", "dfc-generated"]
       - ["repo:https://github.com/tokio-rs/tokio:tokio", "crate::net::unix::split_owned::reunite", "Argument[0]", "ReturnValue.Field[crate::result::Result::Err(0)].Field[crate::net::unix::split_owned::ReuniteError(0)]", "value", "dfc-generated"]
       - ["repo:https://github.com/tokio-rs/tokio:tokio", "crate::net::unix::split_owned::reunite", "Argument[1]", "ReturnValue.Field[crate::result::Result::Err(0)].Field[crate::net::unix::split_owned::ReuniteError(1)]", "value", "dfc-generated"]
-      - ["repo:https://github.com/tokio-rs/tokio:tokio", "crate::runtime::context::budget", "Argument[0].ReturnValue", "ReturnValue.Field[crate::result::Result::Ok(0)]", "value", "dfc-generated"]
-      - ["repo:https://github.com/tokio-rs/tokio:tokio", "crate::runtime::context::current::with_current", "Argument[0]", "ReturnValue", "taint", "df-generated"]
       - ["repo:https://github.com/tokio-rs/tokio:tokio", "crate::runtime::context::runtime::enter_runtime", "Argument[2].ReturnValue", "ReturnValue", "value", "dfc-generated"]
       - ["repo:https://github.com/tokio-rs/tokio:tokio", "crate::runtime::context::runtime_mt::exit_runtime", "Argument[0].ReturnValue", "ReturnValue", "value", "dfc-generated"]
       - ["repo:https://github.com/tokio-rs/tokio:tokio", "crate::runtime::context::runtime_mt::exit_runtime", "Argument[0]", "ReturnValue", "value", "dfc-generated"]
-      - ["repo:https://github.com/tokio-rs/tokio:tokio", "crate::runtime::context::with_scheduler", "Argument[0].ReturnValue", "ReturnValue", "value", "dfc-generated"]
-      - ["repo:https://github.com/tokio-rs/tokio:tokio", "crate::runtime::metrics::batch::duration_as_u64", "Argument[0]", "ReturnValue", "taint", "df-generated"]
       - ["repo:https://github.com/tokio-rs/tokio:tokio", "crate::runtime::scheduler::block_in_place::block_in_place", "Argument[0].ReturnValue", "ReturnValue", "value", "dfc-generated"]
       - ["repo:https://github.com/tokio-rs/tokio:tokio", "crate::runtime::scheduler::block_in_place::block_in_place", "Argument[0]", "ReturnValue", "value", "dfc-generated"]
       - ["repo:https://github.com/tokio-rs/tokio:tokio", "crate::runtime::scheduler::multi_thread::worker::block_in_place", "Argument[0].ReturnValue", "ReturnValue", "value", "dfc-generated"]
@@ -698,7 +665,6 @@ extensions:
       - ["repo:https://github.com/tokio-rs/tokio:tokio", "crate::util::bit::unpack", "Argument[0]", "ReturnValue", "taint", "df-generated"]
       - ["repo:https://github.com/tokio-rs/tokio:tokio", "crate::util::bit::unpack", "Argument[1]", "ReturnValue", "taint", "df-generated"]
       - ["repo:https://github.com/tokio-rs/tokio:tokio", "crate::util::bit::unpack", "Argument[2]", "ReturnValue", "taint", "df-generated"]
-      - ["repo:https://github.com/tokio-rs/tokio:tokio", "crate::util::memchr::memchr", "Argument[1]", "ReturnValue", "taint", "df-generated"]
       - ["repo:https://github.com/tokio-rs/tokio:tokio", "crate::util::trace::blocking_task", "Argument[0]", "ReturnValue", "value", "dfc-generated"]
       - ["repo:https://github.com/tokio-rs/tokio:tokio", "crate::util::trace::task", "Argument[0]", "ReturnValue", "value", "dfc-generated"]
       - ["repo:https://github.com/tokio-rs/tokio:tokio", "crate::util::typeid::try_transmute", "Argument[0]", "ReturnValue.Field[crate::result::Result::Err(0)]", "value", "dfc-generated"]
@@ -715,19 +681,6 @@ extensions:
       - ["repo:https://github.com/tokio-rs/tokio:tokio", "<crate::io::cursor::Cursor as crate::io::async_read::AsyncRead>::poll_read", "Argument[1]", "log-injection", "df-generated"]
       - ["repo:https://github.com/tokio-rs/tokio:tokio", "<crate::io::read_buf::ReadBuf>::put_slice", "Argument[self]", "log-injection", "df-generated"]
       - ["repo:https://github.com/tokio-rs/tokio:tokio", "<crate::io::util::buf_reader::BufReader as crate::io::async_read::AsyncRead>::poll_read", "Argument[1]", "log-injection", "df-generated"]
-      - ["repo:https://github.com/tokio-rs/tokio:tokio", "<crate::loom::std::atomic_u16::AtomicU16>::unsync_load", "Argument[self]", "pointer-access", "df-generated"]
-      - ["repo:https://github.com/tokio-rs/tokio:tokio", "<crate::loom::std::atomic_u32::AtomicU32>::unsync_load", "Argument[self]", "pointer-access", "df-generated"]
-      - ["repo:https://github.com/tokio-rs/tokio:tokio", "<crate::loom::std::atomic_usize::AtomicUsize>::unsync_load", "Argument[self]", "pointer-access", "df-generated"]
-      - ["repo:https://github.com/tokio-rs/tokio:tokio", "<crate::loom::std::unsafe_cell::UnsafeCell>::with", "Argument[self]", "pointer-access", "df-generated"]
-      - ["repo:https://github.com/tokio-rs/tokio:tokio", "<crate::runtime::scheduler::current_thread::CurrentThread>::shutdown", "Argument[0]", "pointer-access", "df-generated"]
-      - ["repo:https://github.com/tokio-rs/tokio:tokio", "<crate::runtime::scheduler::inject::Inject>::pop", "Argument[self]", "pointer-access", "df-generated"]
-      - ["repo:https://github.com/tokio-rs/tokio:tokio", "<crate::runtime::scheduler::inject::Inject>::push", "Argument[self]", "pointer-access", "df-generated"]
-      - ["repo:https://github.com/tokio-rs/tokio:tokio", "<crate::runtime::scheduler::inject::shared::Shared>::pop", "Argument[self]", "pointer-access", "df-generated"]
-      - ["repo:https://github.com/tokio-rs/tokio:tokio", "<crate::runtime::scheduler::inject::shared::Shared>::pop_n", "Argument[self]", "pointer-access", "df-generated"]
-      - ["repo:https://github.com/tokio-rs/tokio:tokio", "<crate::runtime::scheduler::inject::shared::Shared>::push", "Argument[self]", "pointer-access", "df-generated"]
-      - ["repo:https://github.com/tokio-rs/tokio:tokio", "<crate::runtime::scheduler::inject::shared::Shared>::push_batch", "Argument[self]", "pointer-access", "df-generated"]
-      - ["repo:https://github.com/tokio-rs/tokio:tokio", "<crate::runtime::scheduler::multi_thread::handle::Handle as crate::runtime::scheduler::multi_thread::overflow::Overflow>::push", "Argument[self]", "pointer-access", "df-generated"]
-      - ["repo:https://github.com/tokio-rs/tokio:tokio", "<crate::runtime::scheduler::multi_thread::handle::Handle as crate::runtime::scheduler::multi_thread::overflow::Overflow>::push_batch", "Argument[self]", "pointer-access", "df-generated"]
       - ["repo:https://github.com/tokio-rs/tokio:tokio", "<crate::runtime::task::state::State>::transition_to_terminal", "Argument[0]", "log-injection", "df-generated"]
       - ["repo:https://github.com/tokio-rs/tokio:tokio", "<crate::runtime::time::wheel::Wheel>::poll", "Argument[0]", "log-injection", "df-generated"]
       - ["repo:https://github.com/tokio-rs/tokio:tokio", "<crate::runtime::time::wheel::Wheel>::poll", "Argument[self]", "log-injection", "df-generated"]
@@ -738,7 +691,6 @@ extensions:
       - ["repo:https://github.com/tokio-rs/tokio:tokio", "<crate::sync::batch_semaphore::Semaphore>::release", "Argument[0]", "log-injection", "df-generated"]
       - ["repo:https://github.com/tokio-rs/tokio:tokio", "<crate::sync::mpsc::bounded::PermitIterator as crate::ops::drop::Drop>::drop", "Argument[self]", "log-injection", "df-generated"]
       - ["repo:https://github.com/tokio-rs/tokio:tokio", "<crate::sync::mpsc::bounded::Semaphore as crate::sync::mpsc::chan::Semaphore>::add_permits", "Argument[0]", "log-injection", "df-generated"]
-      - ["repo:https://github.com/tokio-rs/tokio:tokio", "<crate::sync::once_cell::OnceCell>::into_inner", "Argument[self]", "pointer-access", "df-generated"]
       - ["repo:https://github.com/tokio-rs/tokio:tokio", "<crate::sync::rwlock::write_guard::RwLockWriteGuard as crate::ops::drop::Drop>::drop", "Argument[self]", "log-injection", "df-generated"]
       - ["repo:https://github.com/tokio-rs/tokio:tokio", "<crate::sync::rwlock::write_guard_mapped::RwLockMappedWriteGuard as crate::ops::drop::Drop>::drop", "Argument[self]", "log-injection", "df-generated"]
       - ["repo:https://github.com/tokio-rs/tokio:tokio", "<crate::sync::semaphore::Semaphore>::add_permits", "Argument[0]", "log-injection", "df-generated"]
diff --git a/rust/ql/lib/rust.dbscheme b/rust/ql/lib/rust.dbscheme
index a1005655e9e..aa9a0bda17c 100644
--- a/rust/ql/lib/rust.dbscheme
+++ b/rust/ql/lib/rust.dbscheme
@@ -2816,6 +2816,11 @@ const_visibilities(
   int visibility: @visibility ref
 );
 
+#keyset[id]
+const_has_implementation(
+  int id: @const ref
+);
+
 enums(
   unique int id: @enum
 );
@@ -2985,6 +2990,11 @@ function_where_clauses(
   int where_clause: @where_clause ref
 );
 
+#keyset[id]
+function_has_implementation(
+  int id: @function ref
+);
+
 impls(
   unique int id: @impl
 );
diff --git a/rust/ql/lib/upgrades/a1005655e9efc9f67d3aa2b7a3128f6b80d405a9/old.dbscheme b/rust/ql/lib/upgrades/a1005655e9efc9f67d3aa2b7a3128f6b80d405a9/old.dbscheme
new file mode 100644
index 00000000000..a1005655e9e
--- /dev/null
+++ b/rust/ql/lib/upgrades/a1005655e9efc9f67d3aa2b7a3128f6b80d405a9/old.dbscheme
@@ -0,0 +1,3606 @@
+// generated by codegen, do not edit
+
+// from ../shared/tree-sitter-extractor/src/generator/prefix.dbscheme
+/*- Files and folders -*/
+
+/**
+ * The location of an element.
+ * The location spans column `startcolumn` of line `startline` to
+ * column `endcolumn` of line `endline` in file `file`.
+ * For more information, see
+ * [Locations](https://codeql.github.com/docs/writing-codeql-queries/providing-locations-in-codeql-queries/).
+ */
+locations_default(
+  unique int id: @location_default,
+  int file: @file ref,
+  int beginLine: int ref,
+  int beginColumn: int ref,
+  int endLine: int ref,
+  int endColumn: int ref
+);
+
+files(
+  unique int id: @file,
+  string name: string ref
+);
+
+folders(
+  unique int id: @folder,
+  string name: string ref
+);
+
+@container = @file | @folder
+
+containerparent(
+  int parent: @container ref,
+  unique int child: @container ref
+);
+
+/*- Empty location -*/
+
+empty_location(
+  int location: @location_default ref
+);
+
+/*- Source location prefix -*/
+
+/**
+ * The source location of the snapshot.
+ */
+sourceLocationPrefix(string prefix : string ref);
+
+/*- Diagnostic messages -*/
+
+diagnostics(
+  unique int id: @diagnostic,
+  int severity: int ref,
+  string error_tag: string ref,
+  string error_message: string ref,
+  string full_error_message: string ref,
+  int location: @location_default ref
+);
+
+/*- Diagnostic messages: severity -*/
+
+case @diagnostic.severity of
+  10 = @diagnostic_debug
+| 20 = @diagnostic_info
+| 30 = @diagnostic_warning
+| 40 = @diagnostic_error
+;
+
+/*- YAML -*/
+
+#keyset[parent, idx]
+yaml (unique int id: @yaml_node,
+      int kind: int ref,
+      int parent: @yaml_node_parent ref,
+      int idx: int ref,
+      string tag: string ref,
+      string tostring: string ref);
+
+case @yaml_node.kind of
+  0 = @yaml_scalar_node
+| 1 = @yaml_mapping_node
+| 2 = @yaml_sequence_node
+| 3 = @yaml_alias_node
+;
+
+@yaml_collection_node = @yaml_mapping_node | @yaml_sequence_node;
+
+@yaml_node_parent = @yaml_collection_node | @file;
+
+yaml_anchors (unique int node: @yaml_node ref,
+              string anchor: string ref);
+
+yaml_aliases (unique int alias: @yaml_alias_node ref,
+              string target: string ref);
+
+yaml_scalars (unique int scalar: @yaml_scalar_node ref,
+              int style: int ref,
+              string value: string ref);
+
+yaml_errors (unique int id: @yaml_error,
+             string message: string ref);
+
+yaml_locations(unique int locatable: @yaml_locatable ref,
+             int location: @location_default ref);
+
+@yaml_locatable = @yaml_node | @yaml_error;
+
+
+// from prefix.dbscheme
+#keyset[id]
+locatable_locations(
+  int id: @locatable ref,
+  int location: @location_default ref
+);
+
+
+// from schema
+
+@element =
+  @extractor_step
+| @locatable
+| @named_crate
+| @unextracted
+;
+
+extractor_steps(
+  unique int id: @extractor_step,
+  string action: string ref,
+  int duration_ms: int ref
+);
+
+#keyset[id]
+extractor_step_files(
+  int id: @extractor_step ref,
+  int file: @file ref
+);
+
+@locatable =
+  @ast_node
+| @crate
+;
+
+named_crates(
+  unique int id: @named_crate,
+  string name: string ref,
+  int crate: @crate ref
+);
+
+@unextracted =
+  @missing
+| @unimplemented
+;
+
+@ast_node =
+  @abi
+| @addressable
+| @arg_list
+| @asm_dir_spec
+| @asm_operand
+| @asm_operand_expr
+| @asm_option
+| @asm_piece
+| @asm_reg_spec
+| @assoc_item
+| @assoc_item_list
+| @attr
+| @callable
+| @closure_binder
+| @expr
+| @extern_item
+| @extern_item_list
+| @field_list
+| @format_args_arg
+| @generic_arg
+| @generic_arg_list
+| @generic_param
+| @generic_param_list
+| @item_list
+| @label
+| @let_else
+| @macro_items
+| @match_arm
+| @match_arm_list
+| @match_guard
+| @meta
+| @name
+| @param_base
+| @param_list
+| @parenthesized_arg_list
+| @pat
+| @path
+| @path_segment
+| @rename
+| @resolvable
+| @ret_type_repr
+| @return_type_syntax
+| @source_file
+| @stmt
+| @stmt_list
+| @struct_expr_field
+| @struct_expr_field_list
+| @struct_field
+| @struct_pat_field
+| @struct_pat_field_list
+| @token
+| @token_tree
+| @tuple_field
+| @type_bound
+| @type_bound_list
+| @type_repr
+| @use_bound_generic_arg
+| @use_bound_generic_args
+| @use_tree
+| @use_tree_list
+| @variant_def
+| @variant_list
+| @visibility
+| @where_clause
+| @where_pred
+;
+
+crates(
+  unique int id: @crate
+);
+
+#keyset[id]
+crate_names(
+  int id: @crate ref,
+  string name: string ref
+);
+
+#keyset[id]
+crate_versions(
+  int id: @crate ref,
+  string version: string ref
+);
+
+#keyset[id, index]
+crate_cfg_options(
+  int id: @crate ref,
+  int index: int ref,
+  string cfg_option: string ref
+);
+
+#keyset[id, index]
+crate_named_dependencies(
+  int id: @crate ref,
+  int index: int ref,
+  int named_dependency: @named_crate ref
+);
+
+missings(
+  unique int id: @missing
+);
+
+unimplementeds(
+  unique int id: @unimplemented
+);
+
+abis(
+  unique int id: @abi
+);
+
+#keyset[id]
+abi_abi_strings(
+  int id: @abi ref,
+  string abi_string: string ref
+);
+
+@addressable =
+  @item
+| @variant
+;
+
+#keyset[id]
+addressable_extended_canonical_paths(
+  int id: @addressable ref,
+  string extended_canonical_path: string ref
+);
+
+#keyset[id]
+addressable_crate_origins(
+  int id: @addressable ref,
+  string crate_origin: string ref
+);
+
+arg_lists(
+  unique int id: @arg_list
+);
+
+#keyset[id, index]
+arg_list_args(
+  int id: @arg_list ref,
+  int index: int ref,
+  int arg: @expr ref
+);
+
+asm_dir_specs(
+  unique int id: @asm_dir_spec
+);
+
+@asm_operand =
+  @asm_const
+| @asm_label
+| @asm_reg_operand
+| @asm_sym
+;
+
+asm_operand_exprs(
+  unique int id: @asm_operand_expr
+);
+
+#keyset[id]
+asm_operand_expr_in_exprs(
+  int id: @asm_operand_expr ref,
+  int in_expr: @expr ref
+);
+
+#keyset[id]
+asm_operand_expr_out_exprs(
+  int id: @asm_operand_expr ref,
+  int out_expr: @expr ref
+);
+
+asm_options(
+  unique int id: @asm_option
+);
+
+#keyset[id]
+asm_option_is_raw(
+  int id: @asm_option ref
+);
+
+@asm_piece =
+  @asm_clobber_abi
+| @asm_operand_named
+| @asm_options_list
+;
+
+asm_reg_specs(
+  unique int id: @asm_reg_spec
+);
+
+#keyset[id]
+asm_reg_spec_identifiers(
+  int id: @asm_reg_spec ref,
+  int identifier: @name_ref ref
+);
+
+@assoc_item =
+  @const
+| @function
+| @macro_call
+| @type_alias
+;
+
+assoc_item_lists(
+  unique int id: @assoc_item_list
+);
+
+#keyset[id, index]
+assoc_item_list_assoc_items(
+  int id: @assoc_item_list ref,
+  int index: int ref,
+  int assoc_item: @assoc_item ref
+);
+
+#keyset[id, index]
+assoc_item_list_attrs(
+  int id: @assoc_item_list ref,
+  int index: int ref,
+  int attr: @attr ref
+);
+
+attrs(
+  unique int id: @attr
+);
+
+#keyset[id]
+attr_meta(
+  int id: @attr ref,
+  int meta: @meta ref
+);
+
+@callable =
+  @closure_expr
+| @function
+;
+
+#keyset[id]
+callable_param_lists(
+  int id: @callable ref,
+  int param_list: @param_list ref
+);
+
+#keyset[id, index]
+callable_attrs(
+  int id: @callable ref,
+  int index: int ref,
+  int attr: @attr ref
+);
+
+closure_binders(
+  unique int id: @closure_binder
+);
+
+#keyset[id]
+closure_binder_generic_param_lists(
+  int id: @closure_binder ref,
+  int generic_param_list: @generic_param_list ref
+);
+
+@expr =
+  @array_expr_internal
+| @asm_expr
+| @await_expr
+| @become_expr
+| @binary_expr
+| @break_expr
+| @call_expr_base
+| @cast_expr
+| @closure_expr
+| @continue_expr
+| @field_expr
+| @format_args_expr
+| @if_expr
+| @index_expr
+| @labelable_expr
+| @let_expr
+| @literal_expr
+| @macro_block_expr
+| @macro_expr
+| @match_expr
+| @offset_of_expr
+| @paren_expr
+| @path_expr_base
+| @prefix_expr
+| @range_expr
+| @ref_expr
+| @return_expr
+| @struct_expr
+| @try_expr
+| @tuple_expr
+| @underscore_expr
+| @yeet_expr
+| @yield_expr
+;
+
+@extern_item =
+  @function
+| @macro_call
+| @static
+| @type_alias
+;
+
+extern_item_lists(
+  unique int id: @extern_item_list
+);
+
+#keyset[id, index]
+extern_item_list_attrs(
+  int id: @extern_item_list ref,
+  int index: int ref,
+  int attr: @attr ref
+);
+
+#keyset[id, index]
+extern_item_list_extern_items(
+  int id: @extern_item_list ref,
+  int index: int ref,
+  int extern_item: @extern_item ref
+);
+
+@field_list =
+  @struct_field_list
+| @tuple_field_list
+;
+
+format_args_args(
+  unique int id: @format_args_arg
+);
+
+#keyset[id]
+format_args_arg_exprs(
+  int id: @format_args_arg ref,
+  int expr: @expr ref
+);
+
+#keyset[id]
+format_args_arg_names(
+  int id: @format_args_arg ref,
+  int name: @name ref
+);
+
+@generic_arg =
+  @assoc_type_arg
+| @const_arg
+| @lifetime_arg
+| @type_arg
+;
+
+generic_arg_lists(
+  unique int id: @generic_arg_list
+);
+
+#keyset[id, index]
+generic_arg_list_generic_args(
+  int id: @generic_arg_list ref,
+  int index: int ref,
+  int generic_arg: @generic_arg ref
+);
+
+@generic_param =
+  @const_param
+| @lifetime_param
+| @type_param
+;
+
+generic_param_lists(
+  unique int id: @generic_param_list
+);
+
+#keyset[id, index]
+generic_param_list_generic_params(
+  int id: @generic_param_list ref,
+  int index: int ref,
+  int generic_param: @generic_param ref
+);
+
+item_lists(
+  unique int id: @item_list
+);
+
+#keyset[id, index]
+item_list_attrs(
+  int id: @item_list ref,
+  int index: int ref,
+  int attr: @attr ref
+);
+
+#keyset[id, index]
+item_list_items(
+  int id: @item_list ref,
+  int index: int ref,
+  int item: @item ref
+);
+
+labels(
+  unique int id: @label
+);
+
+#keyset[id]
+label_lifetimes(
+  int id: @label ref,
+  int lifetime: @lifetime ref
+);
+
+let_elses(
+  unique int id: @let_else
+);
+
+#keyset[id]
+let_else_block_exprs(
+  int id: @let_else ref,
+  int block_expr: @block_expr ref
+);
+
+macro_items(
+  unique int id: @macro_items
+);
+
+#keyset[id, index]
+macro_items_items(
+  int id: @macro_items ref,
+  int index: int ref,
+  int item: @item ref
+);
+
+match_arms(
+  unique int id: @match_arm
+);
+
+#keyset[id, index]
+match_arm_attrs(
+  int id: @match_arm ref,
+  int index: int ref,
+  int attr: @attr ref
+);
+
+#keyset[id]
+match_arm_exprs(
+  int id: @match_arm ref,
+  int expr: @expr ref
+);
+
+#keyset[id]
+match_arm_guards(
+  int id: @match_arm ref,
+  int guard: @match_guard ref
+);
+
+#keyset[id]
+match_arm_pats(
+  int id: @match_arm ref,
+  int pat: @pat ref
+);
+
+match_arm_lists(
+  unique int id: @match_arm_list
+);
+
+#keyset[id, index]
+match_arm_list_arms(
+  int id: @match_arm_list ref,
+  int index: int ref,
+  int arm: @match_arm ref
+);
+
+#keyset[id, index]
+match_arm_list_attrs(
+  int id: @match_arm_list ref,
+  int index: int ref,
+  int attr: @attr ref
+);
+
+match_guards(
+  unique int id: @match_guard
+);
+
+#keyset[id]
+match_guard_conditions(
+  int id: @match_guard ref,
+  int condition: @expr ref
+);
+
+meta(
+  unique int id: @meta
+);
+
+#keyset[id]
+meta_exprs(
+  int id: @meta ref,
+  int expr: @expr ref
+);
+
+#keyset[id]
+meta_is_unsafe(
+  int id: @meta ref
+);
+
+#keyset[id]
+meta_paths(
+  int id: @meta ref,
+  int path: @path ref
+);
+
+#keyset[id]
+meta_token_trees(
+  int id: @meta ref,
+  int token_tree: @token_tree ref
+);
+
+names(
+  unique int id: @name
+);
+
+#keyset[id]
+name_texts(
+  int id: @name ref,
+  string text: string ref
+);
+
+@param_base =
+  @param
+| @self_param
+;
+
+#keyset[id, index]
+param_base_attrs(
+  int id: @param_base ref,
+  int index: int ref,
+  int attr: @attr ref
+);
+
+#keyset[id]
+param_base_type_reprs(
+  int id: @param_base ref,
+  int type_repr: @type_repr ref
+);
+
+param_lists(
+  unique int id: @param_list
+);
+
+#keyset[id, index]
+param_list_params(
+  int id: @param_list ref,
+  int index: int ref,
+  int param: @param ref
+);
+
+#keyset[id]
+param_list_self_params(
+  int id: @param_list ref,
+  int self_param: @self_param ref
+);
+
+parenthesized_arg_lists(
+  unique int id: @parenthesized_arg_list
+);
+
+#keyset[id, index]
+parenthesized_arg_list_type_args(
+  int id: @parenthesized_arg_list ref,
+  int index: int ref,
+  int type_arg: @type_arg ref
+);
+
+@pat =
+  @box_pat
+| @const_block_pat
+| @ident_pat
+| @literal_pat
+| @macro_pat
+| @or_pat
+| @paren_pat
+| @path_pat
+| @range_pat
+| @ref_pat
+| @rest_pat
+| @slice_pat
+| @struct_pat
+| @tuple_pat
+| @tuple_struct_pat
+| @wildcard_pat
+;
+
+paths(
+  unique int id: @path
+);
+
+#keyset[id]
+path_qualifiers(
+  int id: @path ref,
+  int qualifier: @path ref
+);
+
+#keyset[id]
+path_segments_(
+  int id: @path ref,
+  int segment: @path_segment ref
+);
+
+path_segments(
+  unique int id: @path_segment
+);
+
+#keyset[id]
+path_segment_generic_arg_lists(
+  int id: @path_segment ref,
+  int generic_arg_list: @generic_arg_list ref
+);
+
+#keyset[id]
+path_segment_identifiers(
+  int id: @path_segment ref,
+  int identifier: @name_ref ref
+);
+
+#keyset[id]
+path_segment_parenthesized_arg_lists(
+  int id: @path_segment ref,
+  int parenthesized_arg_list: @parenthesized_arg_list ref
+);
+
+#keyset[id]
+path_segment_ret_types(
+  int id: @path_segment ref,
+  int ret_type: @ret_type_repr ref
+);
+
+#keyset[id]
+path_segment_return_type_syntaxes(
+  int id: @path_segment ref,
+  int return_type_syntax: @return_type_syntax ref
+);
+
+#keyset[id]
+path_segment_type_reprs(
+  int id: @path_segment ref,
+  int type_repr: @type_repr ref
+);
+
+#keyset[id]
+path_segment_trait_type_reprs(
+  int id: @path_segment ref,
+  int trait_type_repr: @path_type_repr ref
+);
+
+renames(
+  unique int id: @rename
+);
+
+#keyset[id]
+rename_names(
+  int id: @rename ref,
+  int name: @name ref
+);
+
+@resolvable =
+  @method_call_expr
+| @path_ast_node
+;
+
+#keyset[id]
+resolvable_resolved_paths(
+  int id: @resolvable ref,
+  string resolved_path: string ref
+);
+
+#keyset[id]
+resolvable_resolved_crate_origins(
+  int id: @resolvable ref,
+  string resolved_crate_origin: string ref
+);
+
+ret_type_reprs(
+  unique int id: @ret_type_repr
+);
+
+#keyset[id]
+ret_type_repr_type_reprs(
+  int id: @ret_type_repr ref,
+  int type_repr: @type_repr ref
+);
+
+return_type_syntaxes(
+  unique int id: @return_type_syntax
+);
+
+source_files(
+  unique int id: @source_file
+);
+
+#keyset[id, index]
+source_file_attrs(
+  int id: @source_file ref,
+  int index: int ref,
+  int attr: @attr ref
+);
+
+#keyset[id, index]
+source_file_items(
+  int id: @source_file ref,
+  int index: int ref,
+  int item: @item ref
+);
+
+@stmt =
+  @expr_stmt
+| @item
+| @let_stmt
+;
+
+stmt_lists(
+  unique int id: @stmt_list
+);
+
+#keyset[id, index]
+stmt_list_attrs(
+  int id: @stmt_list ref,
+  int index: int ref,
+  int attr: @attr ref
+);
+
+#keyset[id, index]
+stmt_list_statements(
+  int id: @stmt_list ref,
+  int index: int ref,
+  int statement: @stmt ref
+);
+
+#keyset[id]
+stmt_list_tail_exprs(
+  int id: @stmt_list ref,
+  int tail_expr: @expr ref
+);
+
+struct_expr_fields(
+  unique int id: @struct_expr_field
+);
+
+#keyset[id, index]
+struct_expr_field_attrs(
+  int id: @struct_expr_field ref,
+  int index: int ref,
+  int attr: @attr ref
+);
+
+#keyset[id]
+struct_expr_field_exprs(
+  int id: @struct_expr_field ref,
+  int expr: @expr ref
+);
+
+#keyset[id]
+struct_expr_field_identifiers(
+  int id: @struct_expr_field ref,
+  int identifier: @name_ref ref
+);
+
+struct_expr_field_lists(
+  unique int id: @struct_expr_field_list
+);
+
+#keyset[id, index]
+struct_expr_field_list_attrs(
+  int id: @struct_expr_field_list ref,
+  int index: int ref,
+  int attr: @attr ref
+);
+
+#keyset[id, index]
+struct_expr_field_list_fields(
+  int id: @struct_expr_field_list ref,
+  int index: int ref,
+  int field: @struct_expr_field ref
+);
+
+#keyset[id]
+struct_expr_field_list_spreads(
+  int id: @struct_expr_field_list ref,
+  int spread: @expr ref
+);
+
+struct_fields(
+  unique int id: @struct_field
+);
+
+#keyset[id, index]
+struct_field_attrs(
+  int id: @struct_field ref,
+  int index: int ref,
+  int attr: @attr ref
+);
+
+#keyset[id]
+struct_field_defaults(
+  int id: @struct_field ref,
+  int default: @expr ref
+);
+
+#keyset[id]
+struct_field_is_unsafe(
+  int id: @struct_field ref
+);
+
+#keyset[id]
+struct_field_names(
+  int id: @struct_field ref,
+  int name: @name ref
+);
+
+#keyset[id]
+struct_field_type_reprs(
+  int id: @struct_field ref,
+  int type_repr: @type_repr ref
+);
+
+#keyset[id]
+struct_field_visibilities(
+  int id: @struct_field ref,
+  int visibility: @visibility ref
+);
+
+struct_pat_fields(
+  unique int id: @struct_pat_field
+);
+
+#keyset[id, index]
+struct_pat_field_attrs(
+  int id: @struct_pat_field ref,
+  int index: int ref,
+  int attr: @attr ref
+);
+
+#keyset[id]
+struct_pat_field_identifiers(
+  int id: @struct_pat_field ref,
+  int identifier: @name_ref ref
+);
+
+#keyset[id]
+struct_pat_field_pats(
+  int id: @struct_pat_field ref,
+  int pat: @pat ref
+);
+
+struct_pat_field_lists(
+  unique int id: @struct_pat_field_list
+);
+
+#keyset[id, index]
+struct_pat_field_list_fields(
+  int id: @struct_pat_field_list ref,
+  int index: int ref,
+  int field: @struct_pat_field ref
+);
+
+#keyset[id]
+struct_pat_field_list_rest_pats(
+  int id: @struct_pat_field_list ref,
+  int rest_pat: @rest_pat ref
+);
+
+@token =
+  @comment
+;
+
+token_trees(
+  unique int id: @token_tree
+);
+
+tuple_fields(
+  unique int id: @tuple_field
+);
+
+#keyset[id, index]
+tuple_field_attrs(
+  int id: @tuple_field ref,
+  int index: int ref,
+  int attr: @attr ref
+);
+
+#keyset[id]
+tuple_field_type_reprs(
+  int id: @tuple_field ref,
+  int type_repr: @type_repr ref
+);
+
+#keyset[id]
+tuple_field_visibilities(
+  int id: @tuple_field ref,
+  int visibility: @visibility ref
+);
+
+type_bounds(
+  unique int id: @type_bound
+);
+
+#keyset[id]
+type_bound_is_async(
+  int id: @type_bound ref
+);
+
+#keyset[id]
+type_bound_is_const(
+  int id: @type_bound ref
+);
+
+#keyset[id]
+type_bound_lifetimes(
+  int id: @type_bound ref,
+  int lifetime: @lifetime ref
+);
+
+#keyset[id]
+type_bound_type_reprs(
+  int id: @type_bound ref,
+  int type_repr: @type_repr ref
+);
+
+#keyset[id]
+type_bound_use_bound_generic_args(
+  int id: @type_bound ref,
+  int use_bound_generic_args: @use_bound_generic_args ref
+);
+
+type_bound_lists(
+  unique int id: @type_bound_list
+);
+
+#keyset[id, index]
+type_bound_list_bounds(
+  int id: @type_bound_list ref,
+  int index: int ref,
+  int bound: @type_bound ref
+);
+
+@type_repr =
+  @array_type_repr
+| @dyn_trait_type_repr
+| @fn_ptr_type_repr
+| @for_type_repr
+| @impl_trait_type_repr
+| @infer_type_repr
+| @macro_type_repr
+| @never_type_repr
+| @paren_type_repr
+| @path_type_repr
+| @ptr_type_repr
+| @ref_type_repr
+| @slice_type_repr
+| @tuple_type_repr
+;
+
+@use_bound_generic_arg =
+  @lifetime
+| @name_ref
+;
+
+use_bound_generic_args(
+  unique int id: @use_bound_generic_args
+);
+
+#keyset[id, index]
+use_bound_generic_args_use_bound_generic_args(
+  int id: @use_bound_generic_args ref,
+  int index: int ref,
+  int use_bound_generic_arg: @use_bound_generic_arg ref
+);
+
+use_trees(
+  unique int id: @use_tree
+);
+
+#keyset[id]
+use_tree_is_glob(
+  int id: @use_tree ref
+);
+
+#keyset[id]
+use_tree_paths(
+  int id: @use_tree ref,
+  int path: @path ref
+);
+
+#keyset[id]
+use_tree_renames(
+  int id: @use_tree ref,
+  int rename: @rename ref
+);
+
+#keyset[id]
+use_tree_use_tree_lists(
+  int id: @use_tree ref,
+  int use_tree_list: @use_tree_list ref
+);
+
+use_tree_lists(
+  unique int id: @use_tree_list
+);
+
+#keyset[id, index]
+use_tree_list_use_trees(
+  int id: @use_tree_list ref,
+  int index: int ref,
+  int use_tree: @use_tree ref
+);
+
+@variant_def =
+  @struct
+| @union
+| @variant
+;
+
+variant_lists(
+  unique int id: @variant_list
+);
+
+#keyset[id, index]
+variant_list_variants(
+  int id: @variant_list ref,
+  int index: int ref,
+  int variant: @variant ref
+);
+
+visibilities(
+  unique int id: @visibility
+);
+
+#keyset[id]
+visibility_paths(
+  int id: @visibility ref,
+  int path: @path ref
+);
+
+where_clauses(
+  unique int id: @where_clause
+);
+
+#keyset[id, index]
+where_clause_predicates(
+  int id: @where_clause ref,
+  int index: int ref,
+  int predicate: @where_pred ref
+);
+
+where_preds(
+  unique int id: @where_pred
+);
+
+#keyset[id]
+where_pred_generic_param_lists(
+  int id: @where_pred ref,
+  int generic_param_list: @generic_param_list ref
+);
+
+#keyset[id]
+where_pred_lifetimes(
+  int id: @where_pred ref,
+  int lifetime: @lifetime ref
+);
+
+#keyset[id]
+where_pred_type_reprs(
+  int id: @where_pred ref,
+  int type_repr: @type_repr ref
+);
+
+#keyset[id]
+where_pred_type_bound_lists(
+  int id: @where_pred ref,
+  int type_bound_list: @type_bound_list ref
+);
+
+array_expr_internals(
+  unique int id: @array_expr_internal
+);
+
+#keyset[id, index]
+array_expr_internal_attrs(
+  int id: @array_expr_internal ref,
+  int index: int ref,
+  int attr: @attr ref
+);
+
+#keyset[id, index]
+array_expr_internal_exprs(
+  int id: @array_expr_internal ref,
+  int index: int ref,
+  int expr: @expr ref
+);
+
+#keyset[id]
+array_expr_internal_is_semicolon(
+  int id: @array_expr_internal ref
+);
+
+array_type_reprs(
+  unique int id: @array_type_repr
+);
+
+#keyset[id]
+array_type_repr_const_args(
+  int id: @array_type_repr ref,
+  int const_arg: @const_arg ref
+);
+
+#keyset[id]
+array_type_repr_element_type_reprs(
+  int id: @array_type_repr ref,
+  int element_type_repr: @type_repr ref
+);
+
+asm_clobber_abis(
+  unique int id: @asm_clobber_abi
+);
+
+asm_consts(
+  unique int id: @asm_const
+);
+
+#keyset[id]
+asm_const_exprs(
+  int id: @asm_const ref,
+  int expr: @expr ref
+);
+
+#keyset[id]
+asm_const_is_const(
+  int id: @asm_const ref
+);
+
+asm_exprs(
+  unique int id: @asm_expr
+);
+
+#keyset[id, index]
+asm_expr_asm_pieces(
+  int id: @asm_expr ref,
+  int index: int ref,
+  int asm_piece: @asm_piece ref
+);
+
+#keyset[id, index]
+asm_expr_attrs(
+  int id: @asm_expr ref,
+  int index: int ref,
+  int attr: @attr ref
+);
+
+#keyset[id, index]
+asm_expr_templates(
+  int id: @asm_expr ref,
+  int index: int ref,
+  int template: @expr ref
+);
+
+asm_labels(
+  unique int id: @asm_label
+);
+
+#keyset[id]
+asm_label_block_exprs(
+  int id: @asm_label ref,
+  int block_expr: @block_expr ref
+);
+
+asm_operand_nameds(
+  unique int id: @asm_operand_named
+);
+
+#keyset[id]
+asm_operand_named_asm_operands(
+  int id: @asm_operand_named ref,
+  int asm_operand: @asm_operand ref
+);
+
+#keyset[id]
+asm_operand_named_names(
+  int id: @asm_operand_named ref,
+  int name: @name ref
+);
+
+asm_options_lists(
+  unique int id: @asm_options_list
+);
+
+#keyset[id, index]
+asm_options_list_asm_options(
+  int id: @asm_options_list ref,
+  int index: int ref,
+  int asm_option: @asm_option ref
+);
+
+asm_reg_operands(
+  unique int id: @asm_reg_operand
+);
+
+#keyset[id]
+asm_reg_operand_asm_dir_specs(
+  int id: @asm_reg_operand ref,
+  int asm_dir_spec: @asm_dir_spec ref
+);
+
+#keyset[id]
+asm_reg_operand_asm_operand_exprs(
+  int id: @asm_reg_operand ref,
+  int asm_operand_expr: @asm_operand_expr ref
+);
+
+#keyset[id]
+asm_reg_operand_asm_reg_specs(
+  int id: @asm_reg_operand ref,
+  int asm_reg_spec: @asm_reg_spec ref
+);
+
+asm_syms(
+  unique int id: @asm_sym
+);
+
+#keyset[id]
+asm_sym_paths(
+  int id: @asm_sym ref,
+  int path: @path ref
+);
+
+assoc_type_args(
+  unique int id: @assoc_type_arg
+);
+
+#keyset[id]
+assoc_type_arg_const_args(
+  int id: @assoc_type_arg ref,
+  int const_arg: @const_arg ref
+);
+
+#keyset[id]
+assoc_type_arg_generic_arg_lists(
+  int id: @assoc_type_arg ref,
+  int generic_arg_list: @generic_arg_list ref
+);
+
+#keyset[id]
+assoc_type_arg_identifiers(
+  int id: @assoc_type_arg ref,
+  int identifier: @name_ref ref
+);
+
+#keyset[id]
+assoc_type_arg_param_lists(
+  int id: @assoc_type_arg ref,
+  int param_list: @param_list ref
+);
+
+#keyset[id]
+assoc_type_arg_ret_types(
+  int id: @assoc_type_arg ref,
+  int ret_type: @ret_type_repr ref
+);
+
+#keyset[id]
+assoc_type_arg_return_type_syntaxes(
+  int id: @assoc_type_arg ref,
+  int return_type_syntax: @return_type_syntax ref
+);
+
+#keyset[id]
+assoc_type_arg_type_reprs(
+  int id: @assoc_type_arg ref,
+  int type_repr: @type_repr ref
+);
+
+#keyset[id]
+assoc_type_arg_type_bound_lists(
+  int id: @assoc_type_arg ref,
+  int type_bound_list: @type_bound_list ref
+);
+
+await_exprs(
+  unique int id: @await_expr
+);
+
+#keyset[id, index]
+await_expr_attrs(
+  int id: @await_expr ref,
+  int index: int ref,
+  int attr: @attr ref
+);
+
+#keyset[id]
+await_expr_exprs(
+  int id: @await_expr ref,
+  int expr: @expr ref
+);
+
+become_exprs(
+  unique int id: @become_expr
+);
+
+#keyset[id, index]
+become_expr_attrs(
+  int id: @become_expr ref,
+  int index: int ref,
+  int attr: @attr ref
+);
+
+#keyset[id]
+become_expr_exprs(
+  int id: @become_expr ref,
+  int expr: @expr ref
+);
+
+binary_exprs(
+  unique int id: @binary_expr
+);
+
+#keyset[id, index]
+binary_expr_attrs(
+  int id: @binary_expr ref,
+  int index: int ref,
+  int attr: @attr ref
+);
+
+#keyset[id]
+binary_expr_lhs(
+  int id: @binary_expr ref,
+  int lhs: @expr ref
+);
+
+#keyset[id]
+binary_expr_operator_names(
+  int id: @binary_expr ref,
+  string operator_name: string ref
+);
+
+#keyset[id]
+binary_expr_rhs(
+  int id: @binary_expr ref,
+  int rhs: @expr ref
+);
+
+box_pats(
+  unique int id: @box_pat
+);
+
+#keyset[id]
+box_pat_pats(
+  int id: @box_pat ref,
+  int pat: @pat ref
+);
+
+break_exprs(
+  unique int id: @break_expr
+);
+
+#keyset[id, index]
+break_expr_attrs(
+  int id: @break_expr ref,
+  int index: int ref,
+  int attr: @attr ref
+);
+
+#keyset[id]
+break_expr_exprs(
+  int id: @break_expr ref,
+  int expr: @expr ref
+);
+
+#keyset[id]
+break_expr_lifetimes(
+  int id: @break_expr ref,
+  int lifetime: @lifetime ref
+);
+
+@call_expr_base =
+  @call_expr
+| @method_call_expr
+;
+
+#keyset[id]
+call_expr_base_arg_lists(
+  int id: @call_expr_base ref,
+  int arg_list: @arg_list ref
+);
+
+#keyset[id, index]
+call_expr_base_attrs(
+  int id: @call_expr_base ref,
+  int index: int ref,
+  int attr: @attr ref
+);
+
+cast_exprs(
+  unique int id: @cast_expr
+);
+
+#keyset[id, index]
+cast_expr_attrs(
+  int id: @cast_expr ref,
+  int index: int ref,
+  int attr: @attr ref
+);
+
+#keyset[id]
+cast_expr_exprs(
+  int id: @cast_expr ref,
+  int expr: @expr ref
+);
+
+#keyset[id]
+cast_expr_type_reprs(
+  int id: @cast_expr ref,
+  int type_repr: @type_repr ref
+);
+
+closure_exprs(
+  unique int id: @closure_expr
+);
+
+#keyset[id]
+closure_expr_bodies(
+  int id: @closure_expr ref,
+  int body: @expr ref
+);
+
+#keyset[id]
+closure_expr_closure_binders(
+  int id: @closure_expr ref,
+  int closure_binder: @closure_binder ref
+);
+
+#keyset[id]
+closure_expr_is_async(
+  int id: @closure_expr ref
+);
+
+#keyset[id]
+closure_expr_is_const(
+  int id: @closure_expr ref
+);
+
+#keyset[id]
+closure_expr_is_gen(
+  int id: @closure_expr ref
+);
+
+#keyset[id]
+closure_expr_is_move(
+  int id: @closure_expr ref
+);
+
+#keyset[id]
+closure_expr_is_static(
+  int id: @closure_expr ref
+);
+
+#keyset[id]
+closure_expr_ret_types(
+  int id: @closure_expr ref,
+  int ret_type: @ret_type_repr ref
+);
+
+comments(
+  unique int id: @comment,
+  int parent: @ast_node ref,
+  string text: string ref
+);
+
+const_args(
+  unique int id: @const_arg
+);
+
+#keyset[id]
+const_arg_exprs(
+  int id: @const_arg ref,
+  int expr: @expr ref
+);
+
+const_block_pats(
+  unique int id: @const_block_pat
+);
+
+#keyset[id]
+const_block_pat_block_exprs(
+  int id: @const_block_pat ref,
+  int block_expr: @block_expr ref
+);
+
+#keyset[id]
+const_block_pat_is_const(
+  int id: @const_block_pat ref
+);
+
+const_params(
+  unique int id: @const_param
+);
+
+#keyset[id, index]
+const_param_attrs(
+  int id: @const_param ref,
+  int index: int ref,
+  int attr: @attr ref
+);
+
+#keyset[id]
+const_param_default_vals(
+  int id: @const_param ref,
+  int default_val: @const_arg ref
+);
+
+#keyset[id]
+const_param_is_const(
+  int id: @const_param ref
+);
+
+#keyset[id]
+const_param_names(
+  int id: @const_param ref,
+  int name: @name ref
+);
+
+#keyset[id]
+const_param_type_reprs(
+  int id: @const_param ref,
+  int type_repr: @type_repr ref
+);
+
+continue_exprs(
+  unique int id: @continue_expr
+);
+
+#keyset[id, index]
+continue_expr_attrs(
+  int id: @continue_expr ref,
+  int index: int ref,
+  int attr: @attr ref
+);
+
+#keyset[id]
+continue_expr_lifetimes(
+  int id: @continue_expr ref,
+  int lifetime: @lifetime ref
+);
+
+dyn_trait_type_reprs(
+  unique int id: @dyn_trait_type_repr
+);
+
+#keyset[id]
+dyn_trait_type_repr_type_bound_lists(
+  int id: @dyn_trait_type_repr ref,
+  int type_bound_list: @type_bound_list ref
+);
+
+expr_stmts(
+  unique int id: @expr_stmt
+);
+
+#keyset[id]
+expr_stmt_exprs(
+  int id: @expr_stmt ref,
+  int expr: @expr ref
+);
+
+field_exprs(
+  unique int id: @field_expr
+);
+
+#keyset[id, index]
+field_expr_attrs(
+  int id: @field_expr ref,
+  int index: int ref,
+  int attr: @attr ref
+);
+
+#keyset[id]
+field_expr_containers(
+  int id: @field_expr ref,
+  int container: @expr ref
+);
+
+#keyset[id]
+field_expr_identifiers(
+  int id: @field_expr ref,
+  int identifier: @name_ref ref
+);
+
+fn_ptr_type_reprs(
+  unique int id: @fn_ptr_type_repr
+);
+
+#keyset[id]
+fn_ptr_type_repr_abis(
+  int id: @fn_ptr_type_repr ref,
+  int abi: @abi ref
+);
+
+#keyset[id]
+fn_ptr_type_repr_is_async(
+  int id: @fn_ptr_type_repr ref
+);
+
+#keyset[id]
+fn_ptr_type_repr_is_const(
+  int id: @fn_ptr_type_repr ref
+);
+
+#keyset[id]
+fn_ptr_type_repr_is_unsafe(
+  int id: @fn_ptr_type_repr ref
+);
+
+#keyset[id]
+fn_ptr_type_repr_param_lists(
+  int id: @fn_ptr_type_repr ref,
+  int param_list: @param_list ref
+);
+
+#keyset[id]
+fn_ptr_type_repr_ret_types(
+  int id: @fn_ptr_type_repr ref,
+  int ret_type: @ret_type_repr ref
+);
+
+for_type_reprs(
+  unique int id: @for_type_repr
+);
+
+#keyset[id]
+for_type_repr_generic_param_lists(
+  int id: @for_type_repr ref,
+  int generic_param_list: @generic_param_list ref
+);
+
+#keyset[id]
+for_type_repr_type_reprs(
+  int id: @for_type_repr ref,
+  int type_repr: @type_repr ref
+);
+
+format_args_exprs(
+  unique int id: @format_args_expr
+);
+
+#keyset[id, index]
+format_args_expr_args(
+  int id: @format_args_expr ref,
+  int index: int ref,
+  int arg: @format_args_arg ref
+);
+
+#keyset[id, index]
+format_args_expr_attrs(
+  int id: @format_args_expr ref,
+  int index: int ref,
+  int attr: @attr ref
+);
+
+#keyset[id]
+format_args_expr_templates(
+  int id: @format_args_expr ref,
+  int template: @expr ref
+);
+
+ident_pats(
+  unique int id: @ident_pat
+);
+
+#keyset[id, index]
+ident_pat_attrs(
+  int id: @ident_pat ref,
+  int index: int ref,
+  int attr: @attr ref
+);
+
+#keyset[id]
+ident_pat_is_mut(
+  int id: @ident_pat ref
+);
+
+#keyset[id]
+ident_pat_is_ref(
+  int id: @ident_pat ref
+);
+
+#keyset[id]
+ident_pat_names(
+  int id: @ident_pat ref,
+  int name: @name ref
+);
+
+#keyset[id]
+ident_pat_pats(
+  int id: @ident_pat ref,
+  int pat: @pat ref
+);
+
+if_exprs(
+  unique int id: @if_expr
+);
+
+#keyset[id, index]
+if_expr_attrs(
+  int id: @if_expr ref,
+  int index: int ref,
+  int attr: @attr ref
+);
+
+#keyset[id]
+if_expr_conditions(
+  int id: @if_expr ref,
+  int condition: @expr ref
+);
+
+#keyset[id]
+if_expr_elses(
+  int id: @if_expr ref,
+  int else: @expr ref
+);
+
+#keyset[id]
+if_expr_thens(
+  int id: @if_expr ref,
+  int then: @block_expr ref
+);
+
+impl_trait_type_reprs(
+  unique int id: @impl_trait_type_repr
+);
+
+#keyset[id]
+impl_trait_type_repr_type_bound_lists(
+  int id: @impl_trait_type_repr ref,
+  int type_bound_list: @type_bound_list ref
+);
+
+index_exprs(
+  unique int id: @index_expr
+);
+
+#keyset[id, index]
+index_expr_attrs(
+  int id: @index_expr ref,
+  int index: int ref,
+  int attr: @attr ref
+);
+
+#keyset[id]
+index_expr_bases(
+  int id: @index_expr ref,
+  int base: @expr ref
+);
+
+#keyset[id]
+index_expr_indices(
+  int id: @index_expr ref,
+  int index: @expr ref
+);
+
+infer_type_reprs(
+  unique int id: @infer_type_repr
+);
+
+@item =
+  @const
+| @enum
+| @extern_block
+| @extern_crate
+| @function
+| @impl
+| @macro_call
+| @macro_def
+| @macro_rules
+| @module
+| @static
+| @struct
+| @trait
+| @trait_alias
+| @type_alias
+| @union
+| @use
+;
+
+#keyset[id]
+item_attribute_macro_expansions(
+  int id: @item ref,
+  int attribute_macro_expansion: @macro_items ref
+);
+
+@labelable_expr =
+  @block_expr
+| @looping_expr
+;
+
+#keyset[id]
+labelable_expr_labels(
+  int id: @labelable_expr ref,
+  int label: @label ref
+);
+
+let_exprs(
+  unique int id: @let_expr
+);
+
+#keyset[id, index]
+let_expr_attrs(
+  int id: @let_expr ref,
+  int index: int ref,
+  int attr: @attr ref
+);
+
+#keyset[id]
+let_expr_scrutinees(
+  int id: @let_expr ref,
+  int scrutinee: @expr ref
+);
+
+#keyset[id]
+let_expr_pats(
+  int id: @let_expr ref,
+  int pat: @pat ref
+);
+
+let_stmts(
+  unique int id: @let_stmt
+);
+
+#keyset[id, index]
+let_stmt_attrs(
+  int id: @let_stmt ref,
+  int index: int ref,
+  int attr: @attr ref
+);
+
+#keyset[id]
+let_stmt_initializers(
+  int id: @let_stmt ref,
+  int initializer: @expr ref
+);
+
+#keyset[id]
+let_stmt_let_elses(
+  int id: @let_stmt ref,
+  int let_else: @let_else ref
+);
+
+#keyset[id]
+let_stmt_pats(
+  int id: @let_stmt ref,
+  int pat: @pat ref
+);
+
+#keyset[id]
+let_stmt_type_reprs(
+  int id: @let_stmt ref,
+  int type_repr: @type_repr ref
+);
+
+lifetimes(
+  unique int id: @lifetime
+);
+
+#keyset[id]
+lifetime_texts(
+  int id: @lifetime ref,
+  string text: string ref
+);
+
+lifetime_args(
+  unique int id: @lifetime_arg
+);
+
+#keyset[id]
+lifetime_arg_lifetimes(
+  int id: @lifetime_arg ref,
+  int lifetime: @lifetime ref
+);
+
+lifetime_params(
+  unique int id: @lifetime_param
+);
+
+#keyset[id, index]
+lifetime_param_attrs(
+  int id: @lifetime_param ref,
+  int index: int ref,
+  int attr: @attr ref
+);
+
+#keyset[id]
+lifetime_param_lifetimes(
+  int id: @lifetime_param ref,
+  int lifetime: @lifetime ref
+);
+
+#keyset[id]
+lifetime_param_type_bound_lists(
+  int id: @lifetime_param ref,
+  int type_bound_list: @type_bound_list ref
+);
+
+literal_exprs(
+  unique int id: @literal_expr
+);
+
+#keyset[id, index]
+literal_expr_attrs(
+  int id: @literal_expr ref,
+  int index: int ref,
+  int attr: @attr ref
+);
+
+#keyset[id]
+literal_expr_text_values(
+  int id: @literal_expr ref,
+  string text_value: string ref
+);
+
+literal_pats(
+  unique int id: @literal_pat
+);
+
+#keyset[id]
+literal_pat_literals(
+  int id: @literal_pat ref,
+  int literal: @literal_expr ref
+);
+
+macro_block_exprs(
+  unique int id: @macro_block_expr
+);
+
+#keyset[id]
+macro_block_expr_tail_exprs(
+  int id: @macro_block_expr ref,
+  int tail_expr: @expr ref
+);
+
+#keyset[id, index]
+macro_block_expr_statements(
+  int id: @macro_block_expr ref,
+  int index: int ref,
+  int statement: @stmt ref
+);
+
+macro_exprs(
+  unique int id: @macro_expr
+);
+
+#keyset[id]
+macro_expr_macro_calls(
+  int id: @macro_expr ref,
+  int macro_call: @macro_call ref
+);
+
+macro_pats(
+  unique int id: @macro_pat
+);
+
+#keyset[id]
+macro_pat_macro_calls(
+  int id: @macro_pat ref,
+  int macro_call: @macro_call ref
+);
+
+macro_type_reprs(
+  unique int id: @macro_type_repr
+);
+
+#keyset[id]
+macro_type_repr_macro_calls(
+  int id: @macro_type_repr ref,
+  int macro_call: @macro_call ref
+);
+
+match_exprs(
+  unique int id: @match_expr
+);
+
+#keyset[id, index]
+match_expr_attrs(
+  int id: @match_expr ref,
+  int index: int ref,
+  int attr: @attr ref
+);
+
+#keyset[id]
+match_expr_scrutinees(
+  int id: @match_expr ref,
+  int scrutinee: @expr ref
+);
+
+#keyset[id]
+match_expr_match_arm_lists(
+  int id: @match_expr ref,
+  int match_arm_list: @match_arm_list ref
+);
+
+name_refs(
+  unique int id: @name_ref
+);
+
+#keyset[id]
+name_ref_texts(
+  int id: @name_ref ref,
+  string text: string ref
+);
+
+never_type_reprs(
+  unique int id: @never_type_repr
+);
+
+offset_of_exprs(
+  unique int id: @offset_of_expr
+);
+
+#keyset[id, index]
+offset_of_expr_attrs(
+  int id: @offset_of_expr ref,
+  int index: int ref,
+  int attr: @attr ref
+);
+
+#keyset[id, index]
+offset_of_expr_fields(
+  int id: @offset_of_expr ref,
+  int index: int ref,
+  int field: @name_ref ref
+);
+
+#keyset[id]
+offset_of_expr_type_reprs(
+  int id: @offset_of_expr ref,
+  int type_repr: @type_repr ref
+);
+
+or_pats(
+  unique int id: @or_pat
+);
+
+#keyset[id, index]
+or_pat_pats(
+  int id: @or_pat ref,
+  int index: int ref,
+  int pat: @pat ref
+);
+
+params(
+  unique int id: @param
+);
+
+#keyset[id]
+param_pats(
+  int id: @param ref,
+  int pat: @pat ref
+);
+
+paren_exprs(
+  unique int id: @paren_expr
+);
+
+#keyset[id, index]
+paren_expr_attrs(
+  int id: @paren_expr ref,
+  int index: int ref,
+  int attr: @attr ref
+);
+
+#keyset[id]
+paren_expr_exprs(
+  int id: @paren_expr ref,
+  int expr: @expr ref
+);
+
+paren_pats(
+  unique int id: @paren_pat
+);
+
+#keyset[id]
+paren_pat_pats(
+  int id: @paren_pat ref,
+  int pat: @pat ref
+);
+
+paren_type_reprs(
+  unique int id: @paren_type_repr
+);
+
+#keyset[id]
+paren_type_repr_type_reprs(
+  int id: @paren_type_repr ref,
+  int type_repr: @type_repr ref
+);
+
+@path_ast_node =
+  @path_expr
+| @path_pat
+| @struct_expr
+| @struct_pat
+| @tuple_struct_pat
+;
+
+#keyset[id]
+path_ast_node_paths(
+  int id: @path_ast_node ref,
+  int path: @path ref
+);
+
+@path_expr_base =
+  @path_expr
+;
+
+path_type_reprs(
+  unique int id: @path_type_repr
+);
+
+#keyset[id]
+path_type_repr_paths(
+  int id: @path_type_repr ref,
+  int path: @path ref
+);
+
+prefix_exprs(
+  unique int id: @prefix_expr
+);
+
+#keyset[id, index]
+prefix_expr_attrs(
+  int id: @prefix_expr ref,
+  int index: int ref,
+  int attr: @attr ref
+);
+
+#keyset[id]
+prefix_expr_exprs(
+  int id: @prefix_expr ref,
+  int expr: @expr ref
+);
+
+#keyset[id]
+prefix_expr_operator_names(
+  int id: @prefix_expr ref,
+  string operator_name: string ref
+);
+
+ptr_type_reprs(
+  unique int id: @ptr_type_repr
+);
+
+#keyset[id]
+ptr_type_repr_is_const(
+  int id: @ptr_type_repr ref
+);
+
+#keyset[id]
+ptr_type_repr_is_mut(
+  int id: @ptr_type_repr ref
+);
+
+#keyset[id]
+ptr_type_repr_type_reprs(
+  int id: @ptr_type_repr ref,
+  int type_repr: @type_repr ref
+);
+
+range_exprs(
+  unique int id: @range_expr
+);
+
+#keyset[id, index]
+range_expr_attrs(
+  int id: @range_expr ref,
+  int index: int ref,
+  int attr: @attr ref
+);
+
+#keyset[id]
+range_expr_ends(
+  int id: @range_expr ref,
+  int end: @expr ref
+);
+
+#keyset[id]
+range_expr_operator_names(
+  int id: @range_expr ref,
+  string operator_name: string ref
+);
+
+#keyset[id]
+range_expr_starts(
+  int id: @range_expr ref,
+  int start: @expr ref
+);
+
+range_pats(
+  unique int id: @range_pat
+);
+
+#keyset[id]
+range_pat_ends(
+  int id: @range_pat ref,
+  int end: @pat ref
+);
+
+#keyset[id]
+range_pat_operator_names(
+  int id: @range_pat ref,
+  string operator_name: string ref
+);
+
+#keyset[id]
+range_pat_starts(
+  int id: @range_pat ref,
+  int start: @pat ref
+);
+
+ref_exprs(
+  unique int id: @ref_expr
+);
+
+#keyset[id, index]
+ref_expr_attrs(
+  int id: @ref_expr ref,
+  int index: int ref,
+  int attr: @attr ref
+);
+
+#keyset[id]
+ref_expr_exprs(
+  int id: @ref_expr ref,
+  int expr: @expr ref
+);
+
+#keyset[id]
+ref_expr_is_const(
+  int id: @ref_expr ref
+);
+
+#keyset[id]
+ref_expr_is_mut(
+  int id: @ref_expr ref
+);
+
+#keyset[id]
+ref_expr_is_raw(
+  int id: @ref_expr ref
+);
+
+ref_pats(
+  unique int id: @ref_pat
+);
+
+#keyset[id]
+ref_pat_is_mut(
+  int id: @ref_pat ref
+);
+
+#keyset[id]
+ref_pat_pats(
+  int id: @ref_pat ref,
+  int pat: @pat ref
+);
+
+ref_type_reprs(
+  unique int id: @ref_type_repr
+);
+
+#keyset[id]
+ref_type_repr_is_mut(
+  int id: @ref_type_repr ref
+);
+
+#keyset[id]
+ref_type_repr_lifetimes(
+  int id: @ref_type_repr ref,
+  int lifetime: @lifetime ref
+);
+
+#keyset[id]
+ref_type_repr_type_reprs(
+  int id: @ref_type_repr ref,
+  int type_repr: @type_repr ref
+);
+
+rest_pats(
+  unique int id: @rest_pat
+);
+
+#keyset[id, index]
+rest_pat_attrs(
+  int id: @rest_pat ref,
+  int index: int ref,
+  int attr: @attr ref
+);
+
+return_exprs(
+  unique int id: @return_expr
+);
+
+#keyset[id, index]
+return_expr_attrs(
+  int id: @return_expr ref,
+  int index: int ref,
+  int attr: @attr ref
+);
+
+#keyset[id]
+return_expr_exprs(
+  int id: @return_expr ref,
+  int expr: @expr ref
+);
+
+self_params(
+  unique int id: @self_param
+);
+
+#keyset[id]
+self_param_is_ref(
+  int id: @self_param ref
+);
+
+#keyset[id]
+self_param_is_mut(
+  int id: @self_param ref
+);
+
+#keyset[id]
+self_param_lifetimes(
+  int id: @self_param ref,
+  int lifetime: @lifetime ref
+);
+
+#keyset[id]
+self_param_names(
+  int id: @self_param ref,
+  int name: @name ref
+);
+
+slice_pats(
+  unique int id: @slice_pat
+);
+
+#keyset[id, index]
+slice_pat_pats(
+  int id: @slice_pat ref,
+  int index: int ref,
+  int pat: @pat ref
+);
+
+slice_type_reprs(
+  unique int id: @slice_type_repr
+);
+
+#keyset[id]
+slice_type_repr_type_reprs(
+  int id: @slice_type_repr ref,
+  int type_repr: @type_repr ref
+);
+
+struct_field_lists(
+  unique int id: @struct_field_list
+);
+
+#keyset[id, index]
+struct_field_list_fields(
+  int id: @struct_field_list ref,
+  int index: int ref,
+  int field: @struct_field ref
+);
+
+try_exprs(
+  unique int id: @try_expr
+);
+
+#keyset[id, index]
+try_expr_attrs(
+  int id: @try_expr ref,
+  int index: int ref,
+  int attr: @attr ref
+);
+
+#keyset[id]
+try_expr_exprs(
+  int id: @try_expr ref,
+  int expr: @expr ref
+);
+
+tuple_exprs(
+  unique int id: @tuple_expr
+);
+
+#keyset[id, index]
+tuple_expr_attrs(
+  int id: @tuple_expr ref,
+  int index: int ref,
+  int attr: @attr ref
+);
+
+#keyset[id, index]
+tuple_expr_fields(
+  int id: @tuple_expr ref,
+  int index: int ref,
+  int field: @expr ref
+);
+
+tuple_field_lists(
+  unique int id: @tuple_field_list
+);
+
+#keyset[id, index]
+tuple_field_list_fields(
+  int id: @tuple_field_list ref,
+  int index: int ref,
+  int field: @tuple_field ref
+);
+
+tuple_pats(
+  unique int id: @tuple_pat
+);
+
+#keyset[id, index]
+tuple_pat_fields(
+  int id: @tuple_pat ref,
+  int index: int ref,
+  int field: @pat ref
+);
+
+tuple_type_reprs(
+  unique int id: @tuple_type_repr
+);
+
+#keyset[id, index]
+tuple_type_repr_fields(
+  int id: @tuple_type_repr ref,
+  int index: int ref,
+  int field: @type_repr ref
+);
+
+type_args(
+  unique int id: @type_arg
+);
+
+#keyset[id]
+type_arg_type_reprs(
+  int id: @type_arg ref,
+  int type_repr: @type_repr ref
+);
+
+type_params(
+  unique int id: @type_param
+);
+
+#keyset[id, index]
+type_param_attrs(
+  int id: @type_param ref,
+  int index: int ref,
+  int attr: @attr ref
+);
+
+#keyset[id]
+type_param_default_types(
+  int id: @type_param ref,
+  int default_type: @type_repr ref
+);
+
+#keyset[id]
+type_param_names(
+  int id: @type_param ref,
+  int name: @name ref
+);
+
+#keyset[id]
+type_param_type_bound_lists(
+  int id: @type_param ref,
+  int type_bound_list: @type_bound_list ref
+);
+
+underscore_exprs(
+  unique int id: @underscore_expr
+);
+
+#keyset[id, index]
+underscore_expr_attrs(
+  int id: @underscore_expr ref,
+  int index: int ref,
+  int attr: @attr ref
+);
+
+variants(
+  unique int id: @variant
+);
+
+#keyset[id, index]
+variant_attrs(
+  int id: @variant ref,
+  int index: int ref,
+  int attr: @attr ref
+);
+
+#keyset[id]
+variant_discriminants(
+  int id: @variant ref,
+  int discriminant: @expr ref
+);
+
+#keyset[id]
+variant_field_lists(
+  int id: @variant ref,
+  int field_list: @field_list ref
+);
+
+#keyset[id]
+variant_names(
+  int id: @variant ref,
+  int name: @name ref
+);
+
+#keyset[id]
+variant_visibilities(
+  int id: @variant ref,
+  int visibility: @visibility ref
+);
+
+wildcard_pats(
+  unique int id: @wildcard_pat
+);
+
+yeet_exprs(
+  unique int id: @yeet_expr
+);
+
+#keyset[id, index]
+yeet_expr_attrs(
+  int id: @yeet_expr ref,
+  int index: int ref,
+  int attr: @attr ref
+);
+
+#keyset[id]
+yeet_expr_exprs(
+  int id: @yeet_expr ref,
+  int expr: @expr ref
+);
+
+yield_exprs(
+  unique int id: @yield_expr
+);
+
+#keyset[id, index]
+yield_expr_attrs(
+  int id: @yield_expr ref,
+  int index: int ref,
+  int attr: @attr ref
+);
+
+#keyset[id]
+yield_expr_exprs(
+  int id: @yield_expr ref,
+  int expr: @expr ref
+);
+
+block_exprs(
+  unique int id: @block_expr
+);
+
+#keyset[id, index]
+block_expr_attrs(
+  int id: @block_expr ref,
+  int index: int ref,
+  int attr: @attr ref
+);
+
+#keyset[id]
+block_expr_is_async(
+  int id: @block_expr ref
+);
+
+#keyset[id]
+block_expr_is_const(
+  int id: @block_expr ref
+);
+
+#keyset[id]
+block_expr_is_gen(
+  int id: @block_expr ref
+);
+
+#keyset[id]
+block_expr_is_move(
+  int id: @block_expr ref
+);
+
+#keyset[id]
+block_expr_is_try(
+  int id: @block_expr ref
+);
+
+#keyset[id]
+block_expr_is_unsafe(
+  int id: @block_expr ref
+);
+
+#keyset[id]
+block_expr_stmt_lists(
+  int id: @block_expr ref,
+  int stmt_list: @stmt_list ref
+);
+
+call_exprs(
+  unique int id: @call_expr
+);
+
+#keyset[id]
+call_expr_functions(
+  int id: @call_expr ref,
+  int function: @expr ref
+);
+
+consts(
+  unique int id: @const
+);
+
+#keyset[id, index]
+const_attrs(
+  int id: @const ref,
+  int index: int ref,
+  int attr: @attr ref
+);
+
+#keyset[id]
+const_bodies(
+  int id: @const ref,
+  int body: @expr ref
+);
+
+#keyset[id]
+const_is_const(
+  int id: @const ref
+);
+
+#keyset[id]
+const_is_default(
+  int id: @const ref
+);
+
+#keyset[id]
+const_names(
+  int id: @const ref,
+  int name: @name ref
+);
+
+#keyset[id]
+const_type_reprs(
+  int id: @const ref,
+  int type_repr: @type_repr ref
+);
+
+#keyset[id]
+const_visibilities(
+  int id: @const ref,
+  int visibility: @visibility ref
+);
+
+enums(
+  unique int id: @enum
+);
+
+#keyset[id, index]
+enum_attrs(
+  int id: @enum ref,
+  int index: int ref,
+  int attr: @attr ref
+);
+
+#keyset[id]
+enum_generic_param_lists(
+  int id: @enum ref,
+  int generic_param_list: @generic_param_list ref
+);
+
+#keyset[id]
+enum_names(
+  int id: @enum ref,
+  int name: @name ref
+);
+
+#keyset[id]
+enum_variant_lists(
+  int id: @enum ref,
+  int variant_list: @variant_list ref
+);
+
+#keyset[id]
+enum_visibilities(
+  int id: @enum ref,
+  int visibility: @visibility ref
+);
+
+#keyset[id]
+enum_where_clauses(
+  int id: @enum ref,
+  int where_clause: @where_clause ref
+);
+
+extern_blocks(
+  unique int id: @extern_block
+);
+
+#keyset[id]
+extern_block_abis(
+  int id: @extern_block ref,
+  int abi: @abi ref
+);
+
+#keyset[id, index]
+extern_block_attrs(
+  int id: @extern_block ref,
+  int index: int ref,
+  int attr: @attr ref
+);
+
+#keyset[id]
+extern_block_extern_item_lists(
+  int id: @extern_block ref,
+  int extern_item_list: @extern_item_list ref
+);
+
+#keyset[id]
+extern_block_is_unsafe(
+  int id: @extern_block ref
+);
+
+extern_crates(
+  unique int id: @extern_crate
+);
+
+#keyset[id, index]
+extern_crate_attrs(
+  int id: @extern_crate ref,
+  int index: int ref,
+  int attr: @attr ref
+);
+
+#keyset[id]
+extern_crate_identifiers(
+  int id: @extern_crate ref,
+  int identifier: @name_ref ref
+);
+
+#keyset[id]
+extern_crate_renames(
+  int id: @extern_crate ref,
+  int rename: @rename ref
+);
+
+#keyset[id]
+extern_crate_visibilities(
+  int id: @extern_crate ref,
+  int visibility: @visibility ref
+);
+
+functions(
+  unique int id: @function
+);
+
+#keyset[id]
+function_abis(
+  int id: @function ref,
+  int abi: @abi ref
+);
+
+#keyset[id]
+function_bodies(
+  int id: @function ref,
+  int body: @block_expr ref
+);
+
+#keyset[id]
+function_generic_param_lists(
+  int id: @function ref,
+  int generic_param_list: @generic_param_list ref
+);
+
+#keyset[id]
+function_is_async(
+  int id: @function ref
+);
+
+#keyset[id]
+function_is_const(
+  int id: @function ref
+);
+
+#keyset[id]
+function_is_default(
+  int id: @function ref
+);
+
+#keyset[id]
+function_is_gen(
+  int id: @function ref
+);
+
+#keyset[id]
+function_is_unsafe(
+  int id: @function ref
+);
+
+#keyset[id]
+function_names(
+  int id: @function ref,
+  int name: @name ref
+);
+
+#keyset[id]
+function_ret_types(
+  int id: @function ref,
+  int ret_type: @ret_type_repr ref
+);
+
+#keyset[id]
+function_visibilities(
+  int id: @function ref,
+  int visibility: @visibility ref
+);
+
+#keyset[id]
+function_where_clauses(
+  int id: @function ref,
+  int where_clause: @where_clause ref
+);
+
+impls(
+  unique int id: @impl
+);
+
+#keyset[id]
+impl_assoc_item_lists(
+  int id: @impl ref,
+  int assoc_item_list: @assoc_item_list ref
+);
+
+#keyset[id, index]
+impl_attrs(
+  int id: @impl ref,
+  int index: int ref,
+  int attr: @attr ref
+);
+
+#keyset[id]
+impl_generic_param_lists(
+  int id: @impl ref,
+  int generic_param_list: @generic_param_list ref
+);
+
+#keyset[id]
+impl_is_const(
+  int id: @impl ref
+);
+
+#keyset[id]
+impl_is_default(
+  int id: @impl ref
+);
+
+#keyset[id]
+impl_is_unsafe(
+  int id: @impl ref
+);
+
+#keyset[id]
+impl_self_ties(
+  int id: @impl ref,
+  int self_ty: @type_repr ref
+);
+
+#keyset[id]
+impl_traits(
+  int id: @impl ref,
+  int trait: @type_repr ref
+);
+
+#keyset[id]
+impl_visibilities(
+  int id: @impl ref,
+  int visibility: @visibility ref
+);
+
+#keyset[id]
+impl_where_clauses(
+  int id: @impl ref,
+  int where_clause: @where_clause ref
+);
+
+@looping_expr =
+  @for_expr
+| @loop_expr
+| @while_expr
+;
+
+#keyset[id]
+looping_expr_loop_bodies(
+  int id: @looping_expr ref,
+  int loop_body: @block_expr ref
+);
+
+macro_calls(
+  unique int id: @macro_call
+);
+
+#keyset[id, index]
+macro_call_attrs(
+  int id: @macro_call ref,
+  int index: int ref,
+  int attr: @attr ref
+);
+
+#keyset[id]
+macro_call_paths(
+  int id: @macro_call ref,
+  int path: @path ref
+);
+
+#keyset[id]
+macro_call_token_trees(
+  int id: @macro_call ref,
+  int token_tree: @token_tree ref
+);
+
+#keyset[id]
+macro_call_macro_call_expansions(
+  int id: @macro_call ref,
+  int macro_call_expansion: @ast_node ref
+);
+
+macro_defs(
+  unique int id: @macro_def
+);
+
+#keyset[id]
+macro_def_args(
+  int id: @macro_def ref,
+  int args: @token_tree ref
+);
+
+#keyset[id, index]
+macro_def_attrs(
+  int id: @macro_def ref,
+  int index: int ref,
+  int attr: @attr ref
+);
+
+#keyset[id]
+macro_def_bodies(
+  int id: @macro_def ref,
+  int body: @token_tree ref
+);
+
+#keyset[id]
+macro_def_names(
+  int id: @macro_def ref,
+  int name: @name ref
+);
+
+#keyset[id]
+macro_def_visibilities(
+  int id: @macro_def ref,
+  int visibility: @visibility ref
+);
+
+macro_rules(
+  unique int id: @macro_rules
+);
+
+#keyset[id, index]
+macro_rules_attrs(
+  int id: @macro_rules ref,
+  int index: int ref,
+  int attr: @attr ref
+);
+
+#keyset[id]
+macro_rules_names(
+  int id: @macro_rules ref,
+  int name: @name ref
+);
+
+#keyset[id]
+macro_rules_token_trees(
+  int id: @macro_rules ref,
+  int token_tree: @token_tree ref
+);
+
+#keyset[id]
+macro_rules_visibilities(
+  int id: @macro_rules ref,
+  int visibility: @visibility ref
+);
+
+method_call_exprs(
+  unique int id: @method_call_expr
+);
+
+#keyset[id]
+method_call_expr_generic_arg_lists(
+  int id: @method_call_expr ref,
+  int generic_arg_list: @generic_arg_list ref
+);
+
+#keyset[id]
+method_call_expr_identifiers(
+  int id: @method_call_expr ref,
+  int identifier: @name_ref ref
+);
+
+#keyset[id]
+method_call_expr_receivers(
+  int id: @method_call_expr ref,
+  int receiver: @expr ref
+);
+
+modules(
+  unique int id: @module
+);
+
+#keyset[id, index]
+module_attrs(
+  int id: @module ref,
+  int index: int ref,
+  int attr: @attr ref
+);
+
+#keyset[id]
+module_item_lists(
+  int id: @module ref,
+  int item_list: @item_list ref
+);
+
+#keyset[id]
+module_names(
+  int id: @module ref,
+  int name: @name ref
+);
+
+#keyset[id]
+module_visibilities(
+  int id: @module ref,
+  int visibility: @visibility ref
+);
+
+path_exprs(
+  unique int id: @path_expr
+);
+
+#keyset[id, index]
+path_expr_attrs(
+  int id: @path_expr ref,
+  int index: int ref,
+  int attr: @attr ref
+);
+
+path_pats(
+  unique int id: @path_pat
+);
+
+statics(
+  unique int id: @static
+);
+
+#keyset[id, index]
+static_attrs(
+  int id: @static ref,
+  int index: int ref,
+  int attr: @attr ref
+);
+
+#keyset[id]
+static_bodies(
+  int id: @static ref,
+  int body: @expr ref
+);
+
+#keyset[id]
+static_is_mut(
+  int id: @static ref
+);
+
+#keyset[id]
+static_is_static(
+  int id: @static ref
+);
+
+#keyset[id]
+static_is_unsafe(
+  int id: @static ref
+);
+
+#keyset[id]
+static_names(
+  int id: @static ref,
+  int name: @name ref
+);
+
+#keyset[id]
+static_type_reprs(
+  int id: @static ref,
+  int type_repr: @type_repr ref
+);
+
+#keyset[id]
+static_visibilities(
+  int id: @static ref,
+  int visibility: @visibility ref
+);
+
+structs(
+  unique int id: @struct
+);
+
+#keyset[id, index]
+struct_attrs(
+  int id: @struct ref,
+  int index: int ref,
+  int attr: @attr ref
+);
+
+#keyset[id]
+struct_field_lists_(
+  int id: @struct ref,
+  int field_list: @field_list ref
+);
+
+#keyset[id]
+struct_generic_param_lists(
+  int id: @struct ref,
+  int generic_param_list: @generic_param_list ref
+);
+
+#keyset[id]
+struct_names(
+  int id: @struct ref,
+  int name: @name ref
+);
+
+#keyset[id]
+struct_visibilities(
+  int id: @struct ref,
+  int visibility: @visibility ref
+);
+
+#keyset[id]
+struct_where_clauses(
+  int id: @struct ref,
+  int where_clause: @where_clause ref
+);
+
+struct_exprs(
+  unique int id: @struct_expr
+);
+
+#keyset[id]
+struct_expr_struct_expr_field_lists(
+  int id: @struct_expr ref,
+  int struct_expr_field_list: @struct_expr_field_list ref
+);
+
+struct_pats(
+  unique int id: @struct_pat
+);
+
+#keyset[id]
+struct_pat_struct_pat_field_lists(
+  int id: @struct_pat ref,
+  int struct_pat_field_list: @struct_pat_field_list ref
+);
+
+traits(
+  unique int id: @trait
+);
+
+#keyset[id]
+trait_assoc_item_lists(
+  int id: @trait ref,
+  int assoc_item_list: @assoc_item_list ref
+);
+
+#keyset[id, index]
+trait_attrs(
+  int id: @trait ref,
+  int index: int ref,
+  int attr: @attr ref
+);
+
+#keyset[id]
+trait_generic_param_lists(
+  int id: @trait ref,
+  int generic_param_list: @generic_param_list ref
+);
+
+#keyset[id]
+trait_is_auto(
+  int id: @trait ref
+);
+
+#keyset[id]
+trait_is_unsafe(
+  int id: @trait ref
+);
+
+#keyset[id]
+trait_names(
+  int id: @trait ref,
+  int name: @name ref
+);
+
+#keyset[id]
+trait_type_bound_lists(
+  int id: @trait ref,
+  int type_bound_list: @type_bound_list ref
+);
+
+#keyset[id]
+trait_visibilities(
+  int id: @trait ref,
+  int visibility: @visibility ref
+);
+
+#keyset[id]
+trait_where_clauses(
+  int id: @trait ref,
+  int where_clause: @where_clause ref
+);
+
+trait_aliases(
+  unique int id: @trait_alias
+);
+
+#keyset[id, index]
+trait_alias_attrs(
+  int id: @trait_alias ref,
+  int index: int ref,
+  int attr: @attr ref
+);
+
+#keyset[id]
+trait_alias_generic_param_lists(
+  int id: @trait_alias ref,
+  int generic_param_list: @generic_param_list ref
+);
+
+#keyset[id]
+trait_alias_names(
+  int id: @trait_alias ref,
+  int name: @name ref
+);
+
+#keyset[id]
+trait_alias_type_bound_lists(
+  int id: @trait_alias ref,
+  int type_bound_list: @type_bound_list ref
+);
+
+#keyset[id]
+trait_alias_visibilities(
+  int id: @trait_alias ref,
+  int visibility: @visibility ref
+);
+
+#keyset[id]
+trait_alias_where_clauses(
+  int id: @trait_alias ref,
+  int where_clause: @where_clause ref
+);
+
+tuple_struct_pats(
+  unique int id: @tuple_struct_pat
+);
+
+#keyset[id, index]
+tuple_struct_pat_fields(
+  int id: @tuple_struct_pat ref,
+  int index: int ref,
+  int field: @pat ref
+);
+
+type_aliases(
+  unique int id: @type_alias
+);
+
+#keyset[id, index]
+type_alias_attrs(
+  int id: @type_alias ref,
+  int index: int ref,
+  int attr: @attr ref
+);
+
+#keyset[id]
+type_alias_generic_param_lists(
+  int id: @type_alias ref,
+  int generic_param_list: @generic_param_list ref
+);
+
+#keyset[id]
+type_alias_is_default(
+  int id: @type_alias ref
+);
+
+#keyset[id]
+type_alias_names(
+  int id: @type_alias ref,
+  int name: @name ref
+);
+
+#keyset[id]
+type_alias_type_reprs(
+  int id: @type_alias ref,
+  int type_repr: @type_repr ref
+);
+
+#keyset[id]
+type_alias_type_bound_lists(
+  int id: @type_alias ref,
+  int type_bound_list: @type_bound_list ref
+);
+
+#keyset[id]
+type_alias_visibilities(
+  int id: @type_alias ref,
+  int visibility: @visibility ref
+);
+
+#keyset[id]
+type_alias_where_clauses(
+  int id: @type_alias ref,
+  int where_clause: @where_clause ref
+);
+
+unions(
+  unique int id: @union
+);
+
+#keyset[id, index]
+union_attrs(
+  int id: @union ref,
+  int index: int ref,
+  int attr: @attr ref
+);
+
+#keyset[id]
+union_generic_param_lists(
+  int id: @union ref,
+  int generic_param_list: @generic_param_list ref
+);
+
+#keyset[id]
+union_names(
+  int id: @union ref,
+  int name: @name ref
+);
+
+#keyset[id]
+union_struct_field_lists(
+  int id: @union ref,
+  int struct_field_list: @struct_field_list ref
+);
+
+#keyset[id]
+union_visibilities(
+  int id: @union ref,
+  int visibility: @visibility ref
+);
+
+#keyset[id]
+union_where_clauses(
+  int id: @union ref,
+  int where_clause: @where_clause ref
+);
+
+uses(
+  unique int id: @use
+);
+
+#keyset[id, index]
+use_attrs(
+  int id: @use ref,
+  int index: int ref,
+  int attr: @attr ref
+);
+
+#keyset[id]
+use_use_trees(
+  int id: @use ref,
+  int use_tree: @use_tree ref
+);
+
+#keyset[id]
+use_visibilities(
+  int id: @use ref,
+  int visibility: @visibility ref
+);
+
+for_exprs(
+  unique int id: @for_expr
+);
+
+#keyset[id, index]
+for_expr_attrs(
+  int id: @for_expr ref,
+  int index: int ref,
+  int attr: @attr ref
+);
+
+#keyset[id]
+for_expr_iterables(
+  int id: @for_expr ref,
+  int iterable: @expr ref
+);
+
+#keyset[id]
+for_expr_pats(
+  int id: @for_expr ref,
+  int pat: @pat ref
+);
+
+loop_exprs(
+  unique int id: @loop_expr
+);
+
+#keyset[id, index]
+loop_expr_attrs(
+  int id: @loop_expr ref,
+  int index: int ref,
+  int attr: @attr ref
+);
+
+while_exprs(
+  unique int id: @while_expr
+);
+
+#keyset[id, index]
+while_expr_attrs(
+  int id: @while_expr ref,
+  int index: int ref,
+  int attr: @attr ref
+);
+
+#keyset[id]
+while_expr_conditions(
+  int id: @while_expr ref,
+  int condition: @expr ref
+);
diff --git a/rust/ql/lib/upgrades/a1005655e9efc9f67d3aa2b7a3128f6b80d405a9/rust.dbscheme b/rust/ql/lib/upgrades/a1005655e9efc9f67d3aa2b7a3128f6b80d405a9/rust.dbscheme
new file mode 100644
index 00000000000..aa9a0bda17c
--- /dev/null
+++ b/rust/ql/lib/upgrades/a1005655e9efc9f67d3aa2b7a3128f6b80d405a9/rust.dbscheme
@@ -0,0 +1,3616 @@
+// generated by codegen, do not edit
+
+// from ../shared/tree-sitter-extractor/src/generator/prefix.dbscheme
+/*- Files and folders -*/
+
+/**
+ * The location of an element.
+ * The location spans column `startcolumn` of line `startline` to
+ * column `endcolumn` of line `endline` in file `file`.
+ * For more information, see
+ * [Locations](https://codeql.github.com/docs/writing-codeql-queries/providing-locations-in-codeql-queries/).
+ */
+locations_default(
+  unique int id: @location_default,
+  int file: @file ref,
+  int beginLine: int ref,
+  int beginColumn: int ref,
+  int endLine: int ref,
+  int endColumn: int ref
+);
+
+files(
+  unique int id: @file,
+  string name: string ref
+);
+
+folders(
+  unique int id: @folder,
+  string name: string ref
+);
+
+@container = @file | @folder
+
+containerparent(
+  int parent: @container ref,
+  unique int child: @container ref
+);
+
+/*- Empty location -*/
+
+empty_location(
+  int location: @location_default ref
+);
+
+/*- Source location prefix -*/
+
+/**
+ * The source location of the snapshot.
+ */
+sourceLocationPrefix(string prefix : string ref);
+
+/*- Diagnostic messages -*/
+
+diagnostics(
+  unique int id: @diagnostic,
+  int severity: int ref,
+  string error_tag: string ref,
+  string error_message: string ref,
+  string full_error_message: string ref,
+  int location: @location_default ref
+);
+
+/*- Diagnostic messages: severity -*/
+
+case @diagnostic.severity of
+  10 = @diagnostic_debug
+| 20 = @diagnostic_info
+| 30 = @diagnostic_warning
+| 40 = @diagnostic_error
+;
+
+/*- YAML -*/
+
+#keyset[parent, idx]
+yaml (unique int id: @yaml_node,
+      int kind: int ref,
+      int parent: @yaml_node_parent ref,
+      int idx: int ref,
+      string tag: string ref,
+      string tostring: string ref);
+
+case @yaml_node.kind of
+  0 = @yaml_scalar_node
+| 1 = @yaml_mapping_node
+| 2 = @yaml_sequence_node
+| 3 = @yaml_alias_node
+;
+
+@yaml_collection_node = @yaml_mapping_node | @yaml_sequence_node;
+
+@yaml_node_parent = @yaml_collection_node | @file;
+
+yaml_anchors (unique int node: @yaml_node ref,
+              string anchor: string ref);
+
+yaml_aliases (unique int alias: @yaml_alias_node ref,
+              string target: string ref);
+
+yaml_scalars (unique int scalar: @yaml_scalar_node ref,
+              int style: int ref,
+              string value: string ref);
+
+yaml_errors (unique int id: @yaml_error,
+             string message: string ref);
+
+yaml_locations(unique int locatable: @yaml_locatable ref,
+             int location: @location_default ref);
+
+@yaml_locatable = @yaml_node | @yaml_error;
+
+
+// from prefix.dbscheme
+#keyset[id]
+locatable_locations(
+  int id: @locatable ref,
+  int location: @location_default ref
+);
+
+
+// from schema
+
+@element =
+  @extractor_step
+| @locatable
+| @named_crate
+| @unextracted
+;
+
+extractor_steps(
+  unique int id: @extractor_step,
+  string action: string ref,
+  int duration_ms: int ref
+);
+
+#keyset[id]
+extractor_step_files(
+  int id: @extractor_step ref,
+  int file: @file ref
+);
+
+@locatable =
+  @ast_node
+| @crate
+;
+
+named_crates(
+  unique int id: @named_crate,
+  string name: string ref,
+  int crate: @crate ref
+);
+
+@unextracted =
+  @missing
+| @unimplemented
+;
+
+@ast_node =
+  @abi
+| @addressable
+| @arg_list
+| @asm_dir_spec
+| @asm_operand
+| @asm_operand_expr
+| @asm_option
+| @asm_piece
+| @asm_reg_spec
+| @assoc_item
+| @assoc_item_list
+| @attr
+| @callable
+| @closure_binder
+| @expr
+| @extern_item
+| @extern_item_list
+| @field_list
+| @format_args_arg
+| @generic_arg
+| @generic_arg_list
+| @generic_param
+| @generic_param_list
+| @item_list
+| @label
+| @let_else
+| @macro_items
+| @match_arm
+| @match_arm_list
+| @match_guard
+| @meta
+| @name
+| @param_base
+| @param_list
+| @parenthesized_arg_list
+| @pat
+| @path
+| @path_segment
+| @rename
+| @resolvable
+| @ret_type_repr
+| @return_type_syntax
+| @source_file
+| @stmt
+| @stmt_list
+| @struct_expr_field
+| @struct_expr_field_list
+| @struct_field
+| @struct_pat_field
+| @struct_pat_field_list
+| @token
+| @token_tree
+| @tuple_field
+| @type_bound
+| @type_bound_list
+| @type_repr
+| @use_bound_generic_arg
+| @use_bound_generic_args
+| @use_tree
+| @use_tree_list
+| @variant_def
+| @variant_list
+| @visibility
+| @where_clause
+| @where_pred
+;
+
+crates(
+  unique int id: @crate
+);
+
+#keyset[id]
+crate_names(
+  int id: @crate ref,
+  string name: string ref
+);
+
+#keyset[id]
+crate_versions(
+  int id: @crate ref,
+  string version: string ref
+);
+
+#keyset[id, index]
+crate_cfg_options(
+  int id: @crate ref,
+  int index: int ref,
+  string cfg_option: string ref
+);
+
+#keyset[id, index]
+crate_named_dependencies(
+  int id: @crate ref,
+  int index: int ref,
+  int named_dependency: @named_crate ref
+);
+
+missings(
+  unique int id: @missing
+);
+
+unimplementeds(
+  unique int id: @unimplemented
+);
+
+abis(
+  unique int id: @abi
+);
+
+#keyset[id]
+abi_abi_strings(
+  int id: @abi ref,
+  string abi_string: string ref
+);
+
+@addressable =
+  @item
+| @variant
+;
+
+#keyset[id]
+addressable_extended_canonical_paths(
+  int id: @addressable ref,
+  string extended_canonical_path: string ref
+);
+
+#keyset[id]
+addressable_crate_origins(
+  int id: @addressable ref,
+  string crate_origin: string ref
+);
+
+arg_lists(
+  unique int id: @arg_list
+);
+
+#keyset[id, index]
+arg_list_args(
+  int id: @arg_list ref,
+  int index: int ref,
+  int arg: @expr ref
+);
+
+asm_dir_specs(
+  unique int id: @asm_dir_spec
+);
+
+@asm_operand =
+  @asm_const
+| @asm_label
+| @asm_reg_operand
+| @asm_sym
+;
+
+asm_operand_exprs(
+  unique int id: @asm_operand_expr
+);
+
+#keyset[id]
+asm_operand_expr_in_exprs(
+  int id: @asm_operand_expr ref,
+  int in_expr: @expr ref
+);
+
+#keyset[id]
+asm_operand_expr_out_exprs(
+  int id: @asm_operand_expr ref,
+  int out_expr: @expr ref
+);
+
+asm_options(
+  unique int id: @asm_option
+);
+
+#keyset[id]
+asm_option_is_raw(
+  int id: @asm_option ref
+);
+
+@asm_piece =
+  @asm_clobber_abi
+| @asm_operand_named
+| @asm_options_list
+;
+
+asm_reg_specs(
+  unique int id: @asm_reg_spec
+);
+
+#keyset[id]
+asm_reg_spec_identifiers(
+  int id: @asm_reg_spec ref,
+  int identifier: @name_ref ref
+);
+
+@assoc_item =
+  @const
+| @function
+| @macro_call
+| @type_alias
+;
+
+assoc_item_lists(
+  unique int id: @assoc_item_list
+);
+
+#keyset[id, index]
+assoc_item_list_assoc_items(
+  int id: @assoc_item_list ref,
+  int index: int ref,
+  int assoc_item: @assoc_item ref
+);
+
+#keyset[id, index]
+assoc_item_list_attrs(
+  int id: @assoc_item_list ref,
+  int index: int ref,
+  int attr: @attr ref
+);
+
+attrs(
+  unique int id: @attr
+);
+
+#keyset[id]
+attr_meta(
+  int id: @attr ref,
+  int meta: @meta ref
+);
+
+@callable =
+  @closure_expr
+| @function
+;
+
+#keyset[id]
+callable_param_lists(
+  int id: @callable ref,
+  int param_list: @param_list ref
+);
+
+#keyset[id, index]
+callable_attrs(
+  int id: @callable ref,
+  int index: int ref,
+  int attr: @attr ref
+);
+
+closure_binders(
+  unique int id: @closure_binder
+);
+
+#keyset[id]
+closure_binder_generic_param_lists(
+  int id: @closure_binder ref,
+  int generic_param_list: @generic_param_list ref
+);
+
+@expr =
+  @array_expr_internal
+| @asm_expr
+| @await_expr
+| @become_expr
+| @binary_expr
+| @break_expr
+| @call_expr_base
+| @cast_expr
+| @closure_expr
+| @continue_expr
+| @field_expr
+| @format_args_expr
+| @if_expr
+| @index_expr
+| @labelable_expr
+| @let_expr
+| @literal_expr
+| @macro_block_expr
+| @macro_expr
+| @match_expr
+| @offset_of_expr
+| @paren_expr
+| @path_expr_base
+| @prefix_expr
+| @range_expr
+| @ref_expr
+| @return_expr
+| @struct_expr
+| @try_expr
+| @tuple_expr
+| @underscore_expr
+| @yeet_expr
+| @yield_expr
+;
+
+@extern_item =
+  @function
+| @macro_call
+| @static
+| @type_alias
+;
+
+extern_item_lists(
+  unique int id: @extern_item_list
+);
+
+#keyset[id, index]
+extern_item_list_attrs(
+  int id: @extern_item_list ref,
+  int index: int ref,
+  int attr: @attr ref
+);
+
+#keyset[id, index]
+extern_item_list_extern_items(
+  int id: @extern_item_list ref,
+  int index: int ref,
+  int extern_item: @extern_item ref
+);
+
+@field_list =
+  @struct_field_list
+| @tuple_field_list
+;
+
+format_args_args(
+  unique int id: @format_args_arg
+);
+
+#keyset[id]
+format_args_arg_exprs(
+  int id: @format_args_arg ref,
+  int expr: @expr ref
+);
+
+#keyset[id]
+format_args_arg_names(
+  int id: @format_args_arg ref,
+  int name: @name ref
+);
+
+@generic_arg =
+  @assoc_type_arg
+| @const_arg
+| @lifetime_arg
+| @type_arg
+;
+
+generic_arg_lists(
+  unique int id: @generic_arg_list
+);
+
+#keyset[id, index]
+generic_arg_list_generic_args(
+  int id: @generic_arg_list ref,
+  int index: int ref,
+  int generic_arg: @generic_arg ref
+);
+
+@generic_param =
+  @const_param
+| @lifetime_param
+| @type_param
+;
+
+generic_param_lists(
+  unique int id: @generic_param_list
+);
+
+#keyset[id, index]
+generic_param_list_generic_params(
+  int id: @generic_param_list ref,
+  int index: int ref,
+  int generic_param: @generic_param ref
+);
+
+item_lists(
+  unique int id: @item_list
+);
+
+#keyset[id, index]
+item_list_attrs(
+  int id: @item_list ref,
+  int index: int ref,
+  int attr: @attr ref
+);
+
+#keyset[id, index]
+item_list_items(
+  int id: @item_list ref,
+  int index: int ref,
+  int item: @item ref
+);
+
+labels(
+  unique int id: @label
+);
+
+#keyset[id]
+label_lifetimes(
+  int id: @label ref,
+  int lifetime: @lifetime ref
+);
+
+let_elses(
+  unique int id: @let_else
+);
+
+#keyset[id]
+let_else_block_exprs(
+  int id: @let_else ref,
+  int block_expr: @block_expr ref
+);
+
+macro_items(
+  unique int id: @macro_items
+);
+
+#keyset[id, index]
+macro_items_items(
+  int id: @macro_items ref,
+  int index: int ref,
+  int item: @item ref
+);
+
+match_arms(
+  unique int id: @match_arm
+);
+
+#keyset[id, index]
+match_arm_attrs(
+  int id: @match_arm ref,
+  int index: int ref,
+  int attr: @attr ref
+);
+
+#keyset[id]
+match_arm_exprs(
+  int id: @match_arm ref,
+  int expr: @expr ref
+);
+
+#keyset[id]
+match_arm_guards(
+  int id: @match_arm ref,
+  int guard: @match_guard ref
+);
+
+#keyset[id]
+match_arm_pats(
+  int id: @match_arm ref,
+  int pat: @pat ref
+);
+
+match_arm_lists(
+  unique int id: @match_arm_list
+);
+
+#keyset[id, index]
+match_arm_list_arms(
+  int id: @match_arm_list ref,
+  int index: int ref,
+  int arm: @match_arm ref
+);
+
+#keyset[id, index]
+match_arm_list_attrs(
+  int id: @match_arm_list ref,
+  int index: int ref,
+  int attr: @attr ref
+);
+
+match_guards(
+  unique int id: @match_guard
+);
+
+#keyset[id]
+match_guard_conditions(
+  int id: @match_guard ref,
+  int condition: @expr ref
+);
+
+meta(
+  unique int id: @meta
+);
+
+#keyset[id]
+meta_exprs(
+  int id: @meta ref,
+  int expr: @expr ref
+);
+
+#keyset[id]
+meta_is_unsafe(
+  int id: @meta ref
+);
+
+#keyset[id]
+meta_paths(
+  int id: @meta ref,
+  int path: @path ref
+);
+
+#keyset[id]
+meta_token_trees(
+  int id: @meta ref,
+  int token_tree: @token_tree ref
+);
+
+names(
+  unique int id: @name
+);
+
+#keyset[id]
+name_texts(
+  int id: @name ref,
+  string text: string ref
+);
+
+@param_base =
+  @param
+| @self_param
+;
+
+#keyset[id, index]
+param_base_attrs(
+  int id: @param_base ref,
+  int index: int ref,
+  int attr: @attr ref
+);
+
+#keyset[id]
+param_base_type_reprs(
+  int id: @param_base ref,
+  int type_repr: @type_repr ref
+);
+
+param_lists(
+  unique int id: @param_list
+);
+
+#keyset[id, index]
+param_list_params(
+  int id: @param_list ref,
+  int index: int ref,
+  int param: @param ref
+);
+
+#keyset[id]
+param_list_self_params(
+  int id: @param_list ref,
+  int self_param: @self_param ref
+);
+
+parenthesized_arg_lists(
+  unique int id: @parenthesized_arg_list
+);
+
+#keyset[id, index]
+parenthesized_arg_list_type_args(
+  int id: @parenthesized_arg_list ref,
+  int index: int ref,
+  int type_arg: @type_arg ref
+);
+
+@pat =
+  @box_pat
+| @const_block_pat
+| @ident_pat
+| @literal_pat
+| @macro_pat
+| @or_pat
+| @paren_pat
+| @path_pat
+| @range_pat
+| @ref_pat
+| @rest_pat
+| @slice_pat
+| @struct_pat
+| @tuple_pat
+| @tuple_struct_pat
+| @wildcard_pat
+;
+
+paths(
+  unique int id: @path
+);
+
+#keyset[id]
+path_qualifiers(
+  int id: @path ref,
+  int qualifier: @path ref
+);
+
+#keyset[id]
+path_segments_(
+  int id: @path ref,
+  int segment: @path_segment ref
+);
+
+path_segments(
+  unique int id: @path_segment
+);
+
+#keyset[id]
+path_segment_generic_arg_lists(
+  int id: @path_segment ref,
+  int generic_arg_list: @generic_arg_list ref
+);
+
+#keyset[id]
+path_segment_identifiers(
+  int id: @path_segment ref,
+  int identifier: @name_ref ref
+);
+
+#keyset[id]
+path_segment_parenthesized_arg_lists(
+  int id: @path_segment ref,
+  int parenthesized_arg_list: @parenthesized_arg_list ref
+);
+
+#keyset[id]
+path_segment_ret_types(
+  int id: @path_segment ref,
+  int ret_type: @ret_type_repr ref
+);
+
+#keyset[id]
+path_segment_return_type_syntaxes(
+  int id: @path_segment ref,
+  int return_type_syntax: @return_type_syntax ref
+);
+
+#keyset[id]
+path_segment_type_reprs(
+  int id: @path_segment ref,
+  int type_repr: @type_repr ref
+);
+
+#keyset[id]
+path_segment_trait_type_reprs(
+  int id: @path_segment ref,
+  int trait_type_repr: @path_type_repr ref
+);
+
+renames(
+  unique int id: @rename
+);
+
+#keyset[id]
+rename_names(
+  int id: @rename ref,
+  int name: @name ref
+);
+
+@resolvable =
+  @method_call_expr
+| @path_ast_node
+;
+
+#keyset[id]
+resolvable_resolved_paths(
+  int id: @resolvable ref,
+  string resolved_path: string ref
+);
+
+#keyset[id]
+resolvable_resolved_crate_origins(
+  int id: @resolvable ref,
+  string resolved_crate_origin: string ref
+);
+
+ret_type_reprs(
+  unique int id: @ret_type_repr
+);
+
+#keyset[id]
+ret_type_repr_type_reprs(
+  int id: @ret_type_repr ref,
+  int type_repr: @type_repr ref
+);
+
+return_type_syntaxes(
+  unique int id: @return_type_syntax
+);
+
+source_files(
+  unique int id: @source_file
+);
+
+#keyset[id, index]
+source_file_attrs(
+  int id: @source_file ref,
+  int index: int ref,
+  int attr: @attr ref
+);
+
+#keyset[id, index]
+source_file_items(
+  int id: @source_file ref,
+  int index: int ref,
+  int item: @item ref
+);
+
+@stmt =
+  @expr_stmt
+| @item
+| @let_stmt
+;
+
+stmt_lists(
+  unique int id: @stmt_list
+);
+
+#keyset[id, index]
+stmt_list_attrs(
+  int id: @stmt_list ref,
+  int index: int ref,
+  int attr: @attr ref
+);
+
+#keyset[id, index]
+stmt_list_statements(
+  int id: @stmt_list ref,
+  int index: int ref,
+  int statement: @stmt ref
+);
+
+#keyset[id]
+stmt_list_tail_exprs(
+  int id: @stmt_list ref,
+  int tail_expr: @expr ref
+);
+
+struct_expr_fields(
+  unique int id: @struct_expr_field
+);
+
+#keyset[id, index]
+struct_expr_field_attrs(
+  int id: @struct_expr_field ref,
+  int index: int ref,
+  int attr: @attr ref
+);
+
+#keyset[id]
+struct_expr_field_exprs(
+  int id: @struct_expr_field ref,
+  int expr: @expr ref
+);
+
+#keyset[id]
+struct_expr_field_identifiers(
+  int id: @struct_expr_field ref,
+  int identifier: @name_ref ref
+);
+
+struct_expr_field_lists(
+  unique int id: @struct_expr_field_list
+);
+
+#keyset[id, index]
+struct_expr_field_list_attrs(
+  int id: @struct_expr_field_list ref,
+  int index: int ref,
+  int attr: @attr ref
+);
+
+#keyset[id, index]
+struct_expr_field_list_fields(
+  int id: @struct_expr_field_list ref,
+  int index: int ref,
+  int field: @struct_expr_field ref
+);
+
+#keyset[id]
+struct_expr_field_list_spreads(
+  int id: @struct_expr_field_list ref,
+  int spread: @expr ref
+);
+
+struct_fields(
+  unique int id: @struct_field
+);
+
+#keyset[id, index]
+struct_field_attrs(
+  int id: @struct_field ref,
+  int index: int ref,
+  int attr: @attr ref
+);
+
+#keyset[id]
+struct_field_defaults(
+  int id: @struct_field ref,
+  int default: @expr ref
+);
+
+#keyset[id]
+struct_field_is_unsafe(
+  int id: @struct_field ref
+);
+
+#keyset[id]
+struct_field_names(
+  int id: @struct_field ref,
+  int name: @name ref
+);
+
+#keyset[id]
+struct_field_type_reprs(
+  int id: @struct_field ref,
+  int type_repr: @type_repr ref
+);
+
+#keyset[id]
+struct_field_visibilities(
+  int id: @struct_field ref,
+  int visibility: @visibility ref
+);
+
+struct_pat_fields(
+  unique int id: @struct_pat_field
+);
+
+#keyset[id, index]
+struct_pat_field_attrs(
+  int id: @struct_pat_field ref,
+  int index: int ref,
+  int attr: @attr ref
+);
+
+#keyset[id]
+struct_pat_field_identifiers(
+  int id: @struct_pat_field ref,
+  int identifier: @name_ref ref
+);
+
+#keyset[id]
+struct_pat_field_pats(
+  int id: @struct_pat_field ref,
+  int pat: @pat ref
+);
+
+struct_pat_field_lists(
+  unique int id: @struct_pat_field_list
+);
+
+#keyset[id, index]
+struct_pat_field_list_fields(
+  int id: @struct_pat_field_list ref,
+  int index: int ref,
+  int field: @struct_pat_field ref
+);
+
+#keyset[id]
+struct_pat_field_list_rest_pats(
+  int id: @struct_pat_field_list ref,
+  int rest_pat: @rest_pat ref
+);
+
+@token =
+  @comment
+;
+
+token_trees(
+  unique int id: @token_tree
+);
+
+tuple_fields(
+  unique int id: @tuple_field
+);
+
+#keyset[id, index]
+tuple_field_attrs(
+  int id: @tuple_field ref,
+  int index: int ref,
+  int attr: @attr ref
+);
+
+#keyset[id]
+tuple_field_type_reprs(
+  int id: @tuple_field ref,
+  int type_repr: @type_repr ref
+);
+
+#keyset[id]
+tuple_field_visibilities(
+  int id: @tuple_field ref,
+  int visibility: @visibility ref
+);
+
+type_bounds(
+  unique int id: @type_bound
+);
+
+#keyset[id]
+type_bound_is_async(
+  int id: @type_bound ref
+);
+
+#keyset[id]
+type_bound_is_const(
+  int id: @type_bound ref
+);
+
+#keyset[id]
+type_bound_lifetimes(
+  int id: @type_bound ref,
+  int lifetime: @lifetime ref
+);
+
+#keyset[id]
+type_bound_type_reprs(
+  int id: @type_bound ref,
+  int type_repr: @type_repr ref
+);
+
+#keyset[id]
+type_bound_use_bound_generic_args(
+  int id: @type_bound ref,
+  int use_bound_generic_args: @use_bound_generic_args ref
+);
+
+type_bound_lists(
+  unique int id: @type_bound_list
+);
+
+#keyset[id, index]
+type_bound_list_bounds(
+  int id: @type_bound_list ref,
+  int index: int ref,
+  int bound: @type_bound ref
+);
+
+@type_repr =
+  @array_type_repr
+| @dyn_trait_type_repr
+| @fn_ptr_type_repr
+| @for_type_repr
+| @impl_trait_type_repr
+| @infer_type_repr
+| @macro_type_repr
+| @never_type_repr
+| @paren_type_repr
+| @path_type_repr
+| @ptr_type_repr
+| @ref_type_repr
+| @slice_type_repr
+| @tuple_type_repr
+;
+
+@use_bound_generic_arg =
+  @lifetime
+| @name_ref
+;
+
+use_bound_generic_args(
+  unique int id: @use_bound_generic_args
+);
+
+#keyset[id, index]
+use_bound_generic_args_use_bound_generic_args(
+  int id: @use_bound_generic_args ref,
+  int index: int ref,
+  int use_bound_generic_arg: @use_bound_generic_arg ref
+);
+
+use_trees(
+  unique int id: @use_tree
+);
+
+#keyset[id]
+use_tree_is_glob(
+  int id: @use_tree ref
+);
+
+#keyset[id]
+use_tree_paths(
+  int id: @use_tree ref,
+  int path: @path ref
+);
+
+#keyset[id]
+use_tree_renames(
+  int id: @use_tree ref,
+  int rename: @rename ref
+);
+
+#keyset[id]
+use_tree_use_tree_lists(
+  int id: @use_tree ref,
+  int use_tree_list: @use_tree_list ref
+);
+
+use_tree_lists(
+  unique int id: @use_tree_list
+);
+
+#keyset[id, index]
+use_tree_list_use_trees(
+  int id: @use_tree_list ref,
+  int index: int ref,
+  int use_tree: @use_tree ref
+);
+
+@variant_def =
+  @struct
+| @union
+| @variant
+;
+
+variant_lists(
+  unique int id: @variant_list
+);
+
+#keyset[id, index]
+variant_list_variants(
+  int id: @variant_list ref,
+  int index: int ref,
+  int variant: @variant ref
+);
+
+visibilities(
+  unique int id: @visibility
+);
+
+#keyset[id]
+visibility_paths(
+  int id: @visibility ref,
+  int path: @path ref
+);
+
+where_clauses(
+  unique int id: @where_clause
+);
+
+#keyset[id, index]
+where_clause_predicates(
+  int id: @where_clause ref,
+  int index: int ref,
+  int predicate: @where_pred ref
+);
+
+where_preds(
+  unique int id: @where_pred
+);
+
+#keyset[id]
+where_pred_generic_param_lists(
+  int id: @where_pred ref,
+  int generic_param_list: @generic_param_list ref
+);
+
+#keyset[id]
+where_pred_lifetimes(
+  int id: @where_pred ref,
+  int lifetime: @lifetime ref
+);
+
+#keyset[id]
+where_pred_type_reprs(
+  int id: @where_pred ref,
+  int type_repr: @type_repr ref
+);
+
+#keyset[id]
+where_pred_type_bound_lists(
+  int id: @where_pred ref,
+  int type_bound_list: @type_bound_list ref
+);
+
+array_expr_internals(
+  unique int id: @array_expr_internal
+);
+
+#keyset[id, index]
+array_expr_internal_attrs(
+  int id: @array_expr_internal ref,
+  int index: int ref,
+  int attr: @attr ref
+);
+
+#keyset[id, index]
+array_expr_internal_exprs(
+  int id: @array_expr_internal ref,
+  int index: int ref,
+  int expr: @expr ref
+);
+
+#keyset[id]
+array_expr_internal_is_semicolon(
+  int id: @array_expr_internal ref
+);
+
+array_type_reprs(
+  unique int id: @array_type_repr
+);
+
+#keyset[id]
+array_type_repr_const_args(
+  int id: @array_type_repr ref,
+  int const_arg: @const_arg ref
+);
+
+#keyset[id]
+array_type_repr_element_type_reprs(
+  int id: @array_type_repr ref,
+  int element_type_repr: @type_repr ref
+);
+
+asm_clobber_abis(
+  unique int id: @asm_clobber_abi
+);
+
+asm_consts(
+  unique int id: @asm_const
+);
+
+#keyset[id]
+asm_const_exprs(
+  int id: @asm_const ref,
+  int expr: @expr ref
+);
+
+#keyset[id]
+asm_const_is_const(
+  int id: @asm_const ref
+);
+
+asm_exprs(
+  unique int id: @asm_expr
+);
+
+#keyset[id, index]
+asm_expr_asm_pieces(
+  int id: @asm_expr ref,
+  int index: int ref,
+  int asm_piece: @asm_piece ref
+);
+
+#keyset[id, index]
+asm_expr_attrs(
+  int id: @asm_expr ref,
+  int index: int ref,
+  int attr: @attr ref
+);
+
+#keyset[id, index]
+asm_expr_templates(
+  int id: @asm_expr ref,
+  int index: int ref,
+  int template: @expr ref
+);
+
+asm_labels(
+  unique int id: @asm_label
+);
+
+#keyset[id]
+asm_label_block_exprs(
+  int id: @asm_label ref,
+  int block_expr: @block_expr ref
+);
+
+asm_operand_nameds(
+  unique int id: @asm_operand_named
+);
+
+#keyset[id]
+asm_operand_named_asm_operands(
+  int id: @asm_operand_named ref,
+  int asm_operand: @asm_operand ref
+);
+
+#keyset[id]
+asm_operand_named_names(
+  int id: @asm_operand_named ref,
+  int name: @name ref
+);
+
+asm_options_lists(
+  unique int id: @asm_options_list
+);
+
+#keyset[id, index]
+asm_options_list_asm_options(
+  int id: @asm_options_list ref,
+  int index: int ref,
+  int asm_option: @asm_option ref
+);
+
+asm_reg_operands(
+  unique int id: @asm_reg_operand
+);
+
+#keyset[id]
+asm_reg_operand_asm_dir_specs(
+  int id: @asm_reg_operand ref,
+  int asm_dir_spec: @asm_dir_spec ref
+);
+
+#keyset[id]
+asm_reg_operand_asm_operand_exprs(
+  int id: @asm_reg_operand ref,
+  int asm_operand_expr: @asm_operand_expr ref
+);
+
+#keyset[id]
+asm_reg_operand_asm_reg_specs(
+  int id: @asm_reg_operand ref,
+  int asm_reg_spec: @asm_reg_spec ref
+);
+
+asm_syms(
+  unique int id: @asm_sym
+);
+
+#keyset[id]
+asm_sym_paths(
+  int id: @asm_sym ref,
+  int path: @path ref
+);
+
+assoc_type_args(
+  unique int id: @assoc_type_arg
+);
+
+#keyset[id]
+assoc_type_arg_const_args(
+  int id: @assoc_type_arg ref,
+  int const_arg: @const_arg ref
+);
+
+#keyset[id]
+assoc_type_arg_generic_arg_lists(
+  int id: @assoc_type_arg ref,
+  int generic_arg_list: @generic_arg_list ref
+);
+
+#keyset[id]
+assoc_type_arg_identifiers(
+  int id: @assoc_type_arg ref,
+  int identifier: @name_ref ref
+);
+
+#keyset[id]
+assoc_type_arg_param_lists(
+  int id: @assoc_type_arg ref,
+  int param_list: @param_list ref
+);
+
+#keyset[id]
+assoc_type_arg_ret_types(
+  int id: @assoc_type_arg ref,
+  int ret_type: @ret_type_repr ref
+);
+
+#keyset[id]
+assoc_type_arg_return_type_syntaxes(
+  int id: @assoc_type_arg ref,
+  int return_type_syntax: @return_type_syntax ref
+);
+
+#keyset[id]
+assoc_type_arg_type_reprs(
+  int id: @assoc_type_arg ref,
+  int type_repr: @type_repr ref
+);
+
+#keyset[id]
+assoc_type_arg_type_bound_lists(
+  int id: @assoc_type_arg ref,
+  int type_bound_list: @type_bound_list ref
+);
+
+await_exprs(
+  unique int id: @await_expr
+);
+
+#keyset[id, index]
+await_expr_attrs(
+  int id: @await_expr ref,
+  int index: int ref,
+  int attr: @attr ref
+);
+
+#keyset[id]
+await_expr_exprs(
+  int id: @await_expr ref,
+  int expr: @expr ref
+);
+
+become_exprs(
+  unique int id: @become_expr
+);
+
+#keyset[id, index]
+become_expr_attrs(
+  int id: @become_expr ref,
+  int index: int ref,
+  int attr: @attr ref
+);
+
+#keyset[id]
+become_expr_exprs(
+  int id: @become_expr ref,
+  int expr: @expr ref
+);
+
+binary_exprs(
+  unique int id: @binary_expr
+);
+
+#keyset[id, index]
+binary_expr_attrs(
+  int id: @binary_expr ref,
+  int index: int ref,
+  int attr: @attr ref
+);
+
+#keyset[id]
+binary_expr_lhs(
+  int id: @binary_expr ref,
+  int lhs: @expr ref
+);
+
+#keyset[id]
+binary_expr_operator_names(
+  int id: @binary_expr ref,
+  string operator_name: string ref
+);
+
+#keyset[id]
+binary_expr_rhs(
+  int id: @binary_expr ref,
+  int rhs: @expr ref
+);
+
+box_pats(
+  unique int id: @box_pat
+);
+
+#keyset[id]
+box_pat_pats(
+  int id: @box_pat ref,
+  int pat: @pat ref
+);
+
+break_exprs(
+  unique int id: @break_expr
+);
+
+#keyset[id, index]
+break_expr_attrs(
+  int id: @break_expr ref,
+  int index: int ref,
+  int attr: @attr ref
+);
+
+#keyset[id]
+break_expr_exprs(
+  int id: @break_expr ref,
+  int expr: @expr ref
+);
+
+#keyset[id]
+break_expr_lifetimes(
+  int id: @break_expr ref,
+  int lifetime: @lifetime ref
+);
+
+@call_expr_base =
+  @call_expr
+| @method_call_expr
+;
+
+#keyset[id]
+call_expr_base_arg_lists(
+  int id: @call_expr_base ref,
+  int arg_list: @arg_list ref
+);
+
+#keyset[id, index]
+call_expr_base_attrs(
+  int id: @call_expr_base ref,
+  int index: int ref,
+  int attr: @attr ref
+);
+
+cast_exprs(
+  unique int id: @cast_expr
+);
+
+#keyset[id, index]
+cast_expr_attrs(
+  int id: @cast_expr ref,
+  int index: int ref,
+  int attr: @attr ref
+);
+
+#keyset[id]
+cast_expr_exprs(
+  int id: @cast_expr ref,
+  int expr: @expr ref
+);
+
+#keyset[id]
+cast_expr_type_reprs(
+  int id: @cast_expr ref,
+  int type_repr: @type_repr ref
+);
+
+closure_exprs(
+  unique int id: @closure_expr
+);
+
+#keyset[id]
+closure_expr_bodies(
+  int id: @closure_expr ref,
+  int body: @expr ref
+);
+
+#keyset[id]
+closure_expr_closure_binders(
+  int id: @closure_expr ref,
+  int closure_binder: @closure_binder ref
+);
+
+#keyset[id]
+closure_expr_is_async(
+  int id: @closure_expr ref
+);
+
+#keyset[id]
+closure_expr_is_const(
+  int id: @closure_expr ref
+);
+
+#keyset[id]
+closure_expr_is_gen(
+  int id: @closure_expr ref
+);
+
+#keyset[id]
+closure_expr_is_move(
+  int id: @closure_expr ref
+);
+
+#keyset[id]
+closure_expr_is_static(
+  int id: @closure_expr ref
+);
+
+#keyset[id]
+closure_expr_ret_types(
+  int id: @closure_expr ref,
+  int ret_type: @ret_type_repr ref
+);
+
+comments(
+  unique int id: @comment,
+  int parent: @ast_node ref,
+  string text: string ref
+);
+
+const_args(
+  unique int id: @const_arg
+);
+
+#keyset[id]
+const_arg_exprs(
+  int id: @const_arg ref,
+  int expr: @expr ref
+);
+
+const_block_pats(
+  unique int id: @const_block_pat
+);
+
+#keyset[id]
+const_block_pat_block_exprs(
+  int id: @const_block_pat ref,
+  int block_expr: @block_expr ref
+);
+
+#keyset[id]
+const_block_pat_is_const(
+  int id: @const_block_pat ref
+);
+
+const_params(
+  unique int id: @const_param
+);
+
+#keyset[id, index]
+const_param_attrs(
+  int id: @const_param ref,
+  int index: int ref,
+  int attr: @attr ref
+);
+
+#keyset[id]
+const_param_default_vals(
+  int id: @const_param ref,
+  int default_val: @const_arg ref
+);
+
+#keyset[id]
+const_param_is_const(
+  int id: @const_param ref
+);
+
+#keyset[id]
+const_param_names(
+  int id: @const_param ref,
+  int name: @name ref
+);
+
+#keyset[id]
+const_param_type_reprs(
+  int id: @const_param ref,
+  int type_repr: @type_repr ref
+);
+
+continue_exprs(
+  unique int id: @continue_expr
+);
+
+#keyset[id, index]
+continue_expr_attrs(
+  int id: @continue_expr ref,
+  int index: int ref,
+  int attr: @attr ref
+);
+
+#keyset[id]
+continue_expr_lifetimes(
+  int id: @continue_expr ref,
+  int lifetime: @lifetime ref
+);
+
+dyn_trait_type_reprs(
+  unique int id: @dyn_trait_type_repr
+);
+
+#keyset[id]
+dyn_trait_type_repr_type_bound_lists(
+  int id: @dyn_trait_type_repr ref,
+  int type_bound_list: @type_bound_list ref
+);
+
+expr_stmts(
+  unique int id: @expr_stmt
+);
+
+#keyset[id]
+expr_stmt_exprs(
+  int id: @expr_stmt ref,
+  int expr: @expr ref
+);
+
+field_exprs(
+  unique int id: @field_expr
+);
+
+#keyset[id, index]
+field_expr_attrs(
+  int id: @field_expr ref,
+  int index: int ref,
+  int attr: @attr ref
+);
+
+#keyset[id]
+field_expr_containers(
+  int id: @field_expr ref,
+  int container: @expr ref
+);
+
+#keyset[id]
+field_expr_identifiers(
+  int id: @field_expr ref,
+  int identifier: @name_ref ref
+);
+
+fn_ptr_type_reprs(
+  unique int id: @fn_ptr_type_repr
+);
+
+#keyset[id]
+fn_ptr_type_repr_abis(
+  int id: @fn_ptr_type_repr ref,
+  int abi: @abi ref
+);
+
+#keyset[id]
+fn_ptr_type_repr_is_async(
+  int id: @fn_ptr_type_repr ref
+);
+
+#keyset[id]
+fn_ptr_type_repr_is_const(
+  int id: @fn_ptr_type_repr ref
+);
+
+#keyset[id]
+fn_ptr_type_repr_is_unsafe(
+  int id: @fn_ptr_type_repr ref
+);
+
+#keyset[id]
+fn_ptr_type_repr_param_lists(
+  int id: @fn_ptr_type_repr ref,
+  int param_list: @param_list ref
+);
+
+#keyset[id]
+fn_ptr_type_repr_ret_types(
+  int id: @fn_ptr_type_repr ref,
+  int ret_type: @ret_type_repr ref
+);
+
+for_type_reprs(
+  unique int id: @for_type_repr
+);
+
+#keyset[id]
+for_type_repr_generic_param_lists(
+  int id: @for_type_repr ref,
+  int generic_param_list: @generic_param_list ref
+);
+
+#keyset[id]
+for_type_repr_type_reprs(
+  int id: @for_type_repr ref,
+  int type_repr: @type_repr ref
+);
+
+format_args_exprs(
+  unique int id: @format_args_expr
+);
+
+#keyset[id, index]
+format_args_expr_args(
+  int id: @format_args_expr ref,
+  int index: int ref,
+  int arg: @format_args_arg ref
+);
+
+#keyset[id, index]
+format_args_expr_attrs(
+  int id: @format_args_expr ref,
+  int index: int ref,
+  int attr: @attr ref
+);
+
+#keyset[id]
+format_args_expr_templates(
+  int id: @format_args_expr ref,
+  int template: @expr ref
+);
+
+ident_pats(
+  unique int id: @ident_pat
+);
+
+#keyset[id, index]
+ident_pat_attrs(
+  int id: @ident_pat ref,
+  int index: int ref,
+  int attr: @attr ref
+);
+
+#keyset[id]
+ident_pat_is_mut(
+  int id: @ident_pat ref
+);
+
+#keyset[id]
+ident_pat_is_ref(
+  int id: @ident_pat ref
+);
+
+#keyset[id]
+ident_pat_names(
+  int id: @ident_pat ref,
+  int name: @name ref
+);
+
+#keyset[id]
+ident_pat_pats(
+  int id: @ident_pat ref,
+  int pat: @pat ref
+);
+
+if_exprs(
+  unique int id: @if_expr
+);
+
+#keyset[id, index]
+if_expr_attrs(
+  int id: @if_expr ref,
+  int index: int ref,
+  int attr: @attr ref
+);
+
+#keyset[id]
+if_expr_conditions(
+  int id: @if_expr ref,
+  int condition: @expr ref
+);
+
+#keyset[id]
+if_expr_elses(
+  int id: @if_expr ref,
+  int else: @expr ref
+);
+
+#keyset[id]
+if_expr_thens(
+  int id: @if_expr ref,
+  int then: @block_expr ref
+);
+
+impl_trait_type_reprs(
+  unique int id: @impl_trait_type_repr
+);
+
+#keyset[id]
+impl_trait_type_repr_type_bound_lists(
+  int id: @impl_trait_type_repr ref,
+  int type_bound_list: @type_bound_list ref
+);
+
+index_exprs(
+  unique int id: @index_expr
+);
+
+#keyset[id, index]
+index_expr_attrs(
+  int id: @index_expr ref,
+  int index: int ref,
+  int attr: @attr ref
+);
+
+#keyset[id]
+index_expr_bases(
+  int id: @index_expr ref,
+  int base: @expr ref
+);
+
+#keyset[id]
+index_expr_indices(
+  int id: @index_expr ref,
+  int index: @expr ref
+);
+
+infer_type_reprs(
+  unique int id: @infer_type_repr
+);
+
+@item =
+  @const
+| @enum
+| @extern_block
+| @extern_crate
+| @function
+| @impl
+| @macro_call
+| @macro_def
+| @macro_rules
+| @module
+| @static
+| @struct
+| @trait
+| @trait_alias
+| @type_alias
+| @union
+| @use
+;
+
+#keyset[id]
+item_attribute_macro_expansions(
+  int id: @item ref,
+  int attribute_macro_expansion: @macro_items ref
+);
+
+@labelable_expr =
+  @block_expr
+| @looping_expr
+;
+
+#keyset[id]
+labelable_expr_labels(
+  int id: @labelable_expr ref,
+  int label: @label ref
+);
+
+let_exprs(
+  unique int id: @let_expr
+);
+
+#keyset[id, index]
+let_expr_attrs(
+  int id: @let_expr ref,
+  int index: int ref,
+  int attr: @attr ref
+);
+
+#keyset[id]
+let_expr_scrutinees(
+  int id: @let_expr ref,
+  int scrutinee: @expr ref
+);
+
+#keyset[id]
+let_expr_pats(
+  int id: @let_expr ref,
+  int pat: @pat ref
+);
+
+let_stmts(
+  unique int id: @let_stmt
+);
+
+#keyset[id, index]
+let_stmt_attrs(
+  int id: @let_stmt ref,
+  int index: int ref,
+  int attr: @attr ref
+);
+
+#keyset[id]
+let_stmt_initializers(
+  int id: @let_stmt ref,
+  int initializer: @expr ref
+);
+
+#keyset[id]
+let_stmt_let_elses(
+  int id: @let_stmt ref,
+  int let_else: @let_else ref
+);
+
+#keyset[id]
+let_stmt_pats(
+  int id: @let_stmt ref,
+  int pat: @pat ref
+);
+
+#keyset[id]
+let_stmt_type_reprs(
+  int id: @let_stmt ref,
+  int type_repr: @type_repr ref
+);
+
+lifetimes(
+  unique int id: @lifetime
+);
+
+#keyset[id]
+lifetime_texts(
+  int id: @lifetime ref,
+  string text: string ref
+);
+
+lifetime_args(
+  unique int id: @lifetime_arg
+);
+
+#keyset[id]
+lifetime_arg_lifetimes(
+  int id: @lifetime_arg ref,
+  int lifetime: @lifetime ref
+);
+
+lifetime_params(
+  unique int id: @lifetime_param
+);
+
+#keyset[id, index]
+lifetime_param_attrs(
+  int id: @lifetime_param ref,
+  int index: int ref,
+  int attr: @attr ref
+);
+
+#keyset[id]
+lifetime_param_lifetimes(
+  int id: @lifetime_param ref,
+  int lifetime: @lifetime ref
+);
+
+#keyset[id]
+lifetime_param_type_bound_lists(
+  int id: @lifetime_param ref,
+  int type_bound_list: @type_bound_list ref
+);
+
+literal_exprs(
+  unique int id: @literal_expr
+);
+
+#keyset[id, index]
+literal_expr_attrs(
+  int id: @literal_expr ref,
+  int index: int ref,
+  int attr: @attr ref
+);
+
+#keyset[id]
+literal_expr_text_values(
+  int id: @literal_expr ref,
+  string text_value: string ref
+);
+
+literal_pats(
+  unique int id: @literal_pat
+);
+
+#keyset[id]
+literal_pat_literals(
+  int id: @literal_pat ref,
+  int literal: @literal_expr ref
+);
+
+macro_block_exprs(
+  unique int id: @macro_block_expr
+);
+
+#keyset[id]
+macro_block_expr_tail_exprs(
+  int id: @macro_block_expr ref,
+  int tail_expr: @expr ref
+);
+
+#keyset[id, index]
+macro_block_expr_statements(
+  int id: @macro_block_expr ref,
+  int index: int ref,
+  int statement: @stmt ref
+);
+
+macro_exprs(
+  unique int id: @macro_expr
+);
+
+#keyset[id]
+macro_expr_macro_calls(
+  int id: @macro_expr ref,
+  int macro_call: @macro_call ref
+);
+
+macro_pats(
+  unique int id: @macro_pat
+);
+
+#keyset[id]
+macro_pat_macro_calls(
+  int id: @macro_pat ref,
+  int macro_call: @macro_call ref
+);
+
+macro_type_reprs(
+  unique int id: @macro_type_repr
+);
+
+#keyset[id]
+macro_type_repr_macro_calls(
+  int id: @macro_type_repr ref,
+  int macro_call: @macro_call ref
+);
+
+match_exprs(
+  unique int id: @match_expr
+);
+
+#keyset[id, index]
+match_expr_attrs(
+  int id: @match_expr ref,
+  int index: int ref,
+  int attr: @attr ref
+);
+
+#keyset[id]
+match_expr_scrutinees(
+  int id: @match_expr ref,
+  int scrutinee: @expr ref
+);
+
+#keyset[id]
+match_expr_match_arm_lists(
+  int id: @match_expr ref,
+  int match_arm_list: @match_arm_list ref
+);
+
+name_refs(
+  unique int id: @name_ref
+);
+
+#keyset[id]
+name_ref_texts(
+  int id: @name_ref ref,
+  string text: string ref
+);
+
+never_type_reprs(
+  unique int id: @never_type_repr
+);
+
+offset_of_exprs(
+  unique int id: @offset_of_expr
+);
+
+#keyset[id, index]
+offset_of_expr_attrs(
+  int id: @offset_of_expr ref,
+  int index: int ref,
+  int attr: @attr ref
+);
+
+#keyset[id, index]
+offset_of_expr_fields(
+  int id: @offset_of_expr ref,
+  int index: int ref,
+  int field: @name_ref ref
+);
+
+#keyset[id]
+offset_of_expr_type_reprs(
+  int id: @offset_of_expr ref,
+  int type_repr: @type_repr ref
+);
+
+or_pats(
+  unique int id: @or_pat
+);
+
+#keyset[id, index]
+or_pat_pats(
+  int id: @or_pat ref,
+  int index: int ref,
+  int pat: @pat ref
+);
+
+params(
+  unique int id: @param
+);
+
+#keyset[id]
+param_pats(
+  int id: @param ref,
+  int pat: @pat ref
+);
+
+paren_exprs(
+  unique int id: @paren_expr
+);
+
+#keyset[id, index]
+paren_expr_attrs(
+  int id: @paren_expr ref,
+  int index: int ref,
+  int attr: @attr ref
+);
+
+#keyset[id]
+paren_expr_exprs(
+  int id: @paren_expr ref,
+  int expr: @expr ref
+);
+
+paren_pats(
+  unique int id: @paren_pat
+);
+
+#keyset[id]
+paren_pat_pats(
+  int id: @paren_pat ref,
+  int pat: @pat ref
+);
+
+paren_type_reprs(
+  unique int id: @paren_type_repr
+);
+
+#keyset[id]
+paren_type_repr_type_reprs(
+  int id: @paren_type_repr ref,
+  int type_repr: @type_repr ref
+);
+
+@path_ast_node =
+  @path_expr
+| @path_pat
+| @struct_expr
+| @struct_pat
+| @tuple_struct_pat
+;
+
+#keyset[id]
+path_ast_node_paths(
+  int id: @path_ast_node ref,
+  int path: @path ref
+);
+
+@path_expr_base =
+  @path_expr
+;
+
+path_type_reprs(
+  unique int id: @path_type_repr
+);
+
+#keyset[id]
+path_type_repr_paths(
+  int id: @path_type_repr ref,
+  int path: @path ref
+);
+
+prefix_exprs(
+  unique int id: @prefix_expr
+);
+
+#keyset[id, index]
+prefix_expr_attrs(
+  int id: @prefix_expr ref,
+  int index: int ref,
+  int attr: @attr ref
+);
+
+#keyset[id]
+prefix_expr_exprs(
+  int id: @prefix_expr ref,
+  int expr: @expr ref
+);
+
+#keyset[id]
+prefix_expr_operator_names(
+  int id: @prefix_expr ref,
+  string operator_name: string ref
+);
+
+ptr_type_reprs(
+  unique int id: @ptr_type_repr
+);
+
+#keyset[id]
+ptr_type_repr_is_const(
+  int id: @ptr_type_repr ref
+);
+
+#keyset[id]
+ptr_type_repr_is_mut(
+  int id: @ptr_type_repr ref
+);
+
+#keyset[id]
+ptr_type_repr_type_reprs(
+  int id: @ptr_type_repr ref,
+  int type_repr: @type_repr ref
+);
+
+range_exprs(
+  unique int id: @range_expr
+);
+
+#keyset[id, index]
+range_expr_attrs(
+  int id: @range_expr ref,
+  int index: int ref,
+  int attr: @attr ref
+);
+
+#keyset[id]
+range_expr_ends(
+  int id: @range_expr ref,
+  int end: @expr ref
+);
+
+#keyset[id]
+range_expr_operator_names(
+  int id: @range_expr ref,
+  string operator_name: string ref
+);
+
+#keyset[id]
+range_expr_starts(
+  int id: @range_expr ref,
+  int start: @expr ref
+);
+
+range_pats(
+  unique int id: @range_pat
+);
+
+#keyset[id]
+range_pat_ends(
+  int id: @range_pat ref,
+  int end: @pat ref
+);
+
+#keyset[id]
+range_pat_operator_names(
+  int id: @range_pat ref,
+  string operator_name: string ref
+);
+
+#keyset[id]
+range_pat_starts(
+  int id: @range_pat ref,
+  int start: @pat ref
+);
+
+ref_exprs(
+  unique int id: @ref_expr
+);
+
+#keyset[id, index]
+ref_expr_attrs(
+  int id: @ref_expr ref,
+  int index: int ref,
+  int attr: @attr ref
+);
+
+#keyset[id]
+ref_expr_exprs(
+  int id: @ref_expr ref,
+  int expr: @expr ref
+);
+
+#keyset[id]
+ref_expr_is_const(
+  int id: @ref_expr ref
+);
+
+#keyset[id]
+ref_expr_is_mut(
+  int id: @ref_expr ref
+);
+
+#keyset[id]
+ref_expr_is_raw(
+  int id: @ref_expr ref
+);
+
+ref_pats(
+  unique int id: @ref_pat
+);
+
+#keyset[id]
+ref_pat_is_mut(
+  int id: @ref_pat ref
+);
+
+#keyset[id]
+ref_pat_pats(
+  int id: @ref_pat ref,
+  int pat: @pat ref
+);
+
+ref_type_reprs(
+  unique int id: @ref_type_repr
+);
+
+#keyset[id]
+ref_type_repr_is_mut(
+  int id: @ref_type_repr ref
+);
+
+#keyset[id]
+ref_type_repr_lifetimes(
+  int id: @ref_type_repr ref,
+  int lifetime: @lifetime ref
+);
+
+#keyset[id]
+ref_type_repr_type_reprs(
+  int id: @ref_type_repr ref,
+  int type_repr: @type_repr ref
+);
+
+rest_pats(
+  unique int id: @rest_pat
+);
+
+#keyset[id, index]
+rest_pat_attrs(
+  int id: @rest_pat ref,
+  int index: int ref,
+  int attr: @attr ref
+);
+
+return_exprs(
+  unique int id: @return_expr
+);
+
+#keyset[id, index]
+return_expr_attrs(
+  int id: @return_expr ref,
+  int index: int ref,
+  int attr: @attr ref
+);
+
+#keyset[id]
+return_expr_exprs(
+  int id: @return_expr ref,
+  int expr: @expr ref
+);
+
+self_params(
+  unique int id: @self_param
+);
+
+#keyset[id]
+self_param_is_ref(
+  int id: @self_param ref
+);
+
+#keyset[id]
+self_param_is_mut(
+  int id: @self_param ref
+);
+
+#keyset[id]
+self_param_lifetimes(
+  int id: @self_param ref,
+  int lifetime: @lifetime ref
+);
+
+#keyset[id]
+self_param_names(
+  int id: @self_param ref,
+  int name: @name ref
+);
+
+slice_pats(
+  unique int id: @slice_pat
+);
+
+#keyset[id, index]
+slice_pat_pats(
+  int id: @slice_pat ref,
+  int index: int ref,
+  int pat: @pat ref
+);
+
+slice_type_reprs(
+  unique int id: @slice_type_repr
+);
+
+#keyset[id]
+slice_type_repr_type_reprs(
+  int id: @slice_type_repr ref,
+  int type_repr: @type_repr ref
+);
+
+struct_field_lists(
+  unique int id: @struct_field_list
+);
+
+#keyset[id, index]
+struct_field_list_fields(
+  int id: @struct_field_list ref,
+  int index: int ref,
+  int field: @struct_field ref
+);
+
+try_exprs(
+  unique int id: @try_expr
+);
+
+#keyset[id, index]
+try_expr_attrs(
+  int id: @try_expr ref,
+  int index: int ref,
+  int attr: @attr ref
+);
+
+#keyset[id]
+try_expr_exprs(
+  int id: @try_expr ref,
+  int expr: @expr ref
+);
+
+tuple_exprs(
+  unique int id: @tuple_expr
+);
+
+#keyset[id, index]
+tuple_expr_attrs(
+  int id: @tuple_expr ref,
+  int index: int ref,
+  int attr: @attr ref
+);
+
+#keyset[id, index]
+tuple_expr_fields(
+  int id: @tuple_expr ref,
+  int index: int ref,
+  int field: @expr ref
+);
+
+tuple_field_lists(
+  unique int id: @tuple_field_list
+);
+
+#keyset[id, index]
+tuple_field_list_fields(
+  int id: @tuple_field_list ref,
+  int index: int ref,
+  int field: @tuple_field ref
+);
+
+tuple_pats(
+  unique int id: @tuple_pat
+);
+
+#keyset[id, index]
+tuple_pat_fields(
+  int id: @tuple_pat ref,
+  int index: int ref,
+  int field: @pat ref
+);
+
+tuple_type_reprs(
+  unique int id: @tuple_type_repr
+);
+
+#keyset[id, index]
+tuple_type_repr_fields(
+  int id: @tuple_type_repr ref,
+  int index: int ref,
+  int field: @type_repr ref
+);
+
+type_args(
+  unique int id: @type_arg
+);
+
+#keyset[id]
+type_arg_type_reprs(
+  int id: @type_arg ref,
+  int type_repr: @type_repr ref
+);
+
+type_params(
+  unique int id: @type_param
+);
+
+#keyset[id, index]
+type_param_attrs(
+  int id: @type_param ref,
+  int index: int ref,
+  int attr: @attr ref
+);
+
+#keyset[id]
+type_param_default_types(
+  int id: @type_param ref,
+  int default_type: @type_repr ref
+);
+
+#keyset[id]
+type_param_names(
+  int id: @type_param ref,
+  int name: @name ref
+);
+
+#keyset[id]
+type_param_type_bound_lists(
+  int id: @type_param ref,
+  int type_bound_list: @type_bound_list ref
+);
+
+underscore_exprs(
+  unique int id: @underscore_expr
+);
+
+#keyset[id, index]
+underscore_expr_attrs(
+  int id: @underscore_expr ref,
+  int index: int ref,
+  int attr: @attr ref
+);
+
+variants(
+  unique int id: @variant
+);
+
+#keyset[id, index]
+variant_attrs(
+  int id: @variant ref,
+  int index: int ref,
+  int attr: @attr ref
+);
+
+#keyset[id]
+variant_discriminants(
+  int id: @variant ref,
+  int discriminant: @expr ref
+);
+
+#keyset[id]
+variant_field_lists(
+  int id: @variant ref,
+  int field_list: @field_list ref
+);
+
+#keyset[id]
+variant_names(
+  int id: @variant ref,
+  int name: @name ref
+);
+
+#keyset[id]
+variant_visibilities(
+  int id: @variant ref,
+  int visibility: @visibility ref
+);
+
+wildcard_pats(
+  unique int id: @wildcard_pat
+);
+
+yeet_exprs(
+  unique int id: @yeet_expr
+);
+
+#keyset[id, index]
+yeet_expr_attrs(
+  int id: @yeet_expr ref,
+  int index: int ref,
+  int attr: @attr ref
+);
+
+#keyset[id]
+yeet_expr_exprs(
+  int id: @yeet_expr ref,
+  int expr: @expr ref
+);
+
+yield_exprs(
+  unique int id: @yield_expr
+);
+
+#keyset[id, index]
+yield_expr_attrs(
+  int id: @yield_expr ref,
+  int index: int ref,
+  int attr: @attr ref
+);
+
+#keyset[id]
+yield_expr_exprs(
+  int id: @yield_expr ref,
+  int expr: @expr ref
+);
+
+block_exprs(
+  unique int id: @block_expr
+);
+
+#keyset[id, index]
+block_expr_attrs(
+  int id: @block_expr ref,
+  int index: int ref,
+  int attr: @attr ref
+);
+
+#keyset[id]
+block_expr_is_async(
+  int id: @block_expr ref
+);
+
+#keyset[id]
+block_expr_is_const(
+  int id: @block_expr ref
+);
+
+#keyset[id]
+block_expr_is_gen(
+  int id: @block_expr ref
+);
+
+#keyset[id]
+block_expr_is_move(
+  int id: @block_expr ref
+);
+
+#keyset[id]
+block_expr_is_try(
+  int id: @block_expr ref
+);
+
+#keyset[id]
+block_expr_is_unsafe(
+  int id: @block_expr ref
+);
+
+#keyset[id]
+block_expr_stmt_lists(
+  int id: @block_expr ref,
+  int stmt_list: @stmt_list ref
+);
+
+call_exprs(
+  unique int id: @call_expr
+);
+
+#keyset[id]
+call_expr_functions(
+  int id: @call_expr ref,
+  int function: @expr ref
+);
+
+consts(
+  unique int id: @const
+);
+
+#keyset[id, index]
+const_attrs(
+  int id: @const ref,
+  int index: int ref,
+  int attr: @attr ref
+);
+
+#keyset[id]
+const_bodies(
+  int id: @const ref,
+  int body: @expr ref
+);
+
+#keyset[id]
+const_is_const(
+  int id: @const ref
+);
+
+#keyset[id]
+const_is_default(
+  int id: @const ref
+);
+
+#keyset[id]
+const_names(
+  int id: @const ref,
+  int name: @name ref
+);
+
+#keyset[id]
+const_type_reprs(
+  int id: @const ref,
+  int type_repr: @type_repr ref
+);
+
+#keyset[id]
+const_visibilities(
+  int id: @const ref,
+  int visibility: @visibility ref
+);
+
+#keyset[id]
+const_has_implementation(
+  int id: @const ref
+);
+
+enums(
+  unique int id: @enum
+);
+
+#keyset[id, index]
+enum_attrs(
+  int id: @enum ref,
+  int index: int ref,
+  int attr: @attr ref
+);
+
+#keyset[id]
+enum_generic_param_lists(
+  int id: @enum ref,
+  int generic_param_list: @generic_param_list ref
+);
+
+#keyset[id]
+enum_names(
+  int id: @enum ref,
+  int name: @name ref
+);
+
+#keyset[id]
+enum_variant_lists(
+  int id: @enum ref,
+  int variant_list: @variant_list ref
+);
+
+#keyset[id]
+enum_visibilities(
+  int id: @enum ref,
+  int visibility: @visibility ref
+);
+
+#keyset[id]
+enum_where_clauses(
+  int id: @enum ref,
+  int where_clause: @where_clause ref
+);
+
+extern_blocks(
+  unique int id: @extern_block
+);
+
+#keyset[id]
+extern_block_abis(
+  int id: @extern_block ref,
+  int abi: @abi ref
+);
+
+#keyset[id, index]
+extern_block_attrs(
+  int id: @extern_block ref,
+  int index: int ref,
+  int attr: @attr ref
+);
+
+#keyset[id]
+extern_block_extern_item_lists(
+  int id: @extern_block ref,
+  int extern_item_list: @extern_item_list ref
+);
+
+#keyset[id]
+extern_block_is_unsafe(
+  int id: @extern_block ref
+);
+
+extern_crates(
+  unique int id: @extern_crate
+);
+
+#keyset[id, index]
+extern_crate_attrs(
+  int id: @extern_crate ref,
+  int index: int ref,
+  int attr: @attr ref
+);
+
+#keyset[id]
+extern_crate_identifiers(
+  int id: @extern_crate ref,
+  int identifier: @name_ref ref
+);
+
+#keyset[id]
+extern_crate_renames(
+  int id: @extern_crate ref,
+  int rename: @rename ref
+);
+
+#keyset[id]
+extern_crate_visibilities(
+  int id: @extern_crate ref,
+  int visibility: @visibility ref
+);
+
+functions(
+  unique int id: @function
+);
+
+#keyset[id]
+function_abis(
+  int id: @function ref,
+  int abi: @abi ref
+);
+
+#keyset[id]
+function_bodies(
+  int id: @function ref,
+  int body: @block_expr ref
+);
+
+#keyset[id]
+function_generic_param_lists(
+  int id: @function ref,
+  int generic_param_list: @generic_param_list ref
+);
+
+#keyset[id]
+function_is_async(
+  int id: @function ref
+);
+
+#keyset[id]
+function_is_const(
+  int id: @function ref
+);
+
+#keyset[id]
+function_is_default(
+  int id: @function ref
+);
+
+#keyset[id]
+function_is_gen(
+  int id: @function ref
+);
+
+#keyset[id]
+function_is_unsafe(
+  int id: @function ref
+);
+
+#keyset[id]
+function_names(
+  int id: @function ref,
+  int name: @name ref
+);
+
+#keyset[id]
+function_ret_types(
+  int id: @function ref,
+  int ret_type: @ret_type_repr ref
+);
+
+#keyset[id]
+function_visibilities(
+  int id: @function ref,
+  int visibility: @visibility ref
+);
+
+#keyset[id]
+function_where_clauses(
+  int id: @function ref,
+  int where_clause: @where_clause ref
+);
+
+#keyset[id]
+function_has_implementation(
+  int id: @function ref
+);
+
+impls(
+  unique int id: @impl
+);
+
+#keyset[id]
+impl_assoc_item_lists(
+  int id: @impl ref,
+  int assoc_item_list: @assoc_item_list ref
+);
+
+#keyset[id, index]
+impl_attrs(
+  int id: @impl ref,
+  int index: int ref,
+  int attr: @attr ref
+);
+
+#keyset[id]
+impl_generic_param_lists(
+  int id: @impl ref,
+  int generic_param_list: @generic_param_list ref
+);
+
+#keyset[id]
+impl_is_const(
+  int id: @impl ref
+);
+
+#keyset[id]
+impl_is_default(
+  int id: @impl ref
+);
+
+#keyset[id]
+impl_is_unsafe(
+  int id: @impl ref
+);
+
+#keyset[id]
+impl_self_ties(
+  int id: @impl ref,
+  int self_ty: @type_repr ref
+);
+
+#keyset[id]
+impl_traits(
+  int id: @impl ref,
+  int trait: @type_repr ref
+);
+
+#keyset[id]
+impl_visibilities(
+  int id: @impl ref,
+  int visibility: @visibility ref
+);
+
+#keyset[id]
+impl_where_clauses(
+  int id: @impl ref,
+  int where_clause: @where_clause ref
+);
+
+@looping_expr =
+  @for_expr
+| @loop_expr
+| @while_expr
+;
+
+#keyset[id]
+looping_expr_loop_bodies(
+  int id: @looping_expr ref,
+  int loop_body: @block_expr ref
+);
+
+macro_calls(
+  unique int id: @macro_call
+);
+
+#keyset[id, index]
+macro_call_attrs(
+  int id: @macro_call ref,
+  int index: int ref,
+  int attr: @attr ref
+);
+
+#keyset[id]
+macro_call_paths(
+  int id: @macro_call ref,
+  int path: @path ref
+);
+
+#keyset[id]
+macro_call_token_trees(
+  int id: @macro_call ref,
+  int token_tree: @token_tree ref
+);
+
+#keyset[id]
+macro_call_macro_call_expansions(
+  int id: @macro_call ref,
+  int macro_call_expansion: @ast_node ref
+);
+
+macro_defs(
+  unique int id: @macro_def
+);
+
+#keyset[id]
+macro_def_args(
+  int id: @macro_def ref,
+  int args: @token_tree ref
+);
+
+#keyset[id, index]
+macro_def_attrs(
+  int id: @macro_def ref,
+  int index: int ref,
+  int attr: @attr ref
+);
+
+#keyset[id]
+macro_def_bodies(
+  int id: @macro_def ref,
+  int body: @token_tree ref
+);
+
+#keyset[id]
+macro_def_names(
+  int id: @macro_def ref,
+  int name: @name ref
+);
+
+#keyset[id]
+macro_def_visibilities(
+  int id: @macro_def ref,
+  int visibility: @visibility ref
+);
+
+macro_rules(
+  unique int id: @macro_rules
+);
+
+#keyset[id, index]
+macro_rules_attrs(
+  int id: @macro_rules ref,
+  int index: int ref,
+  int attr: @attr ref
+);
+
+#keyset[id]
+macro_rules_names(
+  int id: @macro_rules ref,
+  int name: @name ref
+);
+
+#keyset[id]
+macro_rules_token_trees(
+  int id: @macro_rules ref,
+  int token_tree: @token_tree ref
+);
+
+#keyset[id]
+macro_rules_visibilities(
+  int id: @macro_rules ref,
+  int visibility: @visibility ref
+);
+
+method_call_exprs(
+  unique int id: @method_call_expr
+);
+
+#keyset[id]
+method_call_expr_generic_arg_lists(
+  int id: @method_call_expr ref,
+  int generic_arg_list: @generic_arg_list ref
+);
+
+#keyset[id]
+method_call_expr_identifiers(
+  int id: @method_call_expr ref,
+  int identifier: @name_ref ref
+);
+
+#keyset[id]
+method_call_expr_receivers(
+  int id: @method_call_expr ref,
+  int receiver: @expr ref
+);
+
+modules(
+  unique int id: @module
+);
+
+#keyset[id, index]
+module_attrs(
+  int id: @module ref,
+  int index: int ref,
+  int attr: @attr ref
+);
+
+#keyset[id]
+module_item_lists(
+  int id: @module ref,
+  int item_list: @item_list ref
+);
+
+#keyset[id]
+module_names(
+  int id: @module ref,
+  int name: @name ref
+);
+
+#keyset[id]
+module_visibilities(
+  int id: @module ref,
+  int visibility: @visibility ref
+);
+
+path_exprs(
+  unique int id: @path_expr
+);
+
+#keyset[id, index]
+path_expr_attrs(
+  int id: @path_expr ref,
+  int index: int ref,
+  int attr: @attr ref
+);
+
+path_pats(
+  unique int id: @path_pat
+);
+
+statics(
+  unique int id: @static
+);
+
+#keyset[id, index]
+static_attrs(
+  int id: @static ref,
+  int index: int ref,
+  int attr: @attr ref
+);
+
+#keyset[id]
+static_bodies(
+  int id: @static ref,
+  int body: @expr ref
+);
+
+#keyset[id]
+static_is_mut(
+  int id: @static ref
+);
+
+#keyset[id]
+static_is_static(
+  int id: @static ref
+);
+
+#keyset[id]
+static_is_unsafe(
+  int id: @static ref
+);
+
+#keyset[id]
+static_names(
+  int id: @static ref,
+  int name: @name ref
+);
+
+#keyset[id]
+static_type_reprs(
+  int id: @static ref,
+  int type_repr: @type_repr ref
+);
+
+#keyset[id]
+static_visibilities(
+  int id: @static ref,
+  int visibility: @visibility ref
+);
+
+structs(
+  unique int id: @struct
+);
+
+#keyset[id, index]
+struct_attrs(
+  int id: @struct ref,
+  int index: int ref,
+  int attr: @attr ref
+);
+
+#keyset[id]
+struct_field_lists_(
+  int id: @struct ref,
+  int field_list: @field_list ref
+);
+
+#keyset[id]
+struct_generic_param_lists(
+  int id: @struct ref,
+  int generic_param_list: @generic_param_list ref
+);
+
+#keyset[id]
+struct_names(
+  int id: @struct ref,
+  int name: @name ref
+);
+
+#keyset[id]
+struct_visibilities(
+  int id: @struct ref,
+  int visibility: @visibility ref
+);
+
+#keyset[id]
+struct_where_clauses(
+  int id: @struct ref,
+  int where_clause: @where_clause ref
+);
+
+struct_exprs(
+  unique int id: @struct_expr
+);
+
+#keyset[id]
+struct_expr_struct_expr_field_lists(
+  int id: @struct_expr ref,
+  int struct_expr_field_list: @struct_expr_field_list ref
+);
+
+struct_pats(
+  unique int id: @struct_pat
+);
+
+#keyset[id]
+struct_pat_struct_pat_field_lists(
+  int id: @struct_pat ref,
+  int struct_pat_field_list: @struct_pat_field_list ref
+);
+
+traits(
+  unique int id: @trait
+);
+
+#keyset[id]
+trait_assoc_item_lists(
+  int id: @trait ref,
+  int assoc_item_list: @assoc_item_list ref
+);
+
+#keyset[id, index]
+trait_attrs(
+  int id: @trait ref,
+  int index: int ref,
+  int attr: @attr ref
+);
+
+#keyset[id]
+trait_generic_param_lists(
+  int id: @trait ref,
+  int generic_param_list: @generic_param_list ref
+);
+
+#keyset[id]
+trait_is_auto(
+  int id: @trait ref
+);
+
+#keyset[id]
+trait_is_unsafe(
+  int id: @trait ref
+);
+
+#keyset[id]
+trait_names(
+  int id: @trait ref,
+  int name: @name ref
+);
+
+#keyset[id]
+trait_type_bound_lists(
+  int id: @trait ref,
+  int type_bound_list: @type_bound_list ref
+);
+
+#keyset[id]
+trait_visibilities(
+  int id: @trait ref,
+  int visibility: @visibility ref
+);
+
+#keyset[id]
+trait_where_clauses(
+  int id: @trait ref,
+  int where_clause: @where_clause ref
+);
+
+trait_aliases(
+  unique int id: @trait_alias
+);
+
+#keyset[id, index]
+trait_alias_attrs(
+  int id: @trait_alias ref,
+  int index: int ref,
+  int attr: @attr ref
+);
+
+#keyset[id]
+trait_alias_generic_param_lists(
+  int id: @trait_alias ref,
+  int generic_param_list: @generic_param_list ref
+);
+
+#keyset[id]
+trait_alias_names(
+  int id: @trait_alias ref,
+  int name: @name ref
+);
+
+#keyset[id]
+trait_alias_type_bound_lists(
+  int id: @trait_alias ref,
+  int type_bound_list: @type_bound_list ref
+);
+
+#keyset[id]
+trait_alias_visibilities(
+  int id: @trait_alias ref,
+  int visibility: @visibility ref
+);
+
+#keyset[id]
+trait_alias_where_clauses(
+  int id: @trait_alias ref,
+  int where_clause: @where_clause ref
+);
+
+tuple_struct_pats(
+  unique int id: @tuple_struct_pat
+);
+
+#keyset[id, index]
+tuple_struct_pat_fields(
+  int id: @tuple_struct_pat ref,
+  int index: int ref,
+  int field: @pat ref
+);
+
+type_aliases(
+  unique int id: @type_alias
+);
+
+#keyset[id, index]
+type_alias_attrs(
+  int id: @type_alias ref,
+  int index: int ref,
+  int attr: @attr ref
+);
+
+#keyset[id]
+type_alias_generic_param_lists(
+  int id: @type_alias ref,
+  int generic_param_list: @generic_param_list ref
+);
+
+#keyset[id]
+type_alias_is_default(
+  int id: @type_alias ref
+);
+
+#keyset[id]
+type_alias_names(
+  int id: @type_alias ref,
+  int name: @name ref
+);
+
+#keyset[id]
+type_alias_type_reprs(
+  int id: @type_alias ref,
+  int type_repr: @type_repr ref
+);
+
+#keyset[id]
+type_alias_type_bound_lists(
+  int id: @type_alias ref,
+  int type_bound_list: @type_bound_list ref
+);
+
+#keyset[id]
+type_alias_visibilities(
+  int id: @type_alias ref,
+  int visibility: @visibility ref
+);
+
+#keyset[id]
+type_alias_where_clauses(
+  int id: @type_alias ref,
+  int where_clause: @where_clause ref
+);
+
+unions(
+  unique int id: @union
+);
+
+#keyset[id, index]
+union_attrs(
+  int id: @union ref,
+  int index: int ref,
+  int attr: @attr ref
+);
+
+#keyset[id]
+union_generic_param_lists(
+  int id: @union ref,
+  int generic_param_list: @generic_param_list ref
+);
+
+#keyset[id]
+union_names(
+  int id: @union ref,
+  int name: @name ref
+);
+
+#keyset[id]
+union_struct_field_lists(
+  int id: @union ref,
+  int struct_field_list: @struct_field_list ref
+);
+
+#keyset[id]
+union_visibilities(
+  int id: @union ref,
+  int visibility: @visibility ref
+);
+
+#keyset[id]
+union_where_clauses(
+  int id: @union ref,
+  int where_clause: @where_clause ref
+);
+
+uses(
+  unique int id: @use
+);
+
+#keyset[id, index]
+use_attrs(
+  int id: @use ref,
+  int index: int ref,
+  int attr: @attr ref
+);
+
+#keyset[id]
+use_use_trees(
+  int id: @use ref,
+  int use_tree: @use_tree ref
+);
+
+#keyset[id]
+use_visibilities(
+  int id: @use ref,
+  int visibility: @visibility ref
+);
+
+for_exprs(
+  unique int id: @for_expr
+);
+
+#keyset[id, index]
+for_expr_attrs(
+  int id: @for_expr ref,
+  int index: int ref,
+  int attr: @attr ref
+);
+
+#keyset[id]
+for_expr_iterables(
+  int id: @for_expr ref,
+  int iterable: @expr ref
+);
+
+#keyset[id]
+for_expr_pats(
+  int id: @for_expr ref,
+  int pat: @pat ref
+);
+
+loop_exprs(
+  unique int id: @loop_expr
+);
+
+#keyset[id, index]
+loop_expr_attrs(
+  int id: @loop_expr ref,
+  int index: int ref,
+  int attr: @attr ref
+);
+
+while_exprs(
+  unique int id: @while_expr
+);
+
+#keyset[id, index]
+while_expr_attrs(
+  int id: @while_expr ref,
+  int index: int ref,
+  int attr: @attr ref
+);
+
+#keyset[id]
+while_expr_conditions(
+  int id: @while_expr ref,
+  int condition: @expr ref
+);
diff --git a/rust/ql/lib/upgrades/a1005655e9efc9f67d3aa2b7a3128f6b80d405a9/upgrade.properties b/rust/ql/lib/upgrades/a1005655e9efc9f67d3aa2b7a3128f6b80d405a9/upgrade.properties
new file mode 100644
index 00000000000..a27f5bf84cf
--- /dev/null
+++ b/rust/ql/lib/upgrades/a1005655e9efc9f67d3aa2b7a3128f6b80d405a9/upgrade.properties
@@ -0,0 +1,5 @@
+description: Add `function_has_implementation` and `const_has_implementation` tables
+compatibility: backwards
+
+function_has_implementation.rel: reorder function_bodies (@function id, @block_expr body) id
+const_has_implementation.rel: reorder const_bodies (@const id, @expr body) id
diff --git a/rust/ql/src/queries/summary/Stats.qll b/rust/ql/src/queries/summary/Stats.qll
index 1feaf3ab48b..3156f1ffb26 100644
--- a/rust/ql/src/queries/summary/Stats.qll
+++ b/rust/ql/src/queries/summary/Stats.qll
@@ -189,6 +189,8 @@ predicate taintStats(string key, int value) {
   or
   key = "Taint reach - nodes tainted" and value = getTaintedNodesCount()
   or
+  key = "Taint reach - total non-summary nodes" and value = getTotalNodesCount()
+  or
   key = "Taint reach - per million nodes" and value = getTaintReach().floor()
   or
   key = "Taint sinks - query sinks" and value = getQuerySinksCount()
diff --git a/rust/ql/src/queries/summary/TaintReach.qll b/rust/ql/src/queries/summary/TaintReach.qll
index 0f00fe6f7c6..650bbe727c3 100644
--- a/rust/ql/src/queries/summary/TaintReach.qll
+++ b/rust/ql/src/queries/summary/TaintReach.qll
@@ -7,6 +7,7 @@ import rust
 private import codeql.rust.Concepts
 private import codeql.rust.dataflow.DataFlow
 private import codeql.rust.dataflow.TaintTracking
+private import codeql.rust.dataflow.internal.Node
 
 /**
  * A taint configuration for taint reach (flow to any node from any modeled source).
@@ -21,11 +22,27 @@ private module TaintReachFlow = TaintTracking::Global<TaintReachConfig>;
 
 /**
  * Gets the total number of data flow nodes that taint reaches (from any source).
+ *
+ * We don't include flow summary nodes, as their number is unstable (varies when models
+ * are added).
  */
-int getTaintedNodesCount() { result = count(DataFlow::Node n | TaintReachFlow::flowTo(n)) }
+int getTaintedNodesCount() {
+  result = count(DataFlow::Node n | TaintReachFlow::flowTo(n) and not n instanceof FlowSummaryNode)
+}
+
+/**
+ * Gets the total number of data flow nodes.
+ *
+ * We don't include flow summary nodes, as their number is unstable (varies when models
+ * are added).
+ */
+int getTotalNodesCount() { result = count(DataFlow::Node n | not n instanceof FlowSummaryNode) }
 
 /**
  * Gets the proportion of data flow nodes that taint reaches (from any source),
  * expressed as a count per million nodes.
+ *
+ * We don't include flow summary nodes, as their number is unstable (varies when models
+ * are added).
  */
-float getTaintReach() { result = (getTaintedNodesCount() * 1000000.0) / count(DataFlow::Node n) }
+float getTaintReach() { result = (getTaintedNodesCount() * 1000000.0) / getTotalNodesCount() }
diff --git a/rust/ql/src/utils/modelgenerator/internal/CaptureModels.qll b/rust/ql/src/utils/modelgenerator/internal/CaptureModels.qll
index 58f90cc33a0..d30157b5090 100644
--- a/rust/ql/src/utils/modelgenerator/internal/CaptureModels.qll
+++ b/rust/ql/src/utils/modelgenerator/internal/CaptureModels.qll
@@ -79,7 +79,7 @@ module ModelGeneratorCommonInput implements
 
   bindingset[c]
   string paramReturnNodeAsExactOutput(Callable c, DataFlowImpl::ParameterPosition pos) {
-    result = parameterExactAccess(c.getParamList().getParam(pos.getPosition()))
+    result = parameterExactAccess(c.getParam(pos.getPosition()))
     or
     pos.isSelf() and result = qualifierString()
   }
diff --git a/rust/ql/test/extractor-tests/canonical_path/canonical_paths.expected b/rust/ql/test/extractor-tests/canonical_path/canonical_paths.expected
index 69ea1bb7b0e..0376d52b26e 100644
--- a/rust/ql/test/extractor-tests/canonical_path/canonical_paths.expected
+++ b/rust/ql/test/extractor-tests/canonical_path/canonical_paths.expected
@@ -1,6 +1,7 @@
 canonicalPath
 | anonymous.rs:3:1:32:1 | fn canonicals | test::anonymous::canonicals |
 | anonymous.rs:34:1:36:1 | fn other | test::anonymous::other |
+| {EXTERNAL LOCATION} | fn trim | <core::str>::trim |
 | lib.rs:1:1:1:14 | mod anonymous | test::anonymous |
 | lib.rs:2:1:2:12 | mod regular | test::regular |
 | regular.rs:1:1:2:18 | struct Struct | test::regular::Struct |
diff --git a/rust/ql/test/extractor-tests/canonical_path/canonical_paths.ql b/rust/ql/test/extractor-tests/canonical_path/canonical_paths.ql
index 16aa82eee21..51fc3d4c243 100644
--- a/rust/ql/test/extractor-tests/canonical_path/canonical_paths.ql
+++ b/rust/ql/test/extractor-tests/canonical_path/canonical_paths.ql
@@ -1,8 +1,20 @@
 import rust
 import TestUtils
+private import codeql.rust.internal.PathResolution
+private import codeql.rust.frameworks.stdlib.Builtins
 
 query predicate canonicalPath(Addressable a, string path) {
-  toBeTested(a) and
+  (
+    toBeTested(a)
+    or
+    // test that we also generate canonical paths for builtins
+    a =
+      any(ImplItemNode i |
+        i.resolveSelfTy() instanceof Str and
+        not i.(Impl).hasTrait()
+      ).getAnAssocItem() and
+    a.(Function).getName().getText() = "trim"
+  ) and
   path = a.getCanonicalPath(_)
 }
 
diff --git a/rust/ql/test/extractor-tests/canonical_path/canonical_paths.qlref b/rust/ql/test/extractor-tests/canonical_path/canonical_paths.qlref
new file mode 100644
index 00000000000..c65650adf9a
--- /dev/null
+++ b/rust/ql/test/extractor-tests/canonical_path/canonical_paths.qlref
@@ -0,0 +1,2 @@
+query: canonical_paths.ql
+postprocess: utils/test/ExternalLocationPostProcessing.ql
\ No newline at end of file
diff --git a/rust/ql/test/extractor-tests/canonical_path_disabled/canonical_paths.expected b/rust/ql/test/extractor-tests/canonical_path_disabled/canonical_paths.expected
index 2605a806f6f..21564515385 100644
--- a/rust/ql/test/extractor-tests/canonical_path_disabled/canonical_paths.expected
+++ b/rust/ql/test/extractor-tests/canonical_path_disabled/canonical_paths.expected
@@ -1,6 +1,7 @@
 canonicalPath
 | anonymous.rs:6:1:35:1 | fn canonicals | test::anonymous::canonicals |
 | anonymous.rs:37:1:39:1 | fn other | test::anonymous::other |
+| {EXTERNAL LOCATION} | fn trim | <core::str>::trim |
 | lib.rs:1:1:1:14 | mod anonymous | test::anonymous |
 | lib.rs:2:1:2:12 | mod regular | test::regular |
 | regular.rs:4:1:5:18 | struct Struct | test::regular::Struct |
diff --git a/rust/ql/test/extractor-tests/canonical_path_disabled/canonical_paths.qlref b/rust/ql/test/extractor-tests/canonical_path_disabled/canonical_paths.qlref
index f40a74f5aed..9a5712b5135 100644
--- a/rust/ql/test/extractor-tests/canonical_path_disabled/canonical_paths.qlref
+++ b/rust/ql/test/extractor-tests/canonical_path_disabled/canonical_paths.qlref
@@ -1 +1,2 @@
-extractor-tests/canonical_path/canonical_paths.ql
+query: extractor-tests/canonical_path/canonical_paths.ql
+postprocess: utils/test/ExternalLocationPostProcessing.ql
\ No newline at end of file
diff --git a/rust/ql/test/extractor-tests/crate_graph/.gitignore b/rust/ql/test/extractor-tests/crate_graph/.gitignore
new file mode 100644
index 00000000000..1a5314bd427
--- /dev/null
+++ b/rust/ql/test/extractor-tests/crate_graph/.gitignore
@@ -0,0 +1 @@
+!/Cargo.lock
diff --git a/rust/ql/test/extractor-tests/crate_graph/Cargo.lock b/rust/ql/test/extractor-tests/crate_graph/Cargo.lock
new file mode 100644
index 00000000000..efdbaf4f23f
--- /dev/null
+++ b/rust/ql/test/extractor-tests/crate_graph/Cargo.lock
@@ -0,0 +1,84 @@
+# This file is automatically @generated by Cargo.
+# It is not intended for manual editing.
+version = 4
+
+[[package]]
+name = "block-buffer"
+version = "0.10.4"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "3078c7629b62d3f0439517fa394996acacc5cbc91c5a20d8c658e77abd503a71"
+dependencies = [
+ "generic-array",
+]
+
+[[package]]
+name = "cfg-if"
+version = "1.0.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "9555578bc9e57714c812a1f84e4fc5b4d21fcb063490c624de019f7464c91268"
+
+[[package]]
+name = "crypto-common"
+version = "0.1.6"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "1bfb12502f3fc46cca1bb51ac28df9d618d813cdc3d2f25b9fe775a34af26bb3"
+dependencies = [
+ "generic-array",
+ "typenum",
+]
+
+[[package]]
+name = "digest"
+version = "0.10.7"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "9ed9a281f7bc9b7576e61468ba615a66a5c8cfdff42420a70aa82701a3b1e292"
+dependencies = [
+ "block-buffer",
+ "crypto-common",
+]
+
+[[package]]
+name = "generic-array"
+version = "0.14.7"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "85649ca51fd72272d7821adaf274ad91c288277713d9c18820d8499a7ff69e9a"
+dependencies = [
+ "typenum",
+ "version_check",
+]
+
+[[package]]
+name = "md-5"
+version = "0.10.6"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "d89e7ee0cfbedfc4da3340218492196241d89eefb6dab27de5df917a6d2e78cf"
+dependencies = [
+ "cfg-if",
+ "digest",
+]
+
+[[package]]
+name = "md5"
+version = "0.7.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "490cc448043f947bae3cbee9c203358d62dbee0db12107a74be5c30ccfd09771"
+
+[[package]]
+name = "test"
+version = "0.0.1"
+dependencies = [
+ "md-5",
+ "md5",
+]
+
+[[package]]
+name = "typenum"
+version = "1.18.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "1dccffe3ce07af9386bfd29e80c0ab1a8205a2fc34e4bcd40364df902cfa8f3f"
+
+[[package]]
+name = "version_check"
+version = "0.9.5"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "0b928f33d975fc6ad9f86c8f283853ad26bdd5b10b7f1542aa2fa15e2289105a"
diff --git a/rust/ql/test/extractor-tests/crate_graph/crates.expected b/rust/ql/test/extractor-tests/crate_graph/crates.expected
index acc8aa3dec8..f934618db9c 100644
--- a/rust/ql/test/extractor-tests/crate_graph/crates.expected
+++ b/rust/ql/test/extractor-tests/crate_graph/crates.expected
@@ -18,7 +18,7 @@
 #-----| core -> Crate(core@0.0.0)
 #-----| compiler_builtins -> Crate(compiler_builtins@0.1.140)
 
-#-----| Crate(cfg_if@1.0.0)
+#-----| Crate(cfg_if@1.0.1)
 #-----| proc_macro -> Crate(proc_macro@0.0.0)
 #-----| alloc -> Crate(alloc@0.0.0)
 #-----| core -> Crate(core@0.0.0)
@@ -89,7 +89,7 @@ main.rs:
 #-----| core -> Crate(core@0.0.0)
 #-----| std -> Crate(std@0.0.0)
 #-----| test -> Crate(test@0.0.0)
-#-----| cfg_if -> Crate(cfg_if@1.0.0)
+#-----| cfg_if -> Crate(cfg_if@1.0.1)
 #-----| digest -> Crate(digest@0.10.7)
 
 #-----| Crate(md5@0.7.0)
diff --git a/rust/ql/test/extractor-tests/generated/CallExpr/CallExpr.expected b/rust/ql/test/extractor-tests/generated/CallExpr/CallExpr.expected
index ebe6eeda104..31824b731a6 100644
--- a/rust/ql/test/extractor-tests/generated/CallExpr/CallExpr.expected
+++ b/rust/ql/test/extractor-tests/generated/CallExpr/CallExpr.expected
@@ -1,4 +1,4 @@
-| gen_call_expr.rs:5:5:5:11 | foo(...) | hasArgList: | yes | getNumberOfAttrs: | 0 | hasFunction: | yes |
-| gen_call_expr.rs:6:5:6:23 | foo::<...>(...) | hasArgList: | yes | getNumberOfAttrs: | 0 | hasFunction: | yes |
-| gen_call_expr.rs:7:5:7:14 | ...(...) | hasArgList: | yes | getNumberOfAttrs: | 0 | hasFunction: | yes |
-| gen_call_expr.rs:8:5:8:10 | foo(...) | hasArgList: | yes | getNumberOfAttrs: | 0 | hasFunction: | yes |
+| gen_call_expr.rs:5:5:5:11 | foo(...) | hasArgList: | yes | getNumberOfAttrs: | 0 | getNumberOfArgs: | 1 | hasFunction: | yes |
+| gen_call_expr.rs:6:5:6:23 | foo::<...>(...) | hasArgList: | yes | getNumberOfAttrs: | 0 | getNumberOfArgs: | 1 | hasFunction: | yes |
+| gen_call_expr.rs:7:5:7:14 | ...(...) | hasArgList: | yes | getNumberOfAttrs: | 0 | getNumberOfArgs: | 1 | hasFunction: | yes |
+| gen_call_expr.rs:8:5:8:10 | foo(...) | hasArgList: | yes | getNumberOfAttrs: | 0 | getNumberOfArgs: | 1 | hasFunction: | yes |
diff --git a/rust/ql/test/extractor-tests/generated/CallExpr/CallExpr.ql b/rust/ql/test/extractor-tests/generated/CallExpr/CallExpr.ql
index cd043e88d1d..8abf8b2a08e 100644
--- a/rust/ql/test/extractor-tests/generated/CallExpr/CallExpr.ql
+++ b/rust/ql/test/extractor-tests/generated/CallExpr/CallExpr.ql
@@ -2,12 +2,13 @@
 import codeql.rust.elements
 import TestUtils
 
-from CallExpr x, string hasArgList, int getNumberOfAttrs, string hasFunction
+from CallExpr x, string hasArgList, int getNumberOfAttrs, int getNumberOfArgs, string hasFunction
 where
   toBeTested(x) and
   not x.isUnknown() and
   (if x.hasArgList() then hasArgList = "yes" else hasArgList = "no") and
   getNumberOfAttrs = x.getNumberOfAttrs() and
+  getNumberOfArgs = x.getNumberOfArgs() and
   if x.hasFunction() then hasFunction = "yes" else hasFunction = "no"
-select x, "hasArgList:", hasArgList, "getNumberOfAttrs:", getNumberOfAttrs, "hasFunction:",
-  hasFunction
+select x, "hasArgList:", hasArgList, "getNumberOfAttrs:", getNumberOfAttrs, "getNumberOfArgs:",
+  getNumberOfArgs, "hasFunction:", hasFunction
diff --git a/rust/ql/test/extractor-tests/generated/CallExpr/CallExpr_getArg.expected b/rust/ql/test/extractor-tests/generated/CallExpr/CallExpr_getArg.expected
new file mode 100644
index 00000000000..2bf84953410
--- /dev/null
+++ b/rust/ql/test/extractor-tests/generated/CallExpr/CallExpr_getArg.expected
@@ -0,0 +1,4 @@
+| gen_call_expr.rs:5:5:5:11 | foo(...) | 0 | gen_call_expr.rs:5:9:5:10 | 42 |
+| gen_call_expr.rs:6:5:6:23 | foo::<...>(...) | 0 | gen_call_expr.rs:6:21:6:22 | 42 |
+| gen_call_expr.rs:7:5:7:14 | ...(...) | 0 | gen_call_expr.rs:7:12:7:13 | 42 |
+| gen_call_expr.rs:8:5:8:10 | foo(...) | 0 | gen_call_expr.rs:8:9:8:9 | 1 |
diff --git a/rust/ql/test/extractor-tests/generated/CallExpr/CallExpr_getArg.ql b/rust/ql/test/extractor-tests/generated/CallExpr/CallExpr_getArg.ql
new file mode 100644
index 00000000000..37483c3e637
--- /dev/null
+++ b/rust/ql/test/extractor-tests/generated/CallExpr/CallExpr_getArg.ql
@@ -0,0 +1,7 @@
+// generated by codegen, do not edit
+import codeql.rust.elements
+import TestUtils
+
+from CallExpr x, int index
+where toBeTested(x) and not x.isUnknown()
+select x, index, x.getArg(index)
diff --git a/rust/ql/test/extractor-tests/generated/ClosureExpr/ClosureExpr.expected b/rust/ql/test/extractor-tests/generated/ClosureExpr/ClosureExpr.expected
index 3ea9f463a00..d8a9b33ce0e 100644
--- a/rust/ql/test/extractor-tests/generated/ClosureExpr/ClosureExpr.expected
+++ b/rust/ql/test/extractor-tests/generated/ClosureExpr/ClosureExpr.expected
@@ -1,5 +1,5 @@
-| gen_closure_expr.rs:5:5:5:13 | \|...\| ... | hasParamList: | yes | getNumberOfAttrs: | 0 | hasBody: | yes | hasClosureBinder: | no | isAsync: | no | isConst: | no | isGen: | no | isMove: | no | isStatic: | no | hasRetType: | no |
-| gen_closure_expr.rs:6:5:6:34 | \|...\| ... | hasParamList: | yes | getNumberOfAttrs: | 0 | hasBody: | yes | hasClosureBinder: | no | isAsync: | no | isConst: | no | isGen: | no | isMove: | yes | isStatic: | no | hasRetType: | yes |
-| gen_closure_expr.rs:7:5:7:27 | \|...\| ... | hasParamList: | yes | getNumberOfAttrs: | 0 | hasBody: | yes | hasClosureBinder: | no | isAsync: | yes | isConst: | no | isGen: | no | isMove: | no | isStatic: | no | hasRetType: | no |
-| gen_closure_expr.rs:8:6:9:15 | \|...\| ... | hasParamList: | yes | getNumberOfAttrs: | 1 | hasBody: | yes | hasClosureBinder: | no | isAsync: | no | isConst: | no | isGen: | no | isMove: | no | isStatic: | no | hasRetType: | no |
-| gen_closure_expr.rs:10:6:11:23 | \|...\| ... | hasParamList: | yes | getNumberOfAttrs: | 1 | hasBody: | yes | hasClosureBinder: | no | isAsync: | no | isConst: | no | isGen: | no | isMove: | no | isStatic: | yes | hasRetType: | no |
+| gen_closure_expr.rs:5:5:5:13 | \|...\| ... | hasParamList: | yes | getNumberOfAttrs: | 0 | getNumberOfParams: | 1 | hasBody: | yes | hasClosureBinder: | no | isAsync: | no | isConst: | no | isGen: | no | isMove: | no | isStatic: | no | hasRetType: | no |
+| gen_closure_expr.rs:6:5:6:34 | \|...\| ... | hasParamList: | yes | getNumberOfAttrs: | 0 | getNumberOfParams: | 1 | hasBody: | yes | hasClosureBinder: | no | isAsync: | no | isConst: | no | isGen: | no | isMove: | yes | isStatic: | no | hasRetType: | yes |
+| gen_closure_expr.rs:7:5:7:27 | \|...\| ... | hasParamList: | yes | getNumberOfAttrs: | 0 | getNumberOfParams: | 2 | hasBody: | yes | hasClosureBinder: | no | isAsync: | yes | isConst: | no | isGen: | no | isMove: | no | isStatic: | no | hasRetType: | no |
+| gen_closure_expr.rs:8:6:9:15 | \|...\| ... | hasParamList: | yes | getNumberOfAttrs: | 1 | getNumberOfParams: | 1 | hasBody: | yes | hasClosureBinder: | no | isAsync: | no | isConst: | no | isGen: | no | isMove: | no | isStatic: | no | hasRetType: | no |
+| gen_closure_expr.rs:10:6:11:23 | \|...\| ... | hasParamList: | yes | getNumberOfAttrs: | 1 | getNumberOfParams: | 1 | hasBody: | yes | hasClosureBinder: | no | isAsync: | no | isConst: | no | isGen: | no | isMove: | no | isStatic: | yes | hasRetType: | no |
diff --git a/rust/ql/test/extractor-tests/generated/ClosureExpr/ClosureExpr.ql b/rust/ql/test/extractor-tests/generated/ClosureExpr/ClosureExpr.ql
index b4b3dddc679..6a5536c5be1 100644
--- a/rust/ql/test/extractor-tests/generated/ClosureExpr/ClosureExpr.ql
+++ b/rust/ql/test/extractor-tests/generated/ClosureExpr/ClosureExpr.ql
@@ -3,13 +3,15 @@ import codeql.rust.elements
 import TestUtils
 
 from
-  ClosureExpr x, string hasParamList, int getNumberOfAttrs, string hasBody, string hasClosureBinder,
-  string isAsync, string isConst, string isGen, string isMove, string isStatic, string hasRetType
+  ClosureExpr x, string hasParamList, int getNumberOfAttrs, int getNumberOfParams, string hasBody,
+  string hasClosureBinder, string isAsync, string isConst, string isGen, string isMove,
+  string isStatic, string hasRetType
 where
   toBeTested(x) and
   not x.isUnknown() and
   (if x.hasParamList() then hasParamList = "yes" else hasParamList = "no") and
   getNumberOfAttrs = x.getNumberOfAttrs() and
+  getNumberOfParams = x.getNumberOfParams() and
   (if x.hasBody() then hasBody = "yes" else hasBody = "no") and
   (if x.hasClosureBinder() then hasClosureBinder = "yes" else hasClosureBinder = "no") and
   (if x.isAsync() then isAsync = "yes" else isAsync = "no") and
@@ -18,6 +20,7 @@ where
   (if x.isMove() then isMove = "yes" else isMove = "no") and
   (if x.isStatic() then isStatic = "yes" else isStatic = "no") and
   if x.hasRetType() then hasRetType = "yes" else hasRetType = "no"
-select x, "hasParamList:", hasParamList, "getNumberOfAttrs:", getNumberOfAttrs, "hasBody:", hasBody,
-  "hasClosureBinder:", hasClosureBinder, "isAsync:", isAsync, "isConst:", isConst, "isGen:", isGen,
-  "isMove:", isMove, "isStatic:", isStatic, "hasRetType:", hasRetType
+select x, "hasParamList:", hasParamList, "getNumberOfAttrs:", getNumberOfAttrs,
+  "getNumberOfParams:", getNumberOfParams, "hasBody:", hasBody, "hasClosureBinder:",
+  hasClosureBinder, "isAsync:", isAsync, "isConst:", isConst, "isGen:", isGen, "isMove:", isMove,
+  "isStatic:", isStatic, "hasRetType:", hasRetType
diff --git a/rust/ql/test/extractor-tests/generated/ClosureExpr/ClosureExpr_getParam.expected b/rust/ql/test/extractor-tests/generated/ClosureExpr/ClosureExpr_getParam.expected
new file mode 100644
index 00000000000..29be6ae9ef0
--- /dev/null
+++ b/rust/ql/test/extractor-tests/generated/ClosureExpr/ClosureExpr_getParam.expected
@@ -0,0 +1,6 @@
+| gen_closure_expr.rs:5:5:5:13 | \|...\| ... | 0 | gen_closure_expr.rs:5:6:5:6 | ... |
+| gen_closure_expr.rs:6:5:6:34 | \|...\| ... | 0 | gen_closure_expr.rs:6:11:6:16 | ...: i32 |
+| gen_closure_expr.rs:7:5:7:27 | \|...\| ... | 0 | gen_closure_expr.rs:7:12:7:17 | ...: i32 |
+| gen_closure_expr.rs:7:5:7:27 | \|...\| ... | 1 | gen_closure_expr.rs:7:20:7:20 | ... |
+| gen_closure_expr.rs:8:6:9:15 | \|...\| ... | 0 | gen_closure_expr.rs:9:6:9:6 | ... |
+| gen_closure_expr.rs:10:6:11:23 | \|...\| ... | 0 | gen_closure_expr.rs:11:14:11:14 | ... |
diff --git a/rust/ql/test/extractor-tests/generated/ClosureExpr/ClosureExpr_getParam.ql b/rust/ql/test/extractor-tests/generated/ClosureExpr/ClosureExpr_getParam.ql
new file mode 100644
index 00000000000..06cef03f206
--- /dev/null
+++ b/rust/ql/test/extractor-tests/generated/ClosureExpr/ClosureExpr_getParam.ql
@@ -0,0 +1,7 @@
+// generated by codegen, do not edit
+import codeql.rust.elements
+import TestUtils
+
+from ClosureExpr x, int index
+where toBeTested(x) and not x.isUnknown()
+select x, index, x.getParam(index)
diff --git a/rust/ql/test/extractor-tests/generated/Const/Const.expected b/rust/ql/test/extractor-tests/generated/Const/Const.expected
index 4f486333873..ceb8669ac83 100644
--- a/rust/ql/test/extractor-tests/generated/Const/Const.expected
+++ b/rust/ql/test/extractor-tests/generated/Const/Const.expected
@@ -1 +1 @@
-| gen_const.rs:4:5:7:22 | Const | hasExtendedCanonicalPath: | no | hasCrateOrigin: | no | hasAttributeMacroExpansion: | no | getNumberOfAttrs: | 0 | hasBody: | yes | isConst: | yes | isDefault: | no | hasName: | yes | hasTypeRepr: | yes | hasVisibility: | no |
+| gen_const.rs:4:5:7:22 | Const | hasExtendedCanonicalPath: | no | hasCrateOrigin: | no | hasAttributeMacroExpansion: | no | getNumberOfAttrs: | 0 | hasBody: | yes | isConst: | yes | isDefault: | no | hasName: | yes | hasTypeRepr: | yes | hasVisibility: | no | hasImplementation: | yes |
diff --git a/rust/ql/test/extractor-tests/generated/Const/Const.ql b/rust/ql/test/extractor-tests/generated/Const/Const.ql
index dee1c6dada4..0bd52702c24 100644
--- a/rust/ql/test/extractor-tests/generated/Const/Const.ql
+++ b/rust/ql/test/extractor-tests/generated/Const/Const.ql
@@ -5,7 +5,8 @@ import TestUtils
 from
   Const x, string hasExtendedCanonicalPath, string hasCrateOrigin,
   string hasAttributeMacroExpansion, int getNumberOfAttrs, string hasBody, string isConst,
-  string isDefault, string hasName, string hasTypeRepr, string hasVisibility
+  string isDefault, string hasName, string hasTypeRepr, string hasVisibility,
+  string hasImplementation
 where
   toBeTested(x) and
   not x.isUnknown() and
@@ -26,8 +27,10 @@ where
   (if x.isDefault() then isDefault = "yes" else isDefault = "no") and
   (if x.hasName() then hasName = "yes" else hasName = "no") and
   (if x.hasTypeRepr() then hasTypeRepr = "yes" else hasTypeRepr = "no") and
-  if x.hasVisibility() then hasVisibility = "yes" else hasVisibility = "no"
+  (if x.hasVisibility() then hasVisibility = "yes" else hasVisibility = "no") and
+  if x.hasImplementation() then hasImplementation = "yes" else hasImplementation = "no"
 select x, "hasExtendedCanonicalPath:", hasExtendedCanonicalPath, "hasCrateOrigin:", hasCrateOrigin,
   "hasAttributeMacroExpansion:", hasAttributeMacroExpansion, "getNumberOfAttrs:", getNumberOfAttrs,
   "hasBody:", hasBody, "isConst:", isConst, "isDefault:", isDefault, "hasName:", hasName,
-  "hasTypeRepr:", hasTypeRepr, "hasVisibility:", hasVisibility
+  "hasTypeRepr:", hasTypeRepr, "hasVisibility:", hasVisibility, "hasImplementation:",
+  hasImplementation
diff --git a/rust/ql/test/extractor-tests/generated/Function/Function.expected b/rust/ql/test/extractor-tests/generated/Function/Function.expected
index d30ef684493..967606c2542 100644
--- a/rust/ql/test/extractor-tests/generated/Function/Function.expected
+++ b/rust/ql/test/extractor-tests/generated/Function/Function.expected
@@ -1,2 +1,2 @@
-| gen_function.rs:3:1:4:38 | fn foo | hasParamList: | yes | getNumberOfAttrs: | 0 | hasExtendedCanonicalPath: | yes | hasCrateOrigin: | yes | hasAttributeMacroExpansion: | no | hasAbi: | no | hasBody: | yes | hasGenericParamList: | no | isAsync: | no | isConst: | no | isDefault: | no | isGen: | no | isUnsafe: | no | hasName: | yes | hasRetType: | yes | hasVisibility: | no | hasWhereClause: | no |
-| gen_function.rs:7:5:7:13 | fn bar | hasParamList: | yes | getNumberOfAttrs: | 0 | hasExtendedCanonicalPath: | yes | hasCrateOrigin: | yes | hasAttributeMacroExpansion: | no | hasAbi: | no | hasBody: | no | hasGenericParamList: | no | isAsync: | no | isConst: | no | isDefault: | no | isGen: | no | isUnsafe: | no | hasName: | yes | hasRetType: | no | hasVisibility: | no | hasWhereClause: | no |
+| gen_function.rs:3:1:4:38 | fn foo | hasParamList: | yes | getNumberOfAttrs: | 0 | getNumberOfParams: | 1 | hasExtendedCanonicalPath: | yes | hasCrateOrigin: | yes | hasAttributeMacroExpansion: | no | hasAbi: | no | hasBody: | yes | hasGenericParamList: | no | isAsync: | no | isConst: | no | isDefault: | no | isGen: | no | isUnsafe: | no | hasName: | yes | hasRetType: | yes | hasVisibility: | no | hasWhereClause: | no | hasImplementation: | yes |
+| gen_function.rs:7:5:7:13 | fn bar | hasParamList: | yes | getNumberOfAttrs: | 0 | getNumberOfParams: | 0 | hasExtendedCanonicalPath: | yes | hasCrateOrigin: | yes | hasAttributeMacroExpansion: | no | hasAbi: | no | hasBody: | no | hasGenericParamList: | no | isAsync: | no | isConst: | no | isDefault: | no | isGen: | no | isUnsafe: | no | hasName: | yes | hasRetType: | no | hasVisibility: | no | hasWhereClause: | no | hasImplementation: | no |
diff --git a/rust/ql/test/extractor-tests/generated/Function/Function.ql b/rust/ql/test/extractor-tests/generated/Function/Function.ql
index 3c368187c29..5e50f7a4ac0 100644
--- a/rust/ql/test/extractor-tests/generated/Function/Function.ql
+++ b/rust/ql/test/extractor-tests/generated/Function/Function.ql
@@ -3,15 +3,17 @@ import codeql.rust.elements
 import TestUtils
 
 from
-  Function x, string hasParamList, int getNumberOfAttrs, string hasExtendedCanonicalPath,
-  string hasCrateOrigin, string hasAttributeMacroExpansion, string hasAbi, string hasBody,
-  string hasGenericParamList, string isAsync, string isConst, string isDefault, string isGen,
-  string isUnsafe, string hasName, string hasRetType, string hasVisibility, string hasWhereClause
+  Function x, string hasParamList, int getNumberOfAttrs, int getNumberOfParams,
+  string hasExtendedCanonicalPath, string hasCrateOrigin, string hasAttributeMacroExpansion,
+  string hasAbi, string hasBody, string hasGenericParamList, string isAsync, string isConst,
+  string isDefault, string isGen, string isUnsafe, string hasName, string hasRetType,
+  string hasVisibility, string hasWhereClause, string hasImplementation
 where
   toBeTested(x) and
   not x.isUnknown() and
   (if x.hasParamList() then hasParamList = "yes" else hasParamList = "no") and
   getNumberOfAttrs = x.getNumberOfAttrs() and
+  getNumberOfParams = x.getNumberOfParams() and
   (
     if x.hasExtendedCanonicalPath()
     then hasExtendedCanonicalPath = "yes"
@@ -34,10 +36,12 @@ where
   (if x.hasName() then hasName = "yes" else hasName = "no") and
   (if x.hasRetType() then hasRetType = "yes" else hasRetType = "no") and
   (if x.hasVisibility() then hasVisibility = "yes" else hasVisibility = "no") and
-  if x.hasWhereClause() then hasWhereClause = "yes" else hasWhereClause = "no"
+  (if x.hasWhereClause() then hasWhereClause = "yes" else hasWhereClause = "no") and
+  if x.hasImplementation() then hasImplementation = "yes" else hasImplementation = "no"
 select x, "hasParamList:", hasParamList, "getNumberOfAttrs:", getNumberOfAttrs,
-  "hasExtendedCanonicalPath:", hasExtendedCanonicalPath, "hasCrateOrigin:", hasCrateOrigin,
-  "hasAttributeMacroExpansion:", hasAttributeMacroExpansion, "hasAbi:", hasAbi, "hasBody:", hasBody,
-  "hasGenericParamList:", hasGenericParamList, "isAsync:", isAsync, "isConst:", isConst,
-  "isDefault:", isDefault, "isGen:", isGen, "isUnsafe:", isUnsafe, "hasName:", hasName,
-  "hasRetType:", hasRetType, "hasVisibility:", hasVisibility, "hasWhereClause:", hasWhereClause
+  "getNumberOfParams:", getNumberOfParams, "hasExtendedCanonicalPath:", hasExtendedCanonicalPath,
+  "hasCrateOrigin:", hasCrateOrigin, "hasAttributeMacroExpansion:", hasAttributeMacroExpansion,
+  "hasAbi:", hasAbi, "hasBody:", hasBody, "hasGenericParamList:", hasGenericParamList, "isAsync:",
+  isAsync, "isConst:", isConst, "isDefault:", isDefault, "isGen:", isGen, "isUnsafe:", isUnsafe,
+  "hasName:", hasName, "hasRetType:", hasRetType, "hasVisibility:", hasVisibility,
+  "hasWhereClause:", hasWhereClause, "hasImplementation:", hasImplementation
diff --git a/rust/ql/test/extractor-tests/generated/Function/Function_getParam.expected b/rust/ql/test/extractor-tests/generated/Function/Function_getParam.expected
new file mode 100644
index 00000000000..6a7340509a7
--- /dev/null
+++ b/rust/ql/test/extractor-tests/generated/Function/Function_getParam.expected
@@ -0,0 +1 @@
+| gen_function.rs:3:1:4:38 | fn foo | 0 | gen_function.rs:4:8:4:13 | ...: u32 |
diff --git a/rust/ql/test/extractor-tests/generated/Function/Function_getParam.ql b/rust/ql/test/extractor-tests/generated/Function/Function_getParam.ql
new file mode 100644
index 00000000000..c936ea99da7
--- /dev/null
+++ b/rust/ql/test/extractor-tests/generated/Function/Function_getParam.ql
@@ -0,0 +1,7 @@
+// generated by codegen, do not edit
+import codeql.rust.elements
+import TestUtils
+
+from Function x, int index
+where toBeTested(x) and not x.isUnknown()
+select x, index, x.getParam(index)
diff --git a/rust/ql/test/extractor-tests/generated/MethodCallExpr/MethodCallExpr.expected b/rust/ql/test/extractor-tests/generated/MethodCallExpr/MethodCallExpr.expected
index 5862cd94081..516e47d8b39 100644
--- a/rust/ql/test/extractor-tests/generated/MethodCallExpr/MethodCallExpr.expected
+++ b/rust/ql/test/extractor-tests/generated/MethodCallExpr/MethodCallExpr.expected
@@ -1,2 +1,2 @@
-| gen_method_call_expr.rs:5:5:5:13 | x.foo(...) | hasArgList: | yes | getNumberOfAttrs: | 0 | hasResolvedPath: | no | hasResolvedCrateOrigin: | no | hasGenericArgList: | no | hasIdentifier: | yes | hasReceiver: | yes |
-| gen_method_call_expr.rs:6:5:6:25 | x.foo(...) | hasArgList: | yes | getNumberOfAttrs: | 0 | hasResolvedPath: | no | hasResolvedCrateOrigin: | no | hasGenericArgList: | yes | hasIdentifier: | yes | hasReceiver: | yes |
+| gen_method_call_expr.rs:5:5:5:13 | x.foo(...) | hasArgList: | yes | getNumberOfAttrs: | 0 | getNumberOfArgs: | 1 | hasResolvedPath: | no | hasResolvedCrateOrigin: | no | hasGenericArgList: | no | hasIdentifier: | yes | hasReceiver: | yes |
+| gen_method_call_expr.rs:6:5:6:25 | x.foo(...) | hasArgList: | yes | getNumberOfAttrs: | 0 | getNumberOfArgs: | 1 | hasResolvedPath: | no | hasResolvedCrateOrigin: | no | hasGenericArgList: | yes | hasIdentifier: | yes | hasReceiver: | yes |
diff --git a/rust/ql/test/extractor-tests/generated/MethodCallExpr/MethodCallExpr.ql b/rust/ql/test/extractor-tests/generated/MethodCallExpr/MethodCallExpr.ql
index d0b082f4523..518d3dee36e 100644
--- a/rust/ql/test/extractor-tests/generated/MethodCallExpr/MethodCallExpr.ql
+++ b/rust/ql/test/extractor-tests/generated/MethodCallExpr/MethodCallExpr.ql
@@ -3,13 +3,15 @@ import codeql.rust.elements
 import TestUtils
 
 from
-  MethodCallExpr x, string hasArgList, int getNumberOfAttrs, string hasResolvedPath,
-  string hasResolvedCrateOrigin, string hasGenericArgList, string hasIdentifier, string hasReceiver
+  MethodCallExpr x, string hasArgList, int getNumberOfAttrs, int getNumberOfArgs,
+  string hasResolvedPath, string hasResolvedCrateOrigin, string hasGenericArgList,
+  string hasIdentifier, string hasReceiver
 where
   toBeTested(x) and
   not x.isUnknown() and
   (if x.hasArgList() then hasArgList = "yes" else hasArgList = "no") and
   getNumberOfAttrs = x.getNumberOfAttrs() and
+  getNumberOfArgs = x.getNumberOfArgs() and
   (if x.hasResolvedPath() then hasResolvedPath = "yes" else hasResolvedPath = "no") and
   (
     if x.hasResolvedCrateOrigin()
@@ -19,6 +21,7 @@ where
   (if x.hasGenericArgList() then hasGenericArgList = "yes" else hasGenericArgList = "no") and
   (if x.hasIdentifier() then hasIdentifier = "yes" else hasIdentifier = "no") and
   if x.hasReceiver() then hasReceiver = "yes" else hasReceiver = "no"
-select x, "hasArgList:", hasArgList, "getNumberOfAttrs:", getNumberOfAttrs, "hasResolvedPath:",
-  hasResolvedPath, "hasResolvedCrateOrigin:", hasResolvedCrateOrigin, "hasGenericArgList:",
-  hasGenericArgList, "hasIdentifier:", hasIdentifier, "hasReceiver:", hasReceiver
+select x, "hasArgList:", hasArgList, "getNumberOfAttrs:", getNumberOfAttrs, "getNumberOfArgs:",
+  getNumberOfArgs, "hasResolvedPath:", hasResolvedPath, "hasResolvedCrateOrigin:",
+  hasResolvedCrateOrigin, "hasGenericArgList:", hasGenericArgList, "hasIdentifier:", hasIdentifier,
+  "hasReceiver:", hasReceiver
diff --git a/rust/ql/test/extractor-tests/generated/MethodCallExpr/MethodCallExpr_getArg.expected b/rust/ql/test/extractor-tests/generated/MethodCallExpr/MethodCallExpr_getArg.expected
new file mode 100644
index 00000000000..36af4e22c50
--- /dev/null
+++ b/rust/ql/test/extractor-tests/generated/MethodCallExpr/MethodCallExpr_getArg.expected
@@ -0,0 +1,2 @@
+| gen_method_call_expr.rs:5:5:5:13 | x.foo(...) | 0 | gen_method_call_expr.rs:5:11:5:12 | 42 |
+| gen_method_call_expr.rs:6:5:6:25 | x.foo(...) | 0 | gen_method_call_expr.rs:6:23:6:24 | 42 |
diff --git a/rust/ql/test/extractor-tests/generated/MethodCallExpr/MethodCallExpr_getArg.ql b/rust/ql/test/extractor-tests/generated/MethodCallExpr/MethodCallExpr_getArg.ql
new file mode 100644
index 00000000000..58529cebfe5
--- /dev/null
+++ b/rust/ql/test/extractor-tests/generated/MethodCallExpr/MethodCallExpr_getArg.ql
@@ -0,0 +1,7 @@
+// generated by codegen, do not edit
+import codeql.rust.elements
+import TestUtils
+
+from MethodCallExpr x, int index
+where toBeTested(x) and not x.isUnknown()
+select x, index, x.getArg(index)
diff --git a/rust/ql/test/library-tests/dataflow/global/inline-flow.expected b/rust/ql/test/library-tests/dataflow/global/inline-flow.expected
index c64956c59a0..451d5996de5 100644
--- a/rust/ql/test/library-tests/dataflow/global/inline-flow.expected
+++ b/rust/ql/test/library-tests/dataflow/global/inline-flow.expected
@@ -19,106 +19,114 @@ edges
 | main.rs:38:23:38:31 | source(...) | main.rs:38:6:38:11 | [post] &mut a [&ref, MyStruct] | provenance |  |
 | main.rs:39:10:39:10 | a [MyStruct] | main.rs:30:17:30:21 | SelfParam [&ref, MyStruct] | provenance |  |
 | main.rs:39:10:39:10 | a [MyStruct] | main.rs:39:10:39:21 | a.get_data() | provenance |  |
-| main.rs:44:12:44:17 | [post] &mut a [&ref, MyStruct] | main.rs:44:17:44:17 | [post] a [MyStruct] | provenance |  |
-| main.rs:44:17:44:17 | [post] a [MyStruct] | main.rs:45:10:45:10 | a [MyStruct] | provenance |  |
-| main.rs:44:30:44:38 | source(...) | main.rs:26:28:26:33 | ...: i64 | provenance |  |
-| main.rs:44:30:44:38 | source(...) | main.rs:44:12:44:17 | [post] &mut a [&ref, MyStruct] | provenance |  |
-| main.rs:45:10:45:10 | a [MyStruct] | main.rs:30:17:30:21 | SelfParam [&ref, MyStruct] | provenance |  |
-| main.rs:45:10:45:10 | a [MyStruct] | main.rs:45:10:45:21 | a.get_data() | provenance |  |
-| main.rs:48:12:48:17 | ...: i64 | main.rs:49:10:49:10 | n | provenance |  |
-| main.rs:53:9:53:9 | a | main.rs:54:13:54:13 | a | provenance |  |
-| main.rs:53:13:53:21 | source(...) | main.rs:53:9:53:9 | a | provenance |  |
-| main.rs:54:13:54:13 | a | main.rs:48:12:48:17 | ...: i64 | provenance |  |
-| main.rs:57:17:57:22 | ...: i64 | main.rs:57:32:59:1 | { ... } | provenance |  |
-| main.rs:62:9:62:9 | a | main.rs:63:26:63:26 | a | provenance |  |
-| main.rs:62:13:62:21 | source(...) | main.rs:62:9:62:9 | a | provenance |  |
-| main.rs:63:9:63:9 | b | main.rs:64:10:64:10 | b | provenance |  |
-| main.rs:63:13:63:27 | pass_through(...) | main.rs:63:9:63:9 | b | provenance |  |
-| main.rs:63:26:63:26 | a | main.rs:57:17:57:22 | ...: i64 | provenance |  |
-| main.rs:63:26:63:26 | a | main.rs:63:13:63:27 | pass_through(...) | provenance |  |
-| main.rs:68:9:68:9 | a | main.rs:72:10:72:10 | a | provenance |  |
-| main.rs:68:13:71:6 | pass_through(...) | main.rs:68:9:68:9 | a | provenance |  |
-| main.rs:68:26:71:5 | { ... } | main.rs:57:17:57:22 | ...: i64 | provenance |  |
-| main.rs:68:26:71:5 | { ... } | main.rs:68:13:71:6 | pass_through(...) | provenance |  |
-| main.rs:70:9:70:18 | source(...) | main.rs:68:26:71:5 | { ... } | provenance |  |
-| main.rs:76:9:76:9 | a | main.rs:82:26:82:26 | a | provenance |  |
-| main.rs:76:13:76:22 | source(...) | main.rs:76:9:76:9 | a | provenance |  |
-| main.rs:78:21:78:26 | ...: i64 | main.rs:78:36:80:5 | { ... } | provenance |  |
-| main.rs:82:9:82:9 | b | main.rs:83:10:83:10 | b | provenance |  |
-| main.rs:82:13:82:27 | pass_through(...) | main.rs:82:9:82:9 | b | provenance |  |
-| main.rs:82:26:82:26 | a | main.rs:78:21:78:26 | ...: i64 | provenance |  |
-| main.rs:82:26:82:26 | a | main.rs:82:13:82:27 | pass_through(...) | provenance |  |
-| main.rs:94:22:94:27 | ...: i64 | main.rs:95:14:95:14 | n | provenance |  |
-| main.rs:98:30:104:5 | { ... } | main.rs:117:13:117:25 | mn.get_data() | provenance |  |
-| main.rs:102:13:102:21 | source(...) | main.rs:98:30:104:5 | { ... } | provenance |  |
-| main.rs:106:27:106:32 | ...: i64 | main.rs:106:42:112:5 | { ... } | provenance |  |
-| main.rs:117:9:117:9 | a | main.rs:118:10:118:10 | a | provenance |  |
-| main.rs:117:13:117:25 | mn.get_data() | main.rs:117:9:117:9 | a | provenance |  |
-| main.rs:123:9:123:9 | a | main.rs:124:16:124:16 | a | provenance |  |
-| main.rs:123:13:123:21 | source(...) | main.rs:123:9:123:9 | a | provenance |  |
-| main.rs:124:16:124:16 | a | main.rs:94:22:94:27 | ...: i64 | provenance |  |
-| main.rs:129:9:129:9 | a | main.rs:130:29:130:29 | a | provenance |  |
-| main.rs:129:13:129:21 | source(...) | main.rs:129:9:129:9 | a | provenance |  |
-| main.rs:130:9:130:9 | b | main.rs:131:10:131:10 | b | provenance |  |
-| main.rs:130:13:130:30 | mn.data_through(...) | main.rs:130:9:130:9 | b | provenance |  |
-| main.rs:130:29:130:29 | a | main.rs:106:27:106:32 | ...: i64 | provenance |  |
-| main.rs:130:29:130:29 | a | main.rs:130:13:130:30 | mn.data_through(...) | provenance |  |
-| main.rs:136:9:136:9 | a | main.rs:137:25:137:25 | a | provenance |  |
-| main.rs:136:13:136:21 | source(...) | main.rs:136:9:136:9 | a | provenance |  |
-| main.rs:137:25:137:25 | a | main.rs:94:22:94:27 | ...: i64 | provenance |  |
-| main.rs:142:9:142:9 | a | main.rs:143:38:143:38 | a | provenance |  |
-| main.rs:142:13:142:22 | source(...) | main.rs:142:9:142:9 | a | provenance |  |
-| main.rs:143:9:143:9 | b | main.rs:144:10:144:10 | b | provenance |  |
-| main.rs:143:13:143:39 | ...::data_through(...) | main.rs:143:9:143:9 | b | provenance |  |
-| main.rs:143:38:143:38 | a | main.rs:106:27:106:32 | ...: i64 | provenance |  |
-| main.rs:143:38:143:38 | a | main.rs:143:13:143:39 | ...::data_through(...) | provenance |  |
-| main.rs:155:12:155:17 | ...: i64 | main.rs:156:24:156:24 | n | provenance |  |
-| main.rs:156:9:156:26 | MyInt {...} [MyInt] | main.rs:155:28:157:5 | { ... } [MyInt] | provenance |  |
-| main.rs:156:24:156:24 | n | main.rs:156:9:156:26 | MyInt {...} [MyInt] | provenance |  |
-| main.rs:161:9:161:9 | n [MyInt] | main.rs:162:9:162:26 | MyInt {...} [MyInt] | provenance |  |
-| main.rs:161:13:161:34 | ...::new(...) [MyInt] | main.rs:161:9:161:9 | n [MyInt] | provenance |  |
-| main.rs:161:24:161:33 | source(...) | main.rs:155:12:155:17 | ...: i64 | provenance |  |
-| main.rs:161:24:161:33 | source(...) | main.rs:161:13:161:34 | ...::new(...) [MyInt] | provenance |  |
-| main.rs:162:9:162:26 | MyInt {...} [MyInt] | main.rs:162:24:162:24 | m | provenance |  |
-| main.rs:162:24:162:24 | m | main.rs:163:10:163:10 | m | provenance |  |
-| main.rs:169:12:169:15 | SelfParam [MyInt] | main.rs:171:24:171:27 | self [MyInt] | provenance |  |
-| main.rs:171:9:171:35 | MyInt {...} [MyInt] | main.rs:169:42:172:5 | { ... } [MyInt] | provenance |  |
-| main.rs:171:24:171:27 | self [MyInt] | main.rs:171:24:171:33 | self.value | provenance |  |
-| main.rs:171:24:171:33 | self.value | main.rs:171:9:171:35 | MyInt {...} [MyInt] | provenance |  |
-| main.rs:186:9:186:9 | a [MyInt] | main.rs:169:12:169:15 | SelfParam [MyInt] | provenance |  |
-| main.rs:186:9:186:9 | a [MyInt] | main.rs:188:13:188:20 | a.add(...) [MyInt] | provenance |  |
-| main.rs:186:13:186:38 | MyInt {...} [MyInt] | main.rs:186:9:186:9 | a [MyInt] | provenance |  |
-| main.rs:186:28:186:36 | source(...) | main.rs:186:13:186:38 | MyInt {...} [MyInt] | provenance |  |
-| main.rs:188:9:188:9 | d [MyInt] | main.rs:189:10:189:10 | d [MyInt] | provenance |  |
-| main.rs:188:13:188:20 | a.add(...) [MyInt] | main.rs:188:9:188:9 | d [MyInt] | provenance |  |
-| main.rs:189:10:189:10 | d [MyInt] | main.rs:189:10:189:16 | d.value | provenance |  |
-| main.rs:201:18:201:21 | SelfParam [MyInt] | main.rs:201:48:203:5 | { ... } [MyInt] | provenance |  |
-| main.rs:205:26:205:37 | ...: MyInt [MyInt] | main.rs:205:49:207:5 | { ... } [MyInt] | provenance |  |
-| main.rs:211:9:211:9 | a [MyInt] | main.rs:213:49:213:49 | a [MyInt] | provenance |  |
-| main.rs:211:13:211:38 | MyInt {...} [MyInt] | main.rs:211:9:211:9 | a [MyInt] | provenance |  |
-| main.rs:211:28:211:36 | source(...) | main.rs:211:13:211:38 | MyInt {...} [MyInt] | provenance |  |
-| main.rs:213:9:213:26 | MyInt {...} [MyInt] | main.rs:213:24:213:24 | c | provenance |  |
-| main.rs:213:24:213:24 | c | main.rs:214:10:214:10 | c | provenance |  |
-| main.rs:213:30:213:53 | ...::take_self(...) [MyInt] | main.rs:213:9:213:26 | MyInt {...} [MyInt] | provenance |  |
-| main.rs:213:49:213:49 | a [MyInt] | main.rs:201:18:201:21 | SelfParam [MyInt] | provenance |  |
-| main.rs:213:49:213:49 | a [MyInt] | main.rs:213:30:213:53 | ...::take_self(...) [MyInt] | provenance |  |
-| main.rs:217:9:217:9 | b [MyInt] | main.rs:218:54:218:54 | b [MyInt] | provenance |  |
-| main.rs:217:13:217:39 | MyInt {...} [MyInt] | main.rs:217:9:217:9 | b [MyInt] | provenance |  |
-| main.rs:217:28:217:37 | source(...) | main.rs:217:13:217:39 | MyInt {...} [MyInt] | provenance |  |
-| main.rs:218:9:218:26 | MyInt {...} [MyInt] | main.rs:218:24:218:24 | c | provenance |  |
-| main.rs:218:24:218:24 | c | main.rs:219:10:219:10 | c | provenance |  |
-| main.rs:218:30:218:55 | ...::take_second(...) [MyInt] | main.rs:218:9:218:26 | MyInt {...} [MyInt] | provenance |  |
-| main.rs:218:54:218:54 | b [MyInt] | main.rs:205:26:205:37 | ...: MyInt [MyInt] | provenance |  |
-| main.rs:218:54:218:54 | b [MyInt] | main.rs:218:30:218:55 | ...::take_second(...) [MyInt] | provenance |  |
-| main.rs:227:32:231:1 | { ... } | main.rs:246:41:246:54 | async_source(...) | provenance |  |
-| main.rs:228:9:228:9 | a | main.rs:227:32:231:1 | { ... } | provenance |  |
-| main.rs:228:9:228:9 | a | main.rs:229:10:229:10 | a | provenance |  |
-| main.rs:228:13:228:21 | source(...) | main.rs:228:9:228:9 | a | provenance |  |
-| main.rs:238:13:238:13 | c | main.rs:239:14:239:14 | c | provenance |  |
-| main.rs:238:17:238:25 | source(...) | main.rs:238:13:238:13 | c | provenance |  |
-| main.rs:246:9:246:9 | a | main.rs:247:10:247:10 | a | provenance |  |
-| main.rs:246:13:246:55 | ...::block_on(...) | main.rs:246:9:246:9 | a | provenance |  |
-| main.rs:246:41:246:54 | async_source(...) | main.rs:246:13:246:55 | ...::block_on(...) | provenance | MaD:1 |
+| main.rs:46:9:46:14 | [post] &mut a [&ref, MyStruct] | main.rs:46:14:46:14 | [post] a [MyStruct] | provenance |  |
+| main.rs:46:14:46:14 | [post] a [MyStruct] | main.rs:49:10:49:10 | a [MyStruct] | provenance |  |
+| main.rs:48:15:48:23 | source(...) | main.rs:26:28:26:33 | ...: i64 | provenance |  |
+| main.rs:48:15:48:23 | source(...) | main.rs:46:9:46:14 | [post] &mut a [&ref, MyStruct] | provenance |  |
+| main.rs:49:10:49:10 | a [MyStruct] | main.rs:30:17:30:21 | SelfParam [&ref, MyStruct] | provenance |  |
+| main.rs:49:10:49:10 | a [MyStruct] | main.rs:49:10:49:21 | a.get_data() | provenance |  |
+| main.rs:52:12:52:17 | ...: i64 | main.rs:53:10:53:10 | n | provenance |  |
+| main.rs:57:9:57:9 | a | main.rs:58:13:58:13 | a | provenance |  |
+| main.rs:57:13:57:21 | source(...) | main.rs:57:9:57:9 | a | provenance |  |
+| main.rs:58:13:58:13 | a | main.rs:52:12:52:17 | ...: i64 | provenance |  |
+| main.rs:61:17:61:22 | ...: i64 | main.rs:61:32:63:1 | { ... } | provenance |  |
+| main.rs:66:9:66:9 | a | main.rs:67:26:67:26 | a | provenance |  |
+| main.rs:66:13:66:21 | source(...) | main.rs:66:9:66:9 | a | provenance |  |
+| main.rs:67:9:67:9 | b | main.rs:68:10:68:10 | b | provenance |  |
+| main.rs:67:13:67:27 | pass_through(...) | main.rs:67:9:67:9 | b | provenance |  |
+| main.rs:67:26:67:26 | a | main.rs:61:17:61:22 | ...: i64 | provenance |  |
+| main.rs:67:26:67:26 | a | main.rs:67:13:67:27 | pass_through(...) | provenance |  |
+| main.rs:72:9:72:9 | a | main.rs:76:10:76:10 | a | provenance |  |
+| main.rs:72:13:75:6 | pass_through(...) | main.rs:72:9:72:9 | a | provenance |  |
+| main.rs:72:26:75:5 | { ... } | main.rs:61:17:61:22 | ...: i64 | provenance |  |
+| main.rs:72:26:75:5 | { ... } | main.rs:72:13:75:6 | pass_through(...) | provenance |  |
+| main.rs:74:9:74:18 | source(...) | main.rs:72:26:75:5 | { ... } | provenance |  |
+| main.rs:80:9:80:9 | a | main.rs:86:26:86:26 | a | provenance |  |
+| main.rs:80:13:80:22 | source(...) | main.rs:80:9:80:9 | a | provenance |  |
+| main.rs:82:21:82:26 | ...: i64 | main.rs:82:36:84:5 | { ... } | provenance |  |
+| main.rs:86:9:86:9 | b | main.rs:87:10:87:10 | b | provenance |  |
+| main.rs:86:13:86:27 | pass_through(...) | main.rs:86:9:86:9 | b | provenance |  |
+| main.rs:86:26:86:26 | a | main.rs:82:21:82:26 | ...: i64 | provenance |  |
+| main.rs:86:26:86:26 | a | main.rs:86:13:86:27 | pass_through(...) | provenance |  |
+| main.rs:98:22:98:27 | ...: i64 | main.rs:99:14:99:14 | n | provenance |  |
+| main.rs:102:30:108:5 | { ... } | main.rs:121:13:121:25 | mn.get_data() | provenance |  |
+| main.rs:106:13:106:21 | source(...) | main.rs:102:30:108:5 | { ... } | provenance |  |
+| main.rs:110:27:110:32 | ...: i64 | main.rs:110:42:116:5 | { ... } | provenance |  |
+| main.rs:121:9:121:9 | a | main.rs:122:10:122:10 | a | provenance |  |
+| main.rs:121:13:121:25 | mn.get_data() | main.rs:121:9:121:9 | a | provenance |  |
+| main.rs:127:9:127:9 | a | main.rs:128:16:128:16 | a | provenance |  |
+| main.rs:127:13:127:21 | source(...) | main.rs:127:9:127:9 | a | provenance |  |
+| main.rs:128:16:128:16 | a | main.rs:98:22:98:27 | ...: i64 | provenance |  |
+| main.rs:133:9:133:9 | a | main.rs:134:29:134:29 | a | provenance |  |
+| main.rs:133:13:133:21 | source(...) | main.rs:133:9:133:9 | a | provenance |  |
+| main.rs:134:9:134:9 | b | main.rs:135:10:135:10 | b | provenance |  |
+| main.rs:134:13:134:30 | mn.data_through(...) | main.rs:134:9:134:9 | b | provenance |  |
+| main.rs:134:29:134:29 | a | main.rs:110:27:110:32 | ...: i64 | provenance |  |
+| main.rs:134:29:134:29 | a | main.rs:134:13:134:30 | mn.data_through(...) | provenance |  |
+| main.rs:140:9:140:9 | a | main.rs:141:25:141:25 | a | provenance |  |
+| main.rs:140:13:140:21 | source(...) | main.rs:140:9:140:9 | a | provenance |  |
+| main.rs:141:25:141:25 | a | main.rs:98:22:98:27 | ...: i64 | provenance |  |
+| main.rs:146:9:146:9 | a | main.rs:147:38:147:38 | a | provenance |  |
+| main.rs:146:13:146:22 | source(...) | main.rs:146:9:146:9 | a | provenance |  |
+| main.rs:147:9:147:9 | b | main.rs:148:10:148:10 | b | provenance |  |
+| main.rs:147:13:147:39 | ...::data_through(...) | main.rs:147:9:147:9 | b | provenance |  |
+| main.rs:147:38:147:38 | a | main.rs:110:27:110:32 | ...: i64 | provenance |  |
+| main.rs:147:38:147:38 | a | main.rs:147:13:147:39 | ...::data_through(...) | provenance |  |
+| main.rs:159:12:159:17 | ...: i64 | main.rs:160:24:160:24 | n | provenance |  |
+| main.rs:160:9:160:26 | MyInt {...} [MyInt] | main.rs:159:28:161:5 | { ... } [MyInt] | provenance |  |
+| main.rs:160:24:160:24 | n | main.rs:160:9:160:26 | MyInt {...} [MyInt] | provenance |  |
+| main.rs:165:9:165:9 | n [MyInt] | main.rs:166:9:166:26 | MyInt {...} [MyInt] | provenance |  |
+| main.rs:165:13:165:34 | ...::new(...) [MyInt] | main.rs:165:9:165:9 | n [MyInt] | provenance |  |
+| main.rs:165:24:165:33 | source(...) | main.rs:159:12:159:17 | ...: i64 | provenance |  |
+| main.rs:165:24:165:33 | source(...) | main.rs:165:13:165:34 | ...::new(...) [MyInt] | provenance |  |
+| main.rs:166:9:166:26 | MyInt {...} [MyInt] | main.rs:166:24:166:24 | m | provenance |  |
+| main.rs:166:24:166:24 | m | main.rs:167:10:167:10 | m | provenance |  |
+| main.rs:173:12:173:15 | SelfParam [MyInt] | main.rs:175:24:175:27 | self [MyInt] | provenance |  |
+| main.rs:175:9:175:35 | MyInt {...} [MyInt] | main.rs:173:42:176:5 | { ... } [MyInt] | provenance |  |
+| main.rs:175:24:175:27 | self [MyInt] | main.rs:175:24:175:33 | self.value | provenance |  |
+| main.rs:175:24:175:33 | self.value | main.rs:175:9:175:35 | MyInt {...} [MyInt] | provenance |  |
+| main.rs:195:9:195:9 | a [MyInt] | main.rs:197:13:197:13 | a [MyInt] | provenance |  |
+| main.rs:195:13:195:38 | MyInt {...} [MyInt] | main.rs:195:9:195:9 | a [MyInt] | provenance |  |
+| main.rs:195:28:195:36 | source(...) | main.rs:195:13:195:38 | MyInt {...} [MyInt] | provenance |  |
+| main.rs:197:9:197:9 | c [MyInt] | main.rs:198:10:198:10 | c [MyInt] | provenance |  |
+| main.rs:197:13:197:13 | a [MyInt] | main.rs:173:12:173:15 | SelfParam [MyInt] | provenance |  |
+| main.rs:197:13:197:13 | a [MyInt] | main.rs:197:13:197:17 | ... + ... [MyInt] | provenance |  |
+| main.rs:197:13:197:17 | ... + ... [MyInt] | main.rs:197:9:197:9 | c [MyInt] | provenance |  |
+| main.rs:198:10:198:10 | c [MyInt] | main.rs:198:10:198:16 | c.value | provenance |  |
+| main.rs:205:9:205:9 | a [MyInt] | main.rs:173:12:173:15 | SelfParam [MyInt] | provenance |  |
+| main.rs:205:9:205:9 | a [MyInt] | main.rs:207:13:207:20 | a.add(...) [MyInt] | provenance |  |
+| main.rs:205:13:205:38 | MyInt {...} [MyInt] | main.rs:205:9:205:9 | a [MyInt] | provenance |  |
+| main.rs:205:28:205:36 | source(...) | main.rs:205:13:205:38 | MyInt {...} [MyInt] | provenance |  |
+| main.rs:207:9:207:9 | d [MyInt] | main.rs:208:10:208:10 | d [MyInt] | provenance |  |
+| main.rs:207:13:207:20 | a.add(...) [MyInt] | main.rs:207:9:207:9 | d [MyInt] | provenance |  |
+| main.rs:208:10:208:10 | d [MyInt] | main.rs:208:10:208:16 | d.value | provenance |  |
+| main.rs:242:18:242:21 | SelfParam [MyInt] | main.rs:242:48:244:5 | { ... } [MyInt] | provenance |  |
+| main.rs:246:26:246:37 | ...: MyInt [MyInt] | main.rs:246:49:248:5 | { ... } [MyInt] | provenance |  |
+| main.rs:252:9:252:9 | a [MyInt] | main.rs:254:49:254:49 | a [MyInt] | provenance |  |
+| main.rs:252:13:252:38 | MyInt {...} [MyInt] | main.rs:252:9:252:9 | a [MyInt] | provenance |  |
+| main.rs:252:28:252:36 | source(...) | main.rs:252:13:252:38 | MyInt {...} [MyInt] | provenance |  |
+| main.rs:254:9:254:26 | MyInt {...} [MyInt] | main.rs:254:24:254:24 | c | provenance |  |
+| main.rs:254:24:254:24 | c | main.rs:255:10:255:10 | c | provenance |  |
+| main.rs:254:30:254:53 | ...::take_self(...) [MyInt] | main.rs:254:9:254:26 | MyInt {...} [MyInt] | provenance |  |
+| main.rs:254:49:254:49 | a [MyInt] | main.rs:242:18:242:21 | SelfParam [MyInt] | provenance |  |
+| main.rs:254:49:254:49 | a [MyInt] | main.rs:254:30:254:53 | ...::take_self(...) [MyInt] | provenance |  |
+| main.rs:258:9:258:9 | b [MyInt] | main.rs:259:54:259:54 | b [MyInt] | provenance |  |
+| main.rs:258:13:258:39 | MyInt {...} [MyInt] | main.rs:258:9:258:9 | b [MyInt] | provenance |  |
+| main.rs:258:28:258:37 | source(...) | main.rs:258:13:258:39 | MyInt {...} [MyInt] | provenance |  |
+| main.rs:259:9:259:26 | MyInt {...} [MyInt] | main.rs:259:24:259:24 | c | provenance |  |
+| main.rs:259:24:259:24 | c | main.rs:260:10:260:10 | c | provenance |  |
+| main.rs:259:30:259:55 | ...::take_second(...) [MyInt] | main.rs:259:9:259:26 | MyInt {...} [MyInt] | provenance |  |
+| main.rs:259:54:259:54 | b [MyInt] | main.rs:246:26:246:37 | ...: MyInt [MyInt] | provenance |  |
+| main.rs:259:54:259:54 | b [MyInt] | main.rs:259:30:259:55 | ...::take_second(...) [MyInt] | provenance |  |
+| main.rs:268:32:272:1 | { ... } | main.rs:287:41:287:54 | async_source(...) | provenance |  |
+| main.rs:269:9:269:9 | a | main.rs:268:32:272:1 | { ... } | provenance |  |
+| main.rs:269:9:269:9 | a | main.rs:270:10:270:10 | a | provenance |  |
+| main.rs:269:13:269:21 | source(...) | main.rs:269:9:269:9 | a | provenance |  |
+| main.rs:279:13:279:13 | c | main.rs:280:14:280:14 | c | provenance |  |
+| main.rs:279:17:279:25 | source(...) | main.rs:279:13:279:13 | c | provenance |  |
+| main.rs:287:9:287:9 | a | main.rs:288:10:288:10 | a | provenance |  |
+| main.rs:287:13:287:55 | ...::block_on(...) | main.rs:287:9:287:9 | a | provenance |  |
+| main.rs:287:41:287:54 | async_source(...) | main.rs:287:13:287:55 | ...::block_on(...) | provenance | MaD:1 |
 nodes
 | main.rs:12:28:14:1 | { ... } | semmle.label | { ... } |
 | main.rs:13:5:13:13 | source(...) | semmle.label | source(...) |
@@ -140,149 +148,159 @@ nodes
 | main.rs:38:23:38:31 | source(...) | semmle.label | source(...) |
 | main.rs:39:10:39:10 | a [MyStruct] | semmle.label | a [MyStruct] |
 | main.rs:39:10:39:21 | a.get_data() | semmle.label | a.get_data() |
-| main.rs:44:12:44:17 | [post] &mut a [&ref, MyStruct] | semmle.label | [post] &mut a [&ref, MyStruct] |
-| main.rs:44:17:44:17 | [post] a [MyStruct] | semmle.label | [post] a [MyStruct] |
-| main.rs:44:30:44:38 | source(...) | semmle.label | source(...) |
-| main.rs:45:10:45:10 | a [MyStruct] | semmle.label | a [MyStruct] |
-| main.rs:45:10:45:21 | a.get_data() | semmle.label | a.get_data() |
-| main.rs:48:12:48:17 | ...: i64 | semmle.label | ...: i64 |
-| main.rs:49:10:49:10 | n | semmle.label | n |
-| main.rs:53:9:53:9 | a | semmle.label | a |
-| main.rs:53:13:53:21 | source(...) | semmle.label | source(...) |
-| main.rs:54:13:54:13 | a | semmle.label | a |
-| main.rs:57:17:57:22 | ...: i64 | semmle.label | ...: i64 |
-| main.rs:57:32:59:1 | { ... } | semmle.label | { ... } |
-| main.rs:62:9:62:9 | a | semmle.label | a |
-| main.rs:62:13:62:21 | source(...) | semmle.label | source(...) |
-| main.rs:63:9:63:9 | b | semmle.label | b |
-| main.rs:63:13:63:27 | pass_through(...) | semmle.label | pass_through(...) |
-| main.rs:63:26:63:26 | a | semmle.label | a |
-| main.rs:64:10:64:10 | b | semmle.label | b |
-| main.rs:68:9:68:9 | a | semmle.label | a |
-| main.rs:68:13:71:6 | pass_through(...) | semmle.label | pass_through(...) |
-| main.rs:68:26:71:5 | { ... } | semmle.label | { ... } |
-| main.rs:70:9:70:18 | source(...) | semmle.label | source(...) |
-| main.rs:72:10:72:10 | a | semmle.label | a |
-| main.rs:76:9:76:9 | a | semmle.label | a |
-| main.rs:76:13:76:22 | source(...) | semmle.label | source(...) |
-| main.rs:78:21:78:26 | ...: i64 | semmle.label | ...: i64 |
-| main.rs:78:36:80:5 | { ... } | semmle.label | { ... } |
-| main.rs:82:9:82:9 | b | semmle.label | b |
-| main.rs:82:13:82:27 | pass_through(...) | semmle.label | pass_through(...) |
-| main.rs:82:26:82:26 | a | semmle.label | a |
-| main.rs:83:10:83:10 | b | semmle.label | b |
-| main.rs:94:22:94:27 | ...: i64 | semmle.label | ...: i64 |
-| main.rs:95:14:95:14 | n | semmle.label | n |
-| main.rs:98:30:104:5 | { ... } | semmle.label | { ... } |
-| main.rs:102:13:102:21 | source(...) | semmle.label | source(...) |
-| main.rs:106:27:106:32 | ...: i64 | semmle.label | ...: i64 |
-| main.rs:106:42:112:5 | { ... } | semmle.label | { ... } |
-| main.rs:117:9:117:9 | a | semmle.label | a |
-| main.rs:117:13:117:25 | mn.get_data() | semmle.label | mn.get_data() |
-| main.rs:118:10:118:10 | a | semmle.label | a |
-| main.rs:123:9:123:9 | a | semmle.label | a |
-| main.rs:123:13:123:21 | source(...) | semmle.label | source(...) |
-| main.rs:124:16:124:16 | a | semmle.label | a |
-| main.rs:129:9:129:9 | a | semmle.label | a |
-| main.rs:129:13:129:21 | source(...) | semmle.label | source(...) |
-| main.rs:130:9:130:9 | b | semmle.label | b |
-| main.rs:130:13:130:30 | mn.data_through(...) | semmle.label | mn.data_through(...) |
-| main.rs:130:29:130:29 | a | semmle.label | a |
-| main.rs:131:10:131:10 | b | semmle.label | b |
-| main.rs:136:9:136:9 | a | semmle.label | a |
-| main.rs:136:13:136:21 | source(...) | semmle.label | source(...) |
-| main.rs:137:25:137:25 | a | semmle.label | a |
-| main.rs:142:9:142:9 | a | semmle.label | a |
-| main.rs:142:13:142:22 | source(...) | semmle.label | source(...) |
-| main.rs:143:9:143:9 | b | semmle.label | b |
-| main.rs:143:13:143:39 | ...::data_through(...) | semmle.label | ...::data_through(...) |
-| main.rs:143:38:143:38 | a | semmle.label | a |
-| main.rs:144:10:144:10 | b | semmle.label | b |
-| main.rs:155:12:155:17 | ...: i64 | semmle.label | ...: i64 |
-| main.rs:155:28:157:5 | { ... } [MyInt] | semmle.label | { ... } [MyInt] |
-| main.rs:156:9:156:26 | MyInt {...} [MyInt] | semmle.label | MyInt {...} [MyInt] |
-| main.rs:156:24:156:24 | n | semmle.label | n |
-| main.rs:161:9:161:9 | n [MyInt] | semmle.label | n [MyInt] |
-| main.rs:161:13:161:34 | ...::new(...) [MyInt] | semmle.label | ...::new(...) [MyInt] |
-| main.rs:161:24:161:33 | source(...) | semmle.label | source(...) |
-| main.rs:162:9:162:26 | MyInt {...} [MyInt] | semmle.label | MyInt {...} [MyInt] |
-| main.rs:162:24:162:24 | m | semmle.label | m |
-| main.rs:163:10:163:10 | m | semmle.label | m |
-| main.rs:169:12:169:15 | SelfParam [MyInt] | semmle.label | SelfParam [MyInt] |
-| main.rs:169:42:172:5 | { ... } [MyInt] | semmle.label | { ... } [MyInt] |
-| main.rs:171:9:171:35 | MyInt {...} [MyInt] | semmle.label | MyInt {...} [MyInt] |
-| main.rs:171:24:171:27 | self [MyInt] | semmle.label | self [MyInt] |
-| main.rs:171:24:171:33 | self.value | semmle.label | self.value |
-| main.rs:186:9:186:9 | a [MyInt] | semmle.label | a [MyInt] |
-| main.rs:186:13:186:38 | MyInt {...} [MyInt] | semmle.label | MyInt {...} [MyInt] |
-| main.rs:186:28:186:36 | source(...) | semmle.label | source(...) |
-| main.rs:188:9:188:9 | d [MyInt] | semmle.label | d [MyInt] |
-| main.rs:188:13:188:20 | a.add(...) [MyInt] | semmle.label | a.add(...) [MyInt] |
-| main.rs:189:10:189:10 | d [MyInt] | semmle.label | d [MyInt] |
-| main.rs:189:10:189:16 | d.value | semmle.label | d.value |
-| main.rs:201:18:201:21 | SelfParam [MyInt] | semmle.label | SelfParam [MyInt] |
-| main.rs:201:48:203:5 | { ... } [MyInt] | semmle.label | { ... } [MyInt] |
-| main.rs:205:26:205:37 | ...: MyInt [MyInt] | semmle.label | ...: MyInt [MyInt] |
-| main.rs:205:49:207:5 | { ... } [MyInt] | semmle.label | { ... } [MyInt] |
-| main.rs:211:9:211:9 | a [MyInt] | semmle.label | a [MyInt] |
-| main.rs:211:13:211:38 | MyInt {...} [MyInt] | semmle.label | MyInt {...} [MyInt] |
-| main.rs:211:28:211:36 | source(...) | semmle.label | source(...) |
-| main.rs:213:9:213:26 | MyInt {...} [MyInt] | semmle.label | MyInt {...} [MyInt] |
-| main.rs:213:24:213:24 | c | semmle.label | c |
-| main.rs:213:30:213:53 | ...::take_self(...) [MyInt] | semmle.label | ...::take_self(...) [MyInt] |
-| main.rs:213:49:213:49 | a [MyInt] | semmle.label | a [MyInt] |
-| main.rs:214:10:214:10 | c | semmle.label | c |
-| main.rs:217:9:217:9 | b [MyInt] | semmle.label | b [MyInt] |
-| main.rs:217:13:217:39 | MyInt {...} [MyInt] | semmle.label | MyInt {...} [MyInt] |
-| main.rs:217:28:217:37 | source(...) | semmle.label | source(...) |
-| main.rs:218:9:218:26 | MyInt {...} [MyInt] | semmle.label | MyInt {...} [MyInt] |
-| main.rs:218:24:218:24 | c | semmle.label | c |
-| main.rs:218:30:218:55 | ...::take_second(...) [MyInt] | semmle.label | ...::take_second(...) [MyInt] |
-| main.rs:218:54:218:54 | b [MyInt] | semmle.label | b [MyInt] |
-| main.rs:219:10:219:10 | c | semmle.label | c |
-| main.rs:227:32:231:1 | { ... } | semmle.label | { ... } |
-| main.rs:228:9:228:9 | a | semmle.label | a |
-| main.rs:228:13:228:21 | source(...) | semmle.label | source(...) |
-| main.rs:229:10:229:10 | a | semmle.label | a |
-| main.rs:238:13:238:13 | c | semmle.label | c |
-| main.rs:238:17:238:25 | source(...) | semmle.label | source(...) |
-| main.rs:239:14:239:14 | c | semmle.label | c |
-| main.rs:246:9:246:9 | a | semmle.label | a |
-| main.rs:246:13:246:55 | ...::block_on(...) | semmle.label | ...::block_on(...) |
-| main.rs:246:41:246:54 | async_source(...) | semmle.label | async_source(...) |
-| main.rs:247:10:247:10 | a | semmle.label | a |
+| main.rs:46:9:46:14 | [post] &mut a [&ref, MyStruct] | semmle.label | [post] &mut a [&ref, MyStruct] |
+| main.rs:46:14:46:14 | [post] a [MyStruct] | semmle.label | [post] a [MyStruct] |
+| main.rs:48:15:48:23 | source(...) | semmle.label | source(...) |
+| main.rs:49:10:49:10 | a [MyStruct] | semmle.label | a [MyStruct] |
+| main.rs:49:10:49:21 | a.get_data() | semmle.label | a.get_data() |
+| main.rs:52:12:52:17 | ...: i64 | semmle.label | ...: i64 |
+| main.rs:53:10:53:10 | n | semmle.label | n |
+| main.rs:57:9:57:9 | a | semmle.label | a |
+| main.rs:57:13:57:21 | source(...) | semmle.label | source(...) |
+| main.rs:58:13:58:13 | a | semmle.label | a |
+| main.rs:61:17:61:22 | ...: i64 | semmle.label | ...: i64 |
+| main.rs:61:32:63:1 | { ... } | semmle.label | { ... } |
+| main.rs:66:9:66:9 | a | semmle.label | a |
+| main.rs:66:13:66:21 | source(...) | semmle.label | source(...) |
+| main.rs:67:9:67:9 | b | semmle.label | b |
+| main.rs:67:13:67:27 | pass_through(...) | semmle.label | pass_through(...) |
+| main.rs:67:26:67:26 | a | semmle.label | a |
+| main.rs:68:10:68:10 | b | semmle.label | b |
+| main.rs:72:9:72:9 | a | semmle.label | a |
+| main.rs:72:13:75:6 | pass_through(...) | semmle.label | pass_through(...) |
+| main.rs:72:26:75:5 | { ... } | semmle.label | { ... } |
+| main.rs:74:9:74:18 | source(...) | semmle.label | source(...) |
+| main.rs:76:10:76:10 | a | semmle.label | a |
+| main.rs:80:9:80:9 | a | semmle.label | a |
+| main.rs:80:13:80:22 | source(...) | semmle.label | source(...) |
+| main.rs:82:21:82:26 | ...: i64 | semmle.label | ...: i64 |
+| main.rs:82:36:84:5 | { ... } | semmle.label | { ... } |
+| main.rs:86:9:86:9 | b | semmle.label | b |
+| main.rs:86:13:86:27 | pass_through(...) | semmle.label | pass_through(...) |
+| main.rs:86:26:86:26 | a | semmle.label | a |
+| main.rs:87:10:87:10 | b | semmle.label | b |
+| main.rs:98:22:98:27 | ...: i64 | semmle.label | ...: i64 |
+| main.rs:99:14:99:14 | n | semmle.label | n |
+| main.rs:102:30:108:5 | { ... } | semmle.label | { ... } |
+| main.rs:106:13:106:21 | source(...) | semmle.label | source(...) |
+| main.rs:110:27:110:32 | ...: i64 | semmle.label | ...: i64 |
+| main.rs:110:42:116:5 | { ... } | semmle.label | { ... } |
+| main.rs:121:9:121:9 | a | semmle.label | a |
+| main.rs:121:13:121:25 | mn.get_data() | semmle.label | mn.get_data() |
+| main.rs:122:10:122:10 | a | semmle.label | a |
+| main.rs:127:9:127:9 | a | semmle.label | a |
+| main.rs:127:13:127:21 | source(...) | semmle.label | source(...) |
+| main.rs:128:16:128:16 | a | semmle.label | a |
+| main.rs:133:9:133:9 | a | semmle.label | a |
+| main.rs:133:13:133:21 | source(...) | semmle.label | source(...) |
+| main.rs:134:9:134:9 | b | semmle.label | b |
+| main.rs:134:13:134:30 | mn.data_through(...) | semmle.label | mn.data_through(...) |
+| main.rs:134:29:134:29 | a | semmle.label | a |
+| main.rs:135:10:135:10 | b | semmle.label | b |
+| main.rs:140:9:140:9 | a | semmle.label | a |
+| main.rs:140:13:140:21 | source(...) | semmle.label | source(...) |
+| main.rs:141:25:141:25 | a | semmle.label | a |
+| main.rs:146:9:146:9 | a | semmle.label | a |
+| main.rs:146:13:146:22 | source(...) | semmle.label | source(...) |
+| main.rs:147:9:147:9 | b | semmle.label | b |
+| main.rs:147:13:147:39 | ...::data_through(...) | semmle.label | ...::data_through(...) |
+| main.rs:147:38:147:38 | a | semmle.label | a |
+| main.rs:148:10:148:10 | b | semmle.label | b |
+| main.rs:159:12:159:17 | ...: i64 | semmle.label | ...: i64 |
+| main.rs:159:28:161:5 | { ... } [MyInt] | semmle.label | { ... } [MyInt] |
+| main.rs:160:9:160:26 | MyInt {...} [MyInt] | semmle.label | MyInt {...} [MyInt] |
+| main.rs:160:24:160:24 | n | semmle.label | n |
+| main.rs:165:9:165:9 | n [MyInt] | semmle.label | n [MyInt] |
+| main.rs:165:13:165:34 | ...::new(...) [MyInt] | semmle.label | ...::new(...) [MyInt] |
+| main.rs:165:24:165:33 | source(...) | semmle.label | source(...) |
+| main.rs:166:9:166:26 | MyInt {...} [MyInt] | semmle.label | MyInt {...} [MyInt] |
+| main.rs:166:24:166:24 | m | semmle.label | m |
+| main.rs:167:10:167:10 | m | semmle.label | m |
+| main.rs:173:12:173:15 | SelfParam [MyInt] | semmle.label | SelfParam [MyInt] |
+| main.rs:173:42:176:5 | { ... } [MyInt] | semmle.label | { ... } [MyInt] |
+| main.rs:175:9:175:35 | MyInt {...} [MyInt] | semmle.label | MyInt {...} [MyInt] |
+| main.rs:175:24:175:27 | self [MyInt] | semmle.label | self [MyInt] |
+| main.rs:175:24:175:33 | self.value | semmle.label | self.value |
+| main.rs:195:9:195:9 | a [MyInt] | semmle.label | a [MyInt] |
+| main.rs:195:13:195:38 | MyInt {...} [MyInt] | semmle.label | MyInt {...} [MyInt] |
+| main.rs:195:28:195:36 | source(...) | semmle.label | source(...) |
+| main.rs:197:9:197:9 | c [MyInt] | semmle.label | c [MyInt] |
+| main.rs:197:13:197:13 | a [MyInt] | semmle.label | a [MyInt] |
+| main.rs:197:13:197:17 | ... + ... [MyInt] | semmle.label | ... + ... [MyInt] |
+| main.rs:198:10:198:10 | c [MyInt] | semmle.label | c [MyInt] |
+| main.rs:198:10:198:16 | c.value | semmle.label | c.value |
+| main.rs:205:9:205:9 | a [MyInt] | semmle.label | a [MyInt] |
+| main.rs:205:13:205:38 | MyInt {...} [MyInt] | semmle.label | MyInt {...} [MyInt] |
+| main.rs:205:28:205:36 | source(...) | semmle.label | source(...) |
+| main.rs:207:9:207:9 | d [MyInt] | semmle.label | d [MyInt] |
+| main.rs:207:13:207:20 | a.add(...) [MyInt] | semmle.label | a.add(...) [MyInt] |
+| main.rs:208:10:208:10 | d [MyInt] | semmle.label | d [MyInt] |
+| main.rs:208:10:208:16 | d.value | semmle.label | d.value |
+| main.rs:242:18:242:21 | SelfParam [MyInt] | semmle.label | SelfParam [MyInt] |
+| main.rs:242:48:244:5 | { ... } [MyInt] | semmle.label | { ... } [MyInt] |
+| main.rs:246:26:246:37 | ...: MyInt [MyInt] | semmle.label | ...: MyInt [MyInt] |
+| main.rs:246:49:248:5 | { ... } [MyInt] | semmle.label | { ... } [MyInt] |
+| main.rs:252:9:252:9 | a [MyInt] | semmle.label | a [MyInt] |
+| main.rs:252:13:252:38 | MyInt {...} [MyInt] | semmle.label | MyInt {...} [MyInt] |
+| main.rs:252:28:252:36 | source(...) | semmle.label | source(...) |
+| main.rs:254:9:254:26 | MyInt {...} [MyInt] | semmle.label | MyInt {...} [MyInt] |
+| main.rs:254:24:254:24 | c | semmle.label | c |
+| main.rs:254:30:254:53 | ...::take_self(...) [MyInt] | semmle.label | ...::take_self(...) [MyInt] |
+| main.rs:254:49:254:49 | a [MyInt] | semmle.label | a [MyInt] |
+| main.rs:255:10:255:10 | c | semmle.label | c |
+| main.rs:258:9:258:9 | b [MyInt] | semmle.label | b [MyInt] |
+| main.rs:258:13:258:39 | MyInt {...} [MyInt] | semmle.label | MyInt {...} [MyInt] |
+| main.rs:258:28:258:37 | source(...) | semmle.label | source(...) |
+| main.rs:259:9:259:26 | MyInt {...} [MyInt] | semmle.label | MyInt {...} [MyInt] |
+| main.rs:259:24:259:24 | c | semmle.label | c |
+| main.rs:259:30:259:55 | ...::take_second(...) [MyInt] | semmle.label | ...::take_second(...) [MyInt] |
+| main.rs:259:54:259:54 | b [MyInt] | semmle.label | b [MyInt] |
+| main.rs:260:10:260:10 | c | semmle.label | c |
+| main.rs:268:32:272:1 | { ... } | semmle.label | { ... } |
+| main.rs:269:9:269:9 | a | semmle.label | a |
+| main.rs:269:13:269:21 | source(...) | semmle.label | source(...) |
+| main.rs:270:10:270:10 | a | semmle.label | a |
+| main.rs:279:13:279:13 | c | semmle.label | c |
+| main.rs:279:17:279:25 | source(...) | semmle.label | source(...) |
+| main.rs:280:14:280:14 | c | semmle.label | c |
+| main.rs:287:9:287:9 | a | semmle.label | a |
+| main.rs:287:13:287:55 | ...::block_on(...) | semmle.label | ...::block_on(...) |
+| main.rs:287:41:287:54 | async_source(...) | semmle.label | async_source(...) |
+| main.rs:288:10:288:10 | a | semmle.label | a |
 subpaths
 | main.rs:38:23:38:31 | source(...) | main.rs:26:28:26:33 | ...: i64 | main.rs:26:17:26:25 | SelfParam [Return] [&ref, MyStruct] | main.rs:38:6:38:11 | [post] &mut a [&ref, MyStruct] |
 | main.rs:39:10:39:10 | a [MyStruct] | main.rs:30:17:30:21 | SelfParam [&ref, MyStruct] | main.rs:30:31:32:5 | { ... } | main.rs:39:10:39:21 | a.get_data() |
-| main.rs:44:30:44:38 | source(...) | main.rs:26:28:26:33 | ...: i64 | main.rs:26:17:26:25 | SelfParam [Return] [&ref, MyStruct] | main.rs:44:12:44:17 | [post] &mut a [&ref, MyStruct] |
-| main.rs:45:10:45:10 | a [MyStruct] | main.rs:30:17:30:21 | SelfParam [&ref, MyStruct] | main.rs:30:31:32:5 | { ... } | main.rs:45:10:45:21 | a.get_data() |
-| main.rs:63:26:63:26 | a | main.rs:57:17:57:22 | ...: i64 | main.rs:57:32:59:1 | { ... } | main.rs:63:13:63:27 | pass_through(...) |
-| main.rs:68:26:71:5 | { ... } | main.rs:57:17:57:22 | ...: i64 | main.rs:57:32:59:1 | { ... } | main.rs:68:13:71:6 | pass_through(...) |
-| main.rs:82:26:82:26 | a | main.rs:78:21:78:26 | ...: i64 | main.rs:78:36:80:5 | { ... } | main.rs:82:13:82:27 | pass_through(...) |
-| main.rs:130:29:130:29 | a | main.rs:106:27:106:32 | ...: i64 | main.rs:106:42:112:5 | { ... } | main.rs:130:13:130:30 | mn.data_through(...) |
-| main.rs:143:38:143:38 | a | main.rs:106:27:106:32 | ...: i64 | main.rs:106:42:112:5 | { ... } | main.rs:143:13:143:39 | ...::data_through(...) |
-| main.rs:161:24:161:33 | source(...) | main.rs:155:12:155:17 | ...: i64 | main.rs:155:28:157:5 | { ... } [MyInt] | main.rs:161:13:161:34 | ...::new(...) [MyInt] |
-| main.rs:186:9:186:9 | a [MyInt] | main.rs:169:12:169:15 | SelfParam [MyInt] | main.rs:169:42:172:5 | { ... } [MyInt] | main.rs:188:13:188:20 | a.add(...) [MyInt] |
-| main.rs:213:49:213:49 | a [MyInt] | main.rs:201:18:201:21 | SelfParam [MyInt] | main.rs:201:48:203:5 | { ... } [MyInt] | main.rs:213:30:213:53 | ...::take_self(...) [MyInt] |
-| main.rs:218:54:218:54 | b [MyInt] | main.rs:205:26:205:37 | ...: MyInt [MyInt] | main.rs:205:49:207:5 | { ... } [MyInt] | main.rs:218:30:218:55 | ...::take_second(...) [MyInt] |
+| main.rs:48:15:48:23 | source(...) | main.rs:26:28:26:33 | ...: i64 | main.rs:26:17:26:25 | SelfParam [Return] [&ref, MyStruct] | main.rs:46:9:46:14 | [post] &mut a [&ref, MyStruct] |
+| main.rs:49:10:49:10 | a [MyStruct] | main.rs:30:17:30:21 | SelfParam [&ref, MyStruct] | main.rs:30:31:32:5 | { ... } | main.rs:49:10:49:21 | a.get_data() |
+| main.rs:67:26:67:26 | a | main.rs:61:17:61:22 | ...: i64 | main.rs:61:32:63:1 | { ... } | main.rs:67:13:67:27 | pass_through(...) |
+| main.rs:72:26:75:5 | { ... } | main.rs:61:17:61:22 | ...: i64 | main.rs:61:32:63:1 | { ... } | main.rs:72:13:75:6 | pass_through(...) |
+| main.rs:86:26:86:26 | a | main.rs:82:21:82:26 | ...: i64 | main.rs:82:36:84:5 | { ... } | main.rs:86:13:86:27 | pass_through(...) |
+| main.rs:134:29:134:29 | a | main.rs:110:27:110:32 | ...: i64 | main.rs:110:42:116:5 | { ... } | main.rs:134:13:134:30 | mn.data_through(...) |
+| main.rs:147:38:147:38 | a | main.rs:110:27:110:32 | ...: i64 | main.rs:110:42:116:5 | { ... } | main.rs:147:13:147:39 | ...::data_through(...) |
+| main.rs:165:24:165:33 | source(...) | main.rs:159:12:159:17 | ...: i64 | main.rs:159:28:161:5 | { ... } [MyInt] | main.rs:165:13:165:34 | ...::new(...) [MyInt] |
+| main.rs:197:13:197:13 | a [MyInt] | main.rs:173:12:173:15 | SelfParam [MyInt] | main.rs:173:42:176:5 | { ... } [MyInt] | main.rs:197:13:197:17 | ... + ... [MyInt] |
+| main.rs:205:9:205:9 | a [MyInt] | main.rs:173:12:173:15 | SelfParam [MyInt] | main.rs:173:42:176:5 | { ... } [MyInt] | main.rs:207:13:207:20 | a.add(...) [MyInt] |
+| main.rs:254:49:254:49 | a [MyInt] | main.rs:242:18:242:21 | SelfParam [MyInt] | main.rs:242:48:244:5 | { ... } [MyInt] | main.rs:254:30:254:53 | ...::take_self(...) [MyInt] |
+| main.rs:259:54:259:54 | b [MyInt] | main.rs:246:26:246:37 | ...: MyInt [MyInt] | main.rs:246:49:248:5 | { ... } [MyInt] | main.rs:259:30:259:55 | ...::take_second(...) [MyInt] |
 testFailures
 #select
 | main.rs:18:10:18:10 | a | main.rs:13:5:13:13 | source(...) | main.rs:18:10:18:10 | a | $@ | main.rs:13:5:13:13 | source(...) | source(...) |
 | main.rs:39:10:39:21 | a.get_data() | main.rs:38:23:38:31 | source(...) | main.rs:39:10:39:21 | a.get_data() | $@ | main.rs:38:23:38:31 | source(...) | source(...) |
-| main.rs:45:10:45:21 | a.get_data() | main.rs:44:30:44:38 | source(...) | main.rs:45:10:45:21 | a.get_data() | $@ | main.rs:44:30:44:38 | source(...) | source(...) |
-| main.rs:49:10:49:10 | n | main.rs:53:13:53:21 | source(...) | main.rs:49:10:49:10 | n | $@ | main.rs:53:13:53:21 | source(...) | source(...) |
-| main.rs:64:10:64:10 | b | main.rs:62:13:62:21 | source(...) | main.rs:64:10:64:10 | b | $@ | main.rs:62:13:62:21 | source(...) | source(...) |
-| main.rs:72:10:72:10 | a | main.rs:70:9:70:18 | source(...) | main.rs:72:10:72:10 | a | $@ | main.rs:70:9:70:18 | source(...) | source(...) |
-| main.rs:83:10:83:10 | b | main.rs:76:13:76:22 | source(...) | main.rs:83:10:83:10 | b | $@ | main.rs:76:13:76:22 | source(...) | source(...) |
-| main.rs:95:14:95:14 | n | main.rs:123:13:123:21 | source(...) | main.rs:95:14:95:14 | n | $@ | main.rs:123:13:123:21 | source(...) | source(...) |
-| main.rs:95:14:95:14 | n | main.rs:136:13:136:21 | source(...) | main.rs:95:14:95:14 | n | $@ | main.rs:136:13:136:21 | source(...) | source(...) |
-| main.rs:118:10:118:10 | a | main.rs:102:13:102:21 | source(...) | main.rs:118:10:118:10 | a | $@ | main.rs:102:13:102:21 | source(...) | source(...) |
-| main.rs:131:10:131:10 | b | main.rs:129:13:129:21 | source(...) | main.rs:131:10:131:10 | b | $@ | main.rs:129:13:129:21 | source(...) | source(...) |
-| main.rs:144:10:144:10 | b | main.rs:142:13:142:22 | source(...) | main.rs:144:10:144:10 | b | $@ | main.rs:142:13:142:22 | source(...) | source(...) |
-| main.rs:163:10:163:10 | m | main.rs:161:24:161:33 | source(...) | main.rs:163:10:163:10 | m | $@ | main.rs:161:24:161:33 | source(...) | source(...) |
-| main.rs:189:10:189:16 | d.value | main.rs:186:28:186:36 | source(...) | main.rs:189:10:189:16 | d.value | $@ | main.rs:186:28:186:36 | source(...) | source(...) |
-| main.rs:214:10:214:10 | c | main.rs:211:28:211:36 | source(...) | main.rs:214:10:214:10 | c | $@ | main.rs:211:28:211:36 | source(...) | source(...) |
-| main.rs:219:10:219:10 | c | main.rs:217:28:217:37 | source(...) | main.rs:219:10:219:10 | c | $@ | main.rs:217:28:217:37 | source(...) | source(...) |
-| main.rs:229:10:229:10 | a | main.rs:228:13:228:21 | source(...) | main.rs:229:10:229:10 | a | $@ | main.rs:228:13:228:21 | source(...) | source(...) |
-| main.rs:239:14:239:14 | c | main.rs:238:17:238:25 | source(...) | main.rs:239:14:239:14 | c | $@ | main.rs:238:17:238:25 | source(...) | source(...) |
-| main.rs:247:10:247:10 | a | main.rs:228:13:228:21 | source(...) | main.rs:247:10:247:10 | a | $@ | main.rs:228:13:228:21 | source(...) | source(...) |
+| main.rs:49:10:49:21 | a.get_data() | main.rs:48:15:48:23 | source(...) | main.rs:49:10:49:21 | a.get_data() | $@ | main.rs:48:15:48:23 | source(...) | source(...) |
+| main.rs:53:10:53:10 | n | main.rs:57:13:57:21 | source(...) | main.rs:53:10:53:10 | n | $@ | main.rs:57:13:57:21 | source(...) | source(...) |
+| main.rs:68:10:68:10 | b | main.rs:66:13:66:21 | source(...) | main.rs:68:10:68:10 | b | $@ | main.rs:66:13:66:21 | source(...) | source(...) |
+| main.rs:76:10:76:10 | a | main.rs:74:9:74:18 | source(...) | main.rs:76:10:76:10 | a | $@ | main.rs:74:9:74:18 | source(...) | source(...) |
+| main.rs:87:10:87:10 | b | main.rs:80:13:80:22 | source(...) | main.rs:87:10:87:10 | b | $@ | main.rs:80:13:80:22 | source(...) | source(...) |
+| main.rs:99:14:99:14 | n | main.rs:127:13:127:21 | source(...) | main.rs:99:14:99:14 | n | $@ | main.rs:127:13:127:21 | source(...) | source(...) |
+| main.rs:99:14:99:14 | n | main.rs:140:13:140:21 | source(...) | main.rs:99:14:99:14 | n | $@ | main.rs:140:13:140:21 | source(...) | source(...) |
+| main.rs:122:10:122:10 | a | main.rs:106:13:106:21 | source(...) | main.rs:122:10:122:10 | a | $@ | main.rs:106:13:106:21 | source(...) | source(...) |
+| main.rs:135:10:135:10 | b | main.rs:133:13:133:21 | source(...) | main.rs:135:10:135:10 | b | $@ | main.rs:133:13:133:21 | source(...) | source(...) |
+| main.rs:148:10:148:10 | b | main.rs:146:13:146:22 | source(...) | main.rs:148:10:148:10 | b | $@ | main.rs:146:13:146:22 | source(...) | source(...) |
+| main.rs:167:10:167:10 | m | main.rs:165:24:165:33 | source(...) | main.rs:167:10:167:10 | m | $@ | main.rs:165:24:165:33 | source(...) | source(...) |
+| main.rs:198:10:198:16 | c.value | main.rs:195:28:195:36 | source(...) | main.rs:198:10:198:16 | c.value | $@ | main.rs:195:28:195:36 | source(...) | source(...) |
+| main.rs:208:10:208:16 | d.value | main.rs:205:28:205:36 | source(...) | main.rs:208:10:208:16 | d.value | $@ | main.rs:205:28:205:36 | source(...) | source(...) |
+| main.rs:255:10:255:10 | c | main.rs:252:28:252:36 | source(...) | main.rs:255:10:255:10 | c | $@ | main.rs:252:28:252:36 | source(...) | source(...) |
+| main.rs:260:10:260:10 | c | main.rs:258:28:258:37 | source(...) | main.rs:260:10:260:10 | c | $@ | main.rs:258:28:258:37 | source(...) | source(...) |
+| main.rs:270:10:270:10 | a | main.rs:269:13:269:21 | source(...) | main.rs:270:10:270:10 | a | $@ | main.rs:269:13:269:21 | source(...) | source(...) |
+| main.rs:280:14:280:14 | c | main.rs:279:17:279:25 | source(...) | main.rs:280:14:280:14 | c | $@ | main.rs:279:17:279:25 | source(...) | source(...) |
+| main.rs:288:10:288:10 | a | main.rs:269:13:269:21 | source(...) | main.rs:288:10:288:10 | a | $@ | main.rs:269:13:269:21 | source(...) | source(...) |
diff --git a/rust/ql/test/library-tests/dataflow/global/main.rs b/rust/ql/test/library-tests/dataflow/global/main.rs
index 507772692d6..6ca8f20f027 100644
--- a/rust/ql/test/library-tests/dataflow/global/main.rs
+++ b/rust/ql/test/library-tests/dataflow/global/main.rs
@@ -41,7 +41,11 @@ fn data_out_of_call_side_effect1() {
 
 fn data_out_of_call_side_effect2() {
     let mut a = MyStruct { data: 0 };
-    ({ 42; &mut a}).set_data(source(9));
+    ({
+        42;
+        &mut a
+    })
+    .set_data(source(9));
     sink(a.get_data()); // $ hasValueFlow=9
 }
 
@@ -144,7 +148,7 @@ fn data_through_method_called_as_function() {
     sink(b); // $ hasValueFlow=12
 }
 
-use std::ops::Add;
+use std::ops::{Add, Deref, MulAssign};
 
 struct MyInt {
     value: i64,
@@ -172,11 +176,26 @@ impl Add for MyInt {
     }
 }
 
+impl MulAssign<MyInt> for MyInt {
+    fn mul_assign(&mut self, rhs: MyInt) {
+        (*self).value = rhs.value; // todo: implicit deref not yet supported
+    }
+}
+
+impl Deref for MyInt {
+    type Target = i64;
+
+    fn deref(&self) -> &Self::Target {
+        &(*self).value
+    }
+}
+
 fn test_operator_overloading() {
+    // Tests for simple binary operator.
     let a = MyInt { value: source(5) };
     let b = MyInt { value: 2 };
     let c = a + b;
-    sink(c.value); // $ MISSING: hasValueFlow=5
+    sink(c.value); // $ hasValueFlow=5
 
     let a = MyInt { value: 2 };
     let b = MyInt { value: source(6) };
@@ -187,6 +206,28 @@ fn test_operator_overloading() {
     let b = MyInt { value: 2 };
     let d = a.add(b);
     sink(d.value); // $ hasValueFlow=7
+
+    // Tests for assignment operator.
+    let mut a = MyInt { value: 0 };
+    let b = MyInt { value: source(34) };
+    // The line below is what `*=` desugars to.
+    MulAssign::mul_assign(&mut a, b);
+    sink(a.value); // $ MISSING: hasValueFlow=34
+
+    let mut a = MyInt { value: 0 };
+    let b = MyInt { value: source(35) };
+    a *= b;
+    sink(a.value); // $ MISSING: hasValueFlow=35
+
+    // Tests for deref operator.
+    let a = MyInt { value: source(27) };
+    // The line below is what the prefix `*` desugars to.
+    let c = *Deref::deref(&a);
+    sink(c); // $ MISSING: hasValueFlow=27
+
+    let a = MyInt { value: source(28) };
+    let c = *a;
+    sink(c); // $ MISSING: hasValueFlow=28
 }
 
 trait MyTrait {
diff --git a/rust/ql/test/library-tests/dataflow/global/viableCallable.expected b/rust/ql/test/library-tests/dataflow/global/viableCallable.expected
index 63abc4c7f41..822ce4e0a32 100644
--- a/rust/ql/test/library-tests/dataflow/global/viableCallable.expected
+++ b/rust/ql/test/library-tests/dataflow/global/viableCallable.expected
@@ -7,75 +7,87 @@
 | main.rs:38:23:38:31 | source(...) | main.rs:1:1:3:1 | fn source |
 | main.rs:39:5:39:22 | sink(...) | main.rs:5:1:7:1 | fn sink |
 | main.rs:39:10:39:21 | a.get_data() | main.rs:30:5:32:5 | fn get_data |
-| main.rs:44:5:44:39 | ... .set_data(...) | main.rs:26:5:28:5 | fn set_data |
-| main.rs:44:30:44:38 | source(...) | main.rs:1:1:3:1 | fn source |
-| main.rs:45:5:45:22 | sink(...) | main.rs:5:1:7:1 | fn sink |
-| main.rs:45:10:45:21 | a.get_data() | main.rs:30:5:32:5 | fn get_data |
-| main.rs:49:5:49:11 | sink(...) | main.rs:5:1:7:1 | fn sink |
-| main.rs:53:13:53:21 | source(...) | main.rs:1:1:3:1 | fn source |
-| main.rs:54:5:54:14 | data_in(...) | main.rs:48:1:50:1 | fn data_in |
-| main.rs:62:13:62:21 | source(...) | main.rs:1:1:3:1 | fn source |
-| main.rs:63:13:63:27 | pass_through(...) | main.rs:57:1:59:1 | fn pass_through |
-| main.rs:64:5:64:11 | sink(...) | main.rs:5:1:7:1 | fn sink |
-| main.rs:68:13:71:6 | pass_through(...) | main.rs:57:1:59:1 | fn pass_through |
-| main.rs:70:9:70:18 | source(...) | main.rs:1:1:3:1 | fn source |
-| main.rs:72:5:72:11 | sink(...) | main.rs:5:1:7:1 | fn sink |
-| main.rs:76:13:76:22 | source(...) | main.rs:1:1:3:1 | fn source |
-| main.rs:82:13:82:27 | pass_through(...) | main.rs:78:5:80:5 | fn pass_through |
-| main.rs:83:5:83:11 | sink(...) | main.rs:5:1:7:1 | fn sink |
-| main.rs:95:9:95:15 | sink(...) | main.rs:5:1:7:1 | fn sink |
-| main.rs:102:13:102:21 | source(...) | main.rs:1:1:3:1 | fn source |
-| main.rs:117:13:117:25 | mn.get_data() | main.rs:98:5:104:5 | fn get_data |
-| main.rs:118:5:118:11 | sink(...) | main.rs:5:1:7:1 | fn sink |
-| main.rs:123:13:123:21 | source(...) | main.rs:1:1:3:1 | fn source |
-| main.rs:124:5:124:17 | mn.data_in(...) | main.rs:94:5:96:5 | fn data_in |
-| main.rs:129:13:129:21 | source(...) | main.rs:1:1:3:1 | fn source |
-| main.rs:130:13:130:30 | mn.data_through(...) | main.rs:106:5:112:5 | fn data_through |
-| main.rs:131:5:131:11 | sink(...) | main.rs:5:1:7:1 | fn sink |
-| main.rs:136:13:136:21 | source(...) | main.rs:1:1:3:1 | fn source |
-| main.rs:137:5:137:26 | ...::data_in(...) | main.rs:94:5:96:5 | fn data_in |
-| main.rs:142:13:142:22 | source(...) | main.rs:1:1:3:1 | fn source |
-| main.rs:143:13:143:39 | ...::data_through(...) | main.rs:106:5:112:5 | fn data_through |
-| main.rs:144:5:144:11 | sink(...) | main.rs:5:1:7:1 | fn sink |
-| main.rs:161:13:161:34 | ...::new(...) | main.rs:154:5:157:5 | fn new |
-| main.rs:161:24:161:33 | source(...) | main.rs:1:1:3:1 | fn source |
-| main.rs:163:5:163:11 | sink(...) | main.rs:5:1:7:1 | fn sink |
-| main.rs:176:28:176:36 | source(...) | main.rs:1:1:3:1 | fn source |
-| main.rs:179:5:179:17 | sink(...) | main.rs:5:1:7:1 | fn sink |
-| main.rs:182:28:182:36 | source(...) | main.rs:1:1:3:1 | fn source |
-| main.rs:184:5:184:17 | sink(...) | main.rs:5:1:7:1 | fn sink |
-| main.rs:186:28:186:36 | source(...) | main.rs:1:1:3:1 | fn source |
-| main.rs:188:13:188:20 | a.add(...) | main.rs:169:5:172:5 | fn add |
-| main.rs:189:5:189:17 | sink(...) | main.rs:5:1:7:1 | fn sink |
-| main.rs:211:28:211:36 | source(...) | main.rs:1:1:3:1 | fn source |
-| main.rs:213:30:213:53 | ...::take_self(...) | main.rs:201:5:203:5 | fn take_self |
-| main.rs:214:5:214:11 | sink(...) | main.rs:5:1:7:1 | fn sink |
-| main.rs:217:28:217:37 | source(...) | main.rs:1:1:3:1 | fn source |
-| main.rs:218:30:218:55 | ...::take_second(...) | main.rs:205:5:207:5 | fn take_second |
-| main.rs:219:5:219:11 | sink(...) | main.rs:5:1:7:1 | fn sink |
-| main.rs:222:28:222:37 | source(...) | main.rs:1:1:3:1 | fn source |
-| main.rs:223:30:223:53 | ...::take_self(...) | main.rs:201:5:203:5 | fn take_self |
-| main.rs:224:5:224:11 | sink(...) | main.rs:5:1:7:1 | fn sink |
-| main.rs:228:13:228:21 | source(...) | main.rs:1:1:3:1 | fn source |
-| main.rs:229:5:229:11 | sink(...) | main.rs:5:1:7:1 | fn sink |
-| main.rs:234:13:234:26 | async_source(...) | main.rs:227:1:231:1 | fn async_source |
-| main.rs:235:5:235:11 | sink(...) | main.rs:5:1:7:1 | fn sink |
-| main.rs:238:17:238:25 | source(...) | main.rs:1:1:3:1 | fn source |
-| main.rs:239:9:239:15 | sink(...) | main.rs:5:1:7:1 | fn sink |
-| main.rs:242:5:242:17 | sink(...) | main.rs:5:1:7:1 | fn sink |
-| main.rs:246:13:246:55 | ...::block_on(...) | file://:0:0:0:0 | repo:https://github.com/rust-lang/futures-rs:futures-executor::_::crate::local_pool::block_on |
-| main.rs:246:41:246:54 | async_source(...) | main.rs:227:1:231:1 | fn async_source |
-| main.rs:247:5:247:11 | sink(...) | main.rs:5:1:7:1 | fn sink |
-| main.rs:249:5:249:62 | ...::block_on(...) | file://:0:0:0:0 | repo:https://github.com/rust-lang/futures-rs:futures-executor::_::crate::local_pool::block_on |
-| main.rs:249:33:249:61 | test_async_await_async_part(...) | main.rs:233:1:243:1 | fn test_async_await_async_part |
-| main.rs:253:5:253:22 | data_out_of_call(...) | main.rs:16:1:19:1 | fn data_out_of_call |
-| main.rs:254:5:254:35 | data_out_of_call_side_effect1(...) | main.rs:35:1:40:1 | fn data_out_of_call_side_effect1 |
-| main.rs:255:5:255:35 | data_out_of_call_side_effect2(...) | main.rs:42:1:46:1 | fn data_out_of_call_side_effect2 |
-| main.rs:256:5:256:21 | data_in_to_call(...) | main.rs:52:1:55:1 | fn data_in_to_call |
-| main.rs:257:5:257:23 | data_through_call(...) | main.rs:61:1:65:1 | fn data_through_call |
-| main.rs:258:5:258:34 | data_through_nested_function(...) | main.rs:75:1:84:1 | fn data_through_nested_function |
-| main.rs:260:5:260:24 | data_out_of_method(...) | main.rs:115:1:119:1 | fn data_out_of_method |
-| main.rs:261:5:261:28 | data_in_to_method_call(...) | main.rs:121:1:125:1 | fn data_in_to_method_call |
-| main.rs:262:5:262:25 | data_through_method(...) | main.rs:127:1:132:1 | fn data_through_method |
-| main.rs:264:5:264:31 | test_operator_overloading(...) | main.rs:175:1:190:1 | fn test_operator_overloading |
-| main.rs:265:5:265:22 | test_async_await(...) | main.rs:245:1:250:1 | fn test_async_await |
+| main.rs:44:5:48:24 | ... .set_data(...) | main.rs:26:5:28:5 | fn set_data |
+| main.rs:48:15:48:23 | source(...) | main.rs:1:1:3:1 | fn source |
+| main.rs:49:5:49:22 | sink(...) | main.rs:5:1:7:1 | fn sink |
+| main.rs:49:10:49:21 | a.get_data() | main.rs:30:5:32:5 | fn get_data |
+| main.rs:53:5:53:11 | sink(...) | main.rs:5:1:7:1 | fn sink |
+| main.rs:57:13:57:21 | source(...) | main.rs:1:1:3:1 | fn source |
+| main.rs:58:5:58:14 | data_in(...) | main.rs:52:1:54:1 | fn data_in |
+| main.rs:66:13:66:21 | source(...) | main.rs:1:1:3:1 | fn source |
+| main.rs:67:13:67:27 | pass_through(...) | main.rs:61:1:63:1 | fn pass_through |
+| main.rs:68:5:68:11 | sink(...) | main.rs:5:1:7:1 | fn sink |
+| main.rs:72:13:75:6 | pass_through(...) | main.rs:61:1:63:1 | fn pass_through |
+| main.rs:74:9:74:18 | source(...) | main.rs:1:1:3:1 | fn source |
+| main.rs:76:5:76:11 | sink(...) | main.rs:5:1:7:1 | fn sink |
+| main.rs:80:13:80:22 | source(...) | main.rs:1:1:3:1 | fn source |
+| main.rs:86:13:86:27 | pass_through(...) | main.rs:82:5:84:5 | fn pass_through |
+| main.rs:87:5:87:11 | sink(...) | main.rs:5:1:7:1 | fn sink |
+| main.rs:99:9:99:15 | sink(...) | main.rs:5:1:7:1 | fn sink |
+| main.rs:106:13:106:21 | source(...) | main.rs:1:1:3:1 | fn source |
+| main.rs:121:13:121:25 | mn.get_data() | main.rs:102:5:108:5 | fn get_data |
+| main.rs:122:5:122:11 | sink(...) | main.rs:5:1:7:1 | fn sink |
+| main.rs:127:13:127:21 | source(...) | main.rs:1:1:3:1 | fn source |
+| main.rs:128:5:128:17 | mn.data_in(...) | main.rs:98:5:100:5 | fn data_in |
+| main.rs:133:13:133:21 | source(...) | main.rs:1:1:3:1 | fn source |
+| main.rs:134:13:134:30 | mn.data_through(...) | main.rs:110:5:116:5 | fn data_through |
+| main.rs:135:5:135:11 | sink(...) | main.rs:5:1:7:1 | fn sink |
+| main.rs:140:13:140:21 | source(...) | main.rs:1:1:3:1 | fn source |
+| main.rs:141:5:141:26 | ...::data_in(...) | main.rs:98:5:100:5 | fn data_in |
+| main.rs:146:13:146:22 | source(...) | main.rs:1:1:3:1 | fn source |
+| main.rs:147:13:147:39 | ...::data_through(...) | main.rs:110:5:116:5 | fn data_through |
+| main.rs:148:5:148:11 | sink(...) | main.rs:5:1:7:1 | fn sink |
+| main.rs:165:13:165:34 | ...::new(...) | main.rs:158:5:161:5 | fn new |
+| main.rs:165:24:165:33 | source(...) | main.rs:1:1:3:1 | fn source |
+| main.rs:167:5:167:11 | sink(...) | main.rs:5:1:7:1 | fn sink |
+| main.rs:195:28:195:36 | source(...) | main.rs:1:1:3:1 | fn source |
+| main.rs:197:13:197:17 | ... + ... | main.rs:173:5:176:5 | fn add |
+| main.rs:198:5:198:17 | sink(...) | main.rs:5:1:7:1 | fn sink |
+| main.rs:201:28:201:36 | source(...) | main.rs:1:1:3:1 | fn source |
+| main.rs:202:13:202:17 | ... + ... | main.rs:173:5:176:5 | fn add |
+| main.rs:203:5:203:17 | sink(...) | main.rs:5:1:7:1 | fn sink |
+| main.rs:205:28:205:36 | source(...) | main.rs:1:1:3:1 | fn source |
+| main.rs:207:13:207:20 | a.add(...) | main.rs:173:5:176:5 | fn add |
+| main.rs:208:5:208:17 | sink(...) | main.rs:5:1:7:1 | fn sink |
+| main.rs:212:28:212:37 | source(...) | main.rs:1:1:3:1 | fn source |
+| main.rs:215:5:215:17 | sink(...) | main.rs:5:1:7:1 | fn sink |
+| main.rs:218:28:218:37 | source(...) | main.rs:1:1:3:1 | fn source |
+| main.rs:219:5:219:10 | ... *= ... | main.rs:180:5:182:5 | fn mul_assign |
+| main.rs:220:5:220:17 | sink(...) | main.rs:5:1:7:1 | fn sink |
+| main.rs:223:28:223:37 | source(...) | main.rs:1:1:3:1 | fn source |
+| main.rs:226:5:226:11 | sink(...) | main.rs:5:1:7:1 | fn sink |
+| main.rs:228:28:228:37 | source(...) | main.rs:1:1:3:1 | fn source |
+| main.rs:229:13:229:14 | * ... | main.rs:188:5:190:5 | fn deref |
+| main.rs:230:5:230:11 | sink(...) | main.rs:5:1:7:1 | fn sink |
+| main.rs:252:28:252:36 | source(...) | main.rs:1:1:3:1 | fn source |
+| main.rs:254:30:254:53 | ...::take_self(...) | main.rs:242:5:244:5 | fn take_self |
+| main.rs:255:5:255:11 | sink(...) | main.rs:5:1:7:1 | fn sink |
+| main.rs:258:28:258:37 | source(...) | main.rs:1:1:3:1 | fn source |
+| main.rs:259:30:259:55 | ...::take_second(...) | main.rs:246:5:248:5 | fn take_second |
+| main.rs:260:5:260:11 | sink(...) | main.rs:5:1:7:1 | fn sink |
+| main.rs:263:28:263:37 | source(...) | main.rs:1:1:3:1 | fn source |
+| main.rs:264:30:264:53 | ...::take_self(...) | main.rs:242:5:244:5 | fn take_self |
+| main.rs:265:5:265:11 | sink(...) | main.rs:5:1:7:1 | fn sink |
+| main.rs:269:13:269:21 | source(...) | main.rs:1:1:3:1 | fn source |
+| main.rs:270:5:270:11 | sink(...) | main.rs:5:1:7:1 | fn sink |
+| main.rs:275:13:275:26 | async_source(...) | main.rs:268:1:272:1 | fn async_source |
+| main.rs:276:5:276:11 | sink(...) | main.rs:5:1:7:1 | fn sink |
+| main.rs:279:17:279:25 | source(...) | main.rs:1:1:3:1 | fn source |
+| main.rs:280:9:280:15 | sink(...) | main.rs:5:1:7:1 | fn sink |
+| main.rs:283:5:283:17 | sink(...) | main.rs:5:1:7:1 | fn sink |
+| main.rs:287:13:287:55 | ...::block_on(...) | file://:0:0:0:0 | repo:https://github.com/rust-lang/futures-rs:futures-executor::_::crate::local_pool::block_on |
+| main.rs:287:41:287:54 | async_source(...) | main.rs:268:1:272:1 | fn async_source |
+| main.rs:288:5:288:11 | sink(...) | main.rs:5:1:7:1 | fn sink |
+| main.rs:290:5:290:62 | ...::block_on(...) | file://:0:0:0:0 | repo:https://github.com/rust-lang/futures-rs:futures-executor::_::crate::local_pool::block_on |
+| main.rs:290:33:290:61 | test_async_await_async_part(...) | main.rs:274:1:284:1 | fn test_async_await_async_part |
+| main.rs:294:5:294:22 | data_out_of_call(...) | main.rs:16:1:19:1 | fn data_out_of_call |
+| main.rs:295:5:295:35 | data_out_of_call_side_effect1(...) | main.rs:35:1:40:1 | fn data_out_of_call_side_effect1 |
+| main.rs:296:5:296:35 | data_out_of_call_side_effect2(...) | main.rs:42:1:50:1 | fn data_out_of_call_side_effect2 |
+| main.rs:297:5:297:21 | data_in_to_call(...) | main.rs:56:1:59:1 | fn data_in_to_call |
+| main.rs:298:5:298:23 | data_through_call(...) | main.rs:65:1:69:1 | fn data_through_call |
+| main.rs:299:5:299:34 | data_through_nested_function(...) | main.rs:79:1:88:1 | fn data_through_nested_function |
+| main.rs:301:5:301:24 | data_out_of_method(...) | main.rs:119:1:123:1 | fn data_out_of_method |
+| main.rs:302:5:302:28 | data_in_to_method_call(...) | main.rs:125:1:129:1 | fn data_in_to_method_call |
+| main.rs:303:5:303:25 | data_through_method(...) | main.rs:131:1:136:1 | fn data_through_method |
+| main.rs:305:5:305:31 | test_operator_overloading(...) | main.rs:193:1:231:1 | fn test_operator_overloading |
+| main.rs:306:5:306:22 | test_async_await(...) | main.rs:286:1:291:1 | fn test_async_await |
diff --git a/rust/ql/test/library-tests/dataflow/modeled/inline-flow.expected b/rust/ql/test/library-tests/dataflow/modeled/inline-flow.expected
index b1103e843b2..023507aaafc 100644
--- a/rust/ql/test/library-tests/dataflow/modeled/inline-flow.expected
+++ b/rust/ql/test/library-tests/dataflow/modeled/inline-flow.expected
@@ -2,36 +2,34 @@ models
 | 1 | Summary: lang:alloc; <crate::boxed::Box>::into_pin; Argument[0]; ReturnValue; value |
 | 2 | Summary: lang:alloc; <crate::boxed::Box>::new; Argument[0]; ReturnValue.Reference; value |
 | 3 | Summary: lang:alloc; <crate::boxed::Box>::pin; Argument[0]; ReturnValue.Reference; value |
-| 4 | Summary: lang:core; <crate::option::Option as crate::clone::Clone>::clone; Argument[self].Field[crate::option::Option::Some(0)]; ReturnValue.Field[crate::option::Option::Some(0)]; value |
-| 5 | Summary: lang:core; <crate::option::Option>::unwrap; Argument[self].Field[crate::option::Option::Some(0)]; ReturnValue; value |
-| 6 | Summary: lang:core; <crate::option::Option>::zip; Argument[0].Field[crate::option::Option::Some(0)]; ReturnValue.Field[crate::option::Option::Some(0)].Field[1]; value |
-| 7 | Summary: lang:core; <crate::pin::Pin>::into_inner; Argument[0]; ReturnValue; value |
-| 8 | Summary: lang:core; <crate::pin::Pin>::new; Argument[0]; ReturnValue; value |
-| 9 | Summary: lang:core; <crate::result::Result>::unwrap; Argument[self].Field[crate::result::Result::Ok(0)]; ReturnValue; value |
-| 10 | Summary: lang:core; <i64 as crate::clone::Clone>::clone; Argument[self].Reference; ReturnValue; value |
-| 11 | Summary: lang:core; crate::ptr::read; Argument[0].Reference; ReturnValue; value |
-| 12 | Summary: lang:core; crate::ptr::write; Argument[1]; Argument[0].Reference; value |
+| 4 | Summary: lang:core; <crate::option::Option>::unwrap; Argument[self].Field[crate::option::Option::Some(0)]; ReturnValue; value |
+| 5 | Summary: lang:core; <crate::option::Option>::zip; Argument[0].Field[crate::option::Option::Some(0)]; ReturnValue.Field[crate::option::Option::Some(0)].Field[1]; value |
+| 6 | Summary: lang:core; <crate::pin::Pin>::into_inner; Argument[0]; ReturnValue; value |
+| 7 | Summary: lang:core; <crate::pin::Pin>::new; Argument[0]; ReturnValue; value |
+| 8 | Summary: lang:core; <crate::result::Result>::unwrap; Argument[self].Field[crate::result::Result::Ok(0)]; ReturnValue; value |
+| 9 | Summary: lang:core; <i64 as crate::clone::Clone>::clone; Argument[self].Reference; ReturnValue; value |
+| 10 | Summary: lang:core; crate::ptr::read; Argument[0].Reference; ReturnValue; value |
+| 11 | Summary: lang:core; crate::ptr::write; Argument[1]; Argument[0].Reference; value |
 edges
-| main.rs:12:9:12:9 | a [Some] | main.rs:13:10:13:19 | a.unwrap() | provenance | MaD:5 |
+| main.rs:12:9:12:9 | a [Some] | main.rs:13:10:13:19 | a.unwrap() | provenance | MaD:4 |
 | main.rs:12:9:12:9 | a [Some] | main.rs:14:13:14:13 | a [Some] | provenance |  |
-| main.rs:12:9:12:9 | a [Some] | main.rs:14:13:14:21 | a.clone() [Some] | provenance | MaD:4 |
 | main.rs:12:13:12:28 | Some(...) [Some] | main.rs:12:9:12:9 | a [Some] | provenance |  |
 | main.rs:12:18:12:27 | source(...) | main.rs:12:13:12:28 | Some(...) [Some] | provenance |  |
-| main.rs:14:9:14:9 | b [Some] | main.rs:15:10:15:19 | b.unwrap() | provenance | MaD:5 |
+| main.rs:14:9:14:9 | b [Some] | main.rs:15:10:15:19 | b.unwrap() | provenance | MaD:4 |
 | main.rs:14:13:14:13 | a [Some] | main.rs:14:13:14:21 | a.clone() [Some] | provenance | generated |
 | main.rs:14:13:14:21 | a.clone() [Some] | main.rs:14:9:14:9 | b [Some] | provenance |  |
-| main.rs:19:9:19:9 | a [Ok] | main.rs:20:10:20:19 | a.unwrap() | provenance | MaD:9 |
+| main.rs:19:9:19:9 | a [Ok] | main.rs:20:10:20:19 | a.unwrap() | provenance | MaD:8 |
 | main.rs:19:9:19:9 | a [Ok] | main.rs:21:13:21:13 | a [Ok] | provenance |  |
 | main.rs:19:31:19:44 | Ok(...) [Ok] | main.rs:19:9:19:9 | a [Ok] | provenance |  |
 | main.rs:19:34:19:43 | source(...) | main.rs:19:31:19:44 | Ok(...) [Ok] | provenance |  |
-| main.rs:21:9:21:9 | b [Ok] | main.rs:22:10:22:19 | b.unwrap() | provenance | MaD:9 |
+| main.rs:21:9:21:9 | b [Ok] | main.rs:22:10:22:19 | b.unwrap() | provenance | MaD:8 |
 | main.rs:21:13:21:13 | a [Ok] | main.rs:21:13:21:21 | a.clone() [Ok] | provenance | generated |
 | main.rs:21:13:21:21 | a.clone() [Ok] | main.rs:21:9:21:9 | b [Ok] | provenance |  |
 | main.rs:26:9:26:9 | a | main.rs:27:10:27:10 | a | provenance |  |
 | main.rs:26:9:26:9 | a | main.rs:28:13:28:13 | a | provenance |  |
 | main.rs:26:13:26:22 | source(...) | main.rs:26:9:26:9 | a | provenance |  |
 | main.rs:28:9:28:9 | b | main.rs:29:10:29:10 | b | provenance |  |
-| main.rs:28:13:28:13 | a | main.rs:28:13:28:21 | a.clone() | provenance | MaD:10 |
+| main.rs:28:13:28:13 | a | main.rs:28:13:28:21 | a.clone() | provenance | MaD:9 |
 | main.rs:28:13:28:13 | a | main.rs:28:13:28:21 | a.clone() | provenance | generated |
 | main.rs:28:13:28:21 | a.clone() | main.rs:28:9:28:9 | b | provenance |  |
 | main.rs:43:18:43:22 | SelfParam [Wrapper] | main.rs:44:26:44:29 | self [Wrapper] | provenance |  |
@@ -58,14 +56,14 @@ edges
 | main.rs:66:22:66:31 | source(...) | main.rs:66:17:66:32 | Some(...) [Some] | provenance |  |
 | main.rs:67:13:67:13 | z [Some, tuple.1] | main.rs:68:15:68:15 | z [Some, tuple.1] | provenance |  |
 | main.rs:67:17:67:24 | a.zip(...) [Some, tuple.1] | main.rs:67:13:67:13 | z [Some, tuple.1] | provenance |  |
-| main.rs:67:23:67:23 | b [Some] | main.rs:67:17:67:24 | a.zip(...) [Some, tuple.1] | provenance | MaD:6 |
+| main.rs:67:23:67:23 | b [Some] | main.rs:67:17:67:24 | a.zip(...) [Some, tuple.1] | provenance | MaD:5 |
 | main.rs:68:15:68:15 | z [Some, tuple.1] | main.rs:69:13:69:24 | Some(...) [Some, tuple.1] | provenance |  |
 | main.rs:69:13:69:24 | Some(...) [Some, tuple.1] | main.rs:69:18:69:23 | TuplePat [tuple.1] | provenance |  |
 | main.rs:69:18:69:23 | TuplePat [tuple.1] | main.rs:69:22:69:22 | m | provenance |  |
 | main.rs:69:22:69:22 | m | main.rs:71:22:71:22 | m | provenance |  |
 | main.rs:92:29:92:29 | [post] y [&ref] | main.rs:93:33:93:33 | y [&ref] | provenance |  |
-| main.rs:92:32:92:41 | source(...) | main.rs:92:29:92:29 | [post] y [&ref] | provenance | MaD:12 |
-| main.rs:93:33:93:33 | y [&ref] | main.rs:93:18:93:34 | ...::read(...) | provenance | MaD:11 |
+| main.rs:92:32:92:41 | source(...) | main.rs:92:29:92:29 | [post] y [&ref] | provenance | MaD:11 |
+| main.rs:93:33:93:33 | y [&ref] | main.rs:93:18:93:34 | ...::read(...) | provenance | MaD:10 |
 | main.rs:108:13:108:17 | mut i | main.rs:109:34:109:34 | i | provenance |  |
 | main.rs:108:13:108:17 | mut i | main.rs:110:33:110:33 | i | provenance |  |
 | main.rs:108:13:108:17 | mut i | main.rs:111:47:111:47 | i | provenance |  |
@@ -74,7 +72,7 @@ edges
 | main.rs:109:13:109:20 | mut pin1 [&ref] | main.rs:114:15:114:18 | pin1 [&ref] | provenance |  |
 | main.rs:109:13:109:20 | mut pin1 [&ref] | main.rs:115:31:115:34 | pin1 [&ref] | provenance |  |
 | main.rs:109:24:109:35 | ...::new(...) [&ref] | main.rs:109:13:109:20 | mut pin1 [&ref] | provenance |  |
-| main.rs:109:33:109:34 | &i [&ref] | main.rs:109:24:109:35 | ...::new(...) [&ref] | provenance | MaD:8 |
+| main.rs:109:33:109:34 | &i [&ref] | main.rs:109:24:109:35 | ...::new(...) [&ref] | provenance | MaD:7 |
 | main.rs:109:34:109:34 | i | main.rs:109:33:109:34 | &i [&ref] | provenance |  |
 | main.rs:110:13:110:20 | mut pin2 [&ref] | main.rs:116:15:116:18 | pin2 [&ref] | provenance |  |
 | main.rs:110:24:110:34 | ...::pin(...) [&ref] | main.rs:110:13:110:20 | mut pin2 [&ref] | provenance |  |
@@ -85,7 +83,7 @@ edges
 | main.rs:111:47:111:47 | i | main.rs:111:38:111:48 | ...::new(...) [&ref] | provenance | MaD:2 |
 | main.rs:114:15:114:18 | pin1 [&ref] | main.rs:114:14:114:18 | * ... | provenance |  |
 | main.rs:115:15:115:35 | ...::into_inner(...) [&ref] | main.rs:115:14:115:35 | * ... | provenance |  |
-| main.rs:115:31:115:34 | pin1 [&ref] | main.rs:115:15:115:35 | ...::into_inner(...) [&ref] | provenance | MaD:7 |
+| main.rs:115:31:115:34 | pin1 [&ref] | main.rs:115:15:115:35 | ...::into_inner(...) [&ref] | provenance | MaD:6 |
 | main.rs:116:15:116:18 | pin2 [&ref] | main.rs:116:14:116:18 | * ... | provenance |  |
 | main.rs:117:15:117:18 | pin3 [&ref] | main.rs:117:14:117:18 | * ... | provenance |  |
 | main.rs:122:13:122:18 | mut ms [MyStruct] | main.rs:127:14:127:15 | ms [MyStruct] | provenance |  |
diff --git a/rust/ql/test/library-tests/dataflow/sources/CONSISTENCY/PathResolutionConsistency.expected b/rust/ql/test/library-tests/dataflow/sources/CONSISTENCY/PathResolutionConsistency.expected
index 0aa77163252..4433a59fff1 100644
--- a/rust/ql/test/library-tests/dataflow/sources/CONSISTENCY/PathResolutionConsistency.expected
+++ b/rust/ql/test/library-tests/dataflow/sources/CONSISTENCY/PathResolutionConsistency.expected
@@ -1,3 +1,87 @@
+multipleMethodCallTargets
+| test.rs:618:25:618:49 | address.to_socket_addrs() | file://:0:0:0:0 | fn to_socket_addrs |
+| test.rs:618:25:618:49 | address.to_socket_addrs() | file://:0:0:0:0 | fn to_socket_addrs |
+| test_futures_io.rs:35:26:35:63 | pinned.poll_read(...) | file://:0:0:0:0 | fn poll_read |
+| test_futures_io.rs:35:26:35:63 | pinned.poll_read(...) | file://:0:0:0:0 | fn poll_read |
+| test_futures_io.rs:35:26:35:63 | pinned.poll_read(...) | file://:0:0:0:0 | fn poll_read |
+| test_futures_io.rs:61:22:61:50 | pinned.poll_fill_buf(...) | file://:0:0:0:0 | fn poll_fill_buf |
+| test_futures_io.rs:61:22:61:50 | pinned.poll_fill_buf(...) | file://:0:0:0:0 | fn poll_fill_buf |
+| test_futures_io.rs:68:23:68:67 | ... .poll_fill_buf(...) | file://:0:0:0:0 | fn poll_fill_buf |
+| test_futures_io.rs:68:23:68:67 | ... .poll_fill_buf(...) | file://:0:0:0:0 | fn poll_fill_buf |
+| test_futures_io.rs:92:26:92:63 | pinned.poll_read(...) | file://:0:0:0:0 | fn poll_read |
+| test_futures_io.rs:92:26:92:63 | pinned.poll_read(...) | file://:0:0:0:0 | fn poll_read |
+| test_futures_io.rs:92:26:92:63 | pinned.poll_read(...) | file://:0:0:0:0 | fn poll_read |
+| test_futures_io.rs:115:22:115:50 | pinned.poll_fill_buf(...) | file://:0:0:0:0 | fn poll_fill_buf |
+| test_futures_io.rs:115:22:115:50 | pinned.poll_fill_buf(...) | file://:0:0:0:0 | fn poll_fill_buf |
+multiplePathResolutions
+| test.rs:112:62:112:73 | ...::from | file://:0:0:0:0 | fn from |
+| test.rs:112:62:112:73 | ...::from | file://:0:0:0:0 | fn from |
+| test.rs:112:62:112:73 | ...::from | file://:0:0:0:0 | fn from |
+| test.rs:112:62:112:73 | ...::from | file://:0:0:0:0 | fn from |
+| test.rs:112:62:112:73 | ...::from | file://:0:0:0:0 | fn from |
+| test.rs:112:62:112:73 | ...::from | file://:0:0:0:0 | fn from |
+| test.rs:112:62:112:73 | ...::from | file://:0:0:0:0 | fn from |
+| test.rs:112:62:112:73 | ...::from | file://:0:0:0:0 | fn from |
+| test.rs:112:62:112:73 | ...::from | file://:0:0:0:0 | fn from |
+| test.rs:112:62:112:73 | ...::from | file://:0:0:0:0 | fn from |
+| test.rs:112:62:112:73 | ...::from | file://:0:0:0:0 | fn from |
+| test.rs:112:62:112:73 | ...::from | file://:0:0:0:0 | fn from |
+| test.rs:112:62:112:73 | ...::from | file://:0:0:0:0 | fn from |
+| test.rs:112:62:112:73 | ...::from | file://:0:0:0:0 | fn from |
+| test.rs:112:62:112:73 | ...::from | file://:0:0:0:0 | fn from |
+| test.rs:119:58:119:69 | ...::from | file://:0:0:0:0 | fn from |
+| test.rs:119:58:119:69 | ...::from | file://:0:0:0:0 | fn from |
+| test.rs:119:58:119:69 | ...::from | file://:0:0:0:0 | fn from |
+| test.rs:119:58:119:69 | ...::from | file://:0:0:0:0 | fn from |
+| test.rs:119:58:119:69 | ...::from | file://:0:0:0:0 | fn from |
+| test.rs:119:58:119:69 | ...::from | file://:0:0:0:0 | fn from |
+| test.rs:119:58:119:69 | ...::from | file://:0:0:0:0 | fn from |
+| test.rs:119:58:119:69 | ...::from | file://:0:0:0:0 | fn from |
+| test.rs:119:58:119:69 | ...::from | file://:0:0:0:0 | fn from |
+| test.rs:119:58:119:69 | ...::from | file://:0:0:0:0 | fn from |
+| test.rs:119:58:119:69 | ...::from | file://:0:0:0:0 | fn from |
+| test.rs:119:58:119:69 | ...::from | file://:0:0:0:0 | fn from |
+| test.rs:119:58:119:69 | ...::from | file://:0:0:0:0 | fn from |
+| test.rs:119:58:119:69 | ...::from | file://:0:0:0:0 | fn from |
+| test.rs:119:58:119:69 | ...::from | file://:0:0:0:0 | fn from |
+| test.rs:777:23:777:61 | ...::try_from | file://:0:0:0:0 | fn try_from |
+| test.rs:777:23:777:61 | ...::try_from | file://:0:0:0:0 | fn try_from |
+| test.rs:777:23:777:61 | ...::try_from | file://:0:0:0:0 | fn try_from |
+| test.rs:806:50:806:61 | ...::from | file://:0:0:0:0 | fn from |
+| test.rs:806:50:806:61 | ...::from | file://:0:0:0:0 | fn from |
+| test.rs:806:50:806:61 | ...::from | file://:0:0:0:0 | fn from |
+| test.rs:806:50:806:61 | ...::from | file://:0:0:0:0 | fn from |
+| test.rs:806:50:806:61 | ...::from | file://:0:0:0:0 | fn from |
+| test.rs:806:50:806:61 | ...::from | file://:0:0:0:0 | fn from |
+| test.rs:806:50:806:61 | ...::from | file://:0:0:0:0 | fn from |
+| test.rs:806:50:806:61 | ...::from | file://:0:0:0:0 | fn from |
+| test.rs:806:50:806:61 | ...::from | file://:0:0:0:0 | fn from |
+| test.rs:806:50:806:61 | ...::from | file://:0:0:0:0 | fn from |
+| test.rs:806:50:806:61 | ...::from | file://:0:0:0:0 | fn from |
+| test.rs:806:50:806:61 | ...::from | file://:0:0:0:0 | fn from |
+| test.rs:806:50:806:61 | ...::from | file://:0:0:0:0 | fn from |
+| test.rs:806:50:806:61 | ...::from | file://:0:0:0:0 | fn from |
+| test.rs:806:50:806:61 | ...::from | file://:0:0:0:0 | fn from |
+| test.rs:806:50:806:61 | ...::from | file://:0:0:0:0 | fn from |
+| test.rs:806:50:806:61 | ...::from | file://:0:0:0:0 | fn from |
+| test.rs:806:50:806:61 | ...::from | file://:0:0:0:0 | fn from |
+| test.rs:806:50:806:61 | ...::from | file://:0:0:0:0 | fn from |
+| test.rs:806:50:806:61 | ...::from | file://:0:0:0:0 | fn from |
+| test.rs:806:50:806:61 | ...::from | file://:0:0:0:0 | fn from |
+| test.rs:806:50:806:61 | ...::from | file://:0:0:0:0 | fn from |
+| test.rs:806:50:806:61 | ...::from | file://:0:0:0:0 | fn from |
+| test.rs:806:50:806:61 | ...::from | file://:0:0:0:0 | fn from |
+| test.rs:806:50:806:61 | ...::from | file://:0:0:0:0 | fn from |
+| test.rs:806:50:806:61 | ...::from | file://:0:0:0:0 | fn from |
+| test.rs:806:50:806:61 | ...::from | file://:0:0:0:0 | fn from |
+| test.rs:806:50:806:61 | ...::from | file://:0:0:0:0 | fn from |
+| test.rs:806:50:806:61 | ...::from | file://:0:0:0:0 | fn from |
+| test.rs:806:50:806:61 | ...::from | file://:0:0:0:0 | fn from |
+| test_futures_io.rs:25:23:25:61 | ...::try_from | file://:0:0:0:0 | fn try_from |
+| test_futures_io.rs:25:23:25:61 | ...::try_from | file://:0:0:0:0 | fn try_from |
+| test_futures_io.rs:25:23:25:61 | ...::try_from | file://:0:0:0:0 | fn try_from |
+| test_futures_io.rs:144:26:144:43 | ...::with_capacity | file://:0:0:0:0 | fn with_capacity |
+| test_futures_io.rs:144:26:144:43 | ...::with_capacity | file://:0:0:0:0 | fn with_capacity |
 multipleCanonicalPaths
 | file://:0:0:0:0 | fn to_ordering | file://:0:0:0:0 | Crate(typenum@1.18.0) | <typenum::Equal as core::cmp::Ord>::to_ordering |
 | file://:0:0:0:0 | fn to_ordering | file://:0:0:0:0 | Crate(typenum@1.18.0) | <typenum::Equal as typenum::marker_traits::Ord>::to_ordering |
diff --git a/rust/ql/test/library-tests/dataflow/sources/InlineFlow.ql b/rust/ql/test/library-tests/dataflow/sources/InlineFlow.ql
index 7d5f4fb926f..f0a38e29f19 100644
--- a/rust/ql/test/library-tests/dataflow/sources/InlineFlow.ql
+++ b/rust/ql/test/library-tests/dataflow/sources/InlineFlow.ql
@@ -10,7 +10,7 @@ module MyFlowConfig implements DataFlow::ConfigSig {
   predicate isSource(DataFlow::Node source) { source instanceof ThreatModelSource }
 
   predicate isSink(DataFlow::Node sink) {
-    any(CallExpr call | call.getFunction().(PathExpr).getResolvedPath() = "crate::test::sink")
+    any(CallExpr call | call.getFunction().(PathExpr).getResolvedPath().matches("%::sink"))
         .getArgList()
         .getAnArg() = sink.asExpr().getExpr()
   }
diff --git a/rust/ql/test/library-tests/dataflow/sources/TaintSources.expected b/rust/ql/test/library-tests/dataflow/sources/TaintSources.expected
index da3b69eb050..1958d6a87bf 100644
--- a/rust/ql/test/library-tests/dataflow/sources/TaintSources.expected
+++ b/rust/ql/test/library-tests/dataflow/sources/TaintSources.expected
@@ -50,7 +50,10 @@
 | test.rs:384:58:384:73 | ...::stdin | Flow source 'StdInSource' of type stdin (DEFAULT). |
 | test.rs:392:48:392:63 | ...::stdin | Flow source 'StdInSource' of type stdin (DEFAULT). |
 | test.rs:407:31:407:43 | ...::read | Flow source 'FileSource' of type file (DEFAULT). |
+| test.rs:407:31:407:43 | ...::read | Flow source 'FileSource' of type file (DEFAULT). |
 | test.rs:412:31:412:38 | ...::read | Flow source 'FileSource' of type file (DEFAULT). |
+| test.rs:412:31:412:38 | ...::read | Flow source 'FileSource' of type file (DEFAULT). |
+| test.rs:417:22:417:39 | ...::read_to_string | Flow source 'FileSource' of type file (DEFAULT). |
 | test.rs:417:22:417:39 | ...::read_to_string | Flow source 'FileSource' of type file (DEFAULT). |
 | test.rs:423:22:423:25 | path | Flow source 'FileSource' of type file (DEFAULT). |
 | test.rs:424:27:424:35 | file_name | Flow source 'FileSource' of type file (DEFAULT). |
@@ -75,8 +78,10 @@
 | test.rs:619:26:619:61 | ...::connect_timeout | Flow source 'RemoteSource' of type remote (DEFAULT). |
 | test.rs:671:28:671:57 | ...::connect | Flow source 'RemoteSource' of type remote (DEFAULT). |
 | test.rs:753:22:753:49 | ...::connect | Flow source 'RemoteSource' of type remote (DEFAULT). |
-| test.rs:775:16:775:29 | ...::args | Flow source 'CommandLineArgs' of type commandargs (DEFAULT). |
-| test.rs:775:16:775:29 | ...::args | Flow source 'CommandLineArgs' of type commandargs (DEFAULT). |
+| test.rs:779:22:779:50 | ...::new | Flow source 'RemoteSource' of type remote (DEFAULT). |
+| test.rs:806:16:806:29 | ...::args | Flow source 'CommandLineArgs' of type commandargs (DEFAULT). |
+| test.rs:806:16:806:29 | ...::args | Flow source 'CommandLineArgs' of type commandargs (DEFAULT). |
+| test_futures_io.rs:19:15:19:32 | ...::connect | Flow source 'RemoteSource' of type remote (DEFAULT). |
 | web_frameworks.rs:12:31:12:31 | a | Flow source 'RemoteSource' of type remote (DEFAULT). |
 | web_frameworks.rs:12:31:12:31 | a | Flow source 'RemoteSource' of type remote (DEFAULT). |
 | web_frameworks.rs:21:31:21:35 | TuplePat | Flow source 'RemoteSource' of type remote (DEFAULT). |
diff --git a/rust/ql/test/library-tests/dataflow/sources/options.yml b/rust/ql/test/library-tests/dataflow/sources/options.yml
index a9d9354529e..a05a970f7b8 100644
--- a/rust/ql/test/library-tests/dataflow/sources/options.yml
+++ b/rust/ql/test/library-tests/dataflow/sources/options.yml
@@ -13,3 +13,6 @@ qltest_dependencies:
     - actix-web = { version = "4.10.2" }
     - axum = { version = "0.8.4" }
     - serde_json = { version = "1.0.140" }
+    - rustls = { version = "0.23.27" }
+    - futures-rustls = { version = "0.26.0" }
+    - async-std = { version = "1.13.1" }
diff --git a/rust/ql/test/library-tests/dataflow/sources/test.rs b/rust/ql/test/library-tests/dataflow/sources/test.rs
index 370f3d4c9b6..342efbba69e 100644
--- a/rust/ql/test/library-tests/dataflow/sources/test.rs
+++ b/rust/ql/test/library-tests/dataflow/sources/test.rs
@@ -770,6 +770,37 @@ async fn test_std_to_tokio_tcpstream() -> std::io::Result<()> {
     Ok(())
 }
 
+fn test_rustls() -> std::io::Result<()> {
+    let config = rustls::ClientConfig::builder()
+        .with_root_certificates(rustls::RootCertStore::empty())
+        .with_no_client_auth();
+    let server_name = rustls::pki_types::ServerName::try_from("www.example.com").unwrap();
+    let config_arc = std::sync::Arc::new(config);
+    let mut client = rustls::ClientConnection::new(config_arc, server_name).unwrap(); // $ Alert[rust/summary/taint-sources]
+    let mut reader = client.reader();
+    sink(&reader); // $ hasTaintFlow=config_arc
+
+    {
+        let mut buffer = [0u8; 100];
+        let _bytes = reader.read(&mut buffer)?;
+        sink(&buffer); // $ hasTaintFlow=config_arc
+    }
+
+    {
+        let mut buffer = Vec::<u8>::new();
+        let _bytes = reader.read_to_end(&mut buffer)?;
+        sink(&buffer); // $ hasTaintFlow=config_arc
+    }
+
+    {
+        let mut buffer = String::new();
+        let _bytes = reader.read_to_string(&mut buffer)?;
+        sink(&buffer); // $ hasTaintFlow=config_arc
+    }
+
+    Ok(())
+}
+
 #[tokio::main]
 async fn main() -> Result<(), Box<dyn std::error::Error>> {
     let case = std::env::args().nth(1).unwrap_or(String::from("1")).parse::<i64>().unwrap(); // $ Alert[rust/summary/taint-sources]
@@ -849,5 +880,11 @@ async fn main() -> Result<(), Box<dyn std::error::Error>> {
         Err(e) => println!("error: {}", e),
     }
 
+    println!("test_rustls...");
+    match test_rustls() {
+        Ok(_) => println!("complete"),
+        Err(e) => println!("error: {}", e),
+    }
+
     Ok(())
 }
diff --git a/rust/ql/test/library-tests/dataflow/sources/test_futures_io.rs b/rust/ql/test/library-tests/dataflow/sources/test_futures_io.rs
new file mode 100644
index 00000000000..6e7747424d6
--- /dev/null
+++ b/rust/ql/test/library-tests/dataflow/sources/test_futures_io.rs
@@ -0,0 +1,159 @@
+fn sink<T>(_: T) { }
+
+// --- tests ---
+
+use std::pin::Pin;
+use std::task::{Context, Poll};
+use std::io;
+use futures::io::AsyncRead;
+use futures::io::AsyncReadExt;
+use futures::io::AsyncBufRead;
+use futures::io::AsyncBufReadExt;
+use futures::StreamExt;
+use futures_rustls::{TlsConnector};
+use async_std::sync::Arc;
+use async_std::net::TcpStream;
+
+async fn test_futures_rustls_futures_io() -> io::Result<()> {
+    let url = "www.example.com:443";
+    let tcp = TcpStream::connect(url).await?; // $ Alert[rust/summary/taint-sources]
+    sink(&tcp); // $ hasTaintFlow=url
+    let config = rustls::ClientConfig::builder()
+        .with_root_certificates(rustls::RootCertStore::empty())
+        .with_no_client_auth();
+    let connector = TlsConnector::from(Arc::new(config));
+    let server_name = rustls::pki_types::ServerName::try_from("www.example.com").unwrap();
+    let mut reader = connector.connect(server_name, tcp).await?;
+    sink(&reader); // $ hasTaintFlow=url
+
+    {
+        // using the `AsyncRead` trait (low-level)
+        let mut buffer = [0u8; 64];
+        let mut pinned = Pin::new(&mut reader);
+        sink(&pinned); // $ hasTaintFlow=url
+        let mut cx = Context::from_waker(futures::task::noop_waker_ref());
+        let bytes_read = pinned.poll_read(&mut cx, &mut buffer);
+        if let Poll::Ready(Ok(n)) = bytes_read {
+            sink(&buffer); // $ hasTaintFlow=url
+            sink(&buffer[..n]); // $ hasTaintFlow=url
+        }
+    }
+
+    {
+        // using the `AsyncReadExt::read` extension method (higher-level)
+        let mut buffer1 = [0u8; 64];
+        let bytes_read1 = futures::io::AsyncReadExt::read(&mut reader, &mut buffer1).await?;
+        sink(&buffer1[..bytes_read1]); // $ hasTaintFlow=url
+
+        let mut buffer2 = [0u8; 64];
+        let bytes_read2 = reader.read(&mut buffer2).await?;
+        sink(&buffer2[..bytes_read2]); // $ hasTaintFlow=url
+    }
+
+    let mut reader2 = futures::io::BufReader::new(reader);
+    sink(&reader2); // $ hasTaintFlow=url
+
+    {
+        // using the `AsyncBufRead` trait (low-level)
+        let mut pinned = Pin::new(&mut reader2);
+        sink(&pinned); // $ hasTaintFlow=url
+        let mut cx = Context::from_waker(futures::task::noop_waker_ref());
+        let buffer = pinned.poll_fill_buf(&mut cx);
+        if let Poll::Ready(Ok(buf)) = buffer {
+            sink(&buffer); // $ MISSING: hasTaintFlow=url
+            sink(buf); // $ MISSING: hasTaintFlow=url
+        }
+
+        // using the `AsyncBufRead` trait (alternative syntax)
+        let buffer2 = Pin::new(&mut reader2).poll_fill_buf(&mut cx);
+        match (buffer2) {
+            Poll::Ready(Ok(buf)) => {
+                sink(&buffer2); // $ MISSING: hasTaintFlow=url
+                sink(buf); // $ MISSING: hasTaintFlow=url
+            }
+            _ => {
+                // ...
+            }
+        }
+    }
+
+    {
+        // using the `AsyncBufReadExt::fill_buf` extension method (higher-level)
+        let buffer = reader2.fill_buf().await?;
+        sink(buffer); // $ hasTaintFlow=url
+    }
+
+    {
+        // using the `AsyncRead` trait (low-level)
+        let mut buffer = [0u8; 64];
+        let mut pinned = Pin::new(&mut reader2);
+        sink(&pinned); // $ hasTaintFlow=url
+        let mut cx = Context::from_waker(futures::task::noop_waker_ref());
+        let bytes_read = pinned.poll_read(&mut cx, &mut buffer);
+        sink(&buffer); // $ MISSING: hasTaintFlow=url
+        if let Poll::Ready(Ok(n)) = bytes_read {
+            sink(&buffer[..n]); // $ MISSING: hasTaintFlow=url
+        }
+    }
+
+    {
+        // using the `AsyncReadExt::read` extension method (higher-level)
+        let mut buffer1 = [0u8; 64];
+        let bytes_read1 = futures::io::AsyncReadExt::read(&mut reader2, &mut buffer1).await?;
+        sink(&buffer1[..bytes_read1]); // $ hasTaintFlow=url
+
+        let mut buffer2 = [0u8; 64];
+        let bytes_read2 = reader2.read(&mut buffer2).await?;
+        sink(&buffer2[..bytes_read2]); // $ hasTaintFlow=url
+    }
+
+    {
+        // using the `AsyncBufRead` trait (low-level)
+        let mut pinned = Pin::new(&mut reader2);
+        sink(&pinned); // $ hasTaintFlow=url
+        let mut cx = Context::from_waker(futures::task::noop_waker_ref());
+        let buffer = pinned.poll_fill_buf(&mut cx);
+        sink(&buffer); // $ MISSING: hasTaintFlow=url
+        if let Poll::Ready(Ok(buf)) = buffer {
+            sink(buf); // $ MISSING: hasTaintFlow=url
+        }
+    }
+
+    {
+        // using the `AsyncBufReadExt::fill_buf` extension method (higher-level)
+        let buffer = reader2.fill_buf().await?;
+        sink(buffer); // $ hasTaintFlow=url
+    }
+
+    {
+        // using the `AsyncBufReadExt::read_until` extension method
+        let mut line = Vec::new();
+        let _bytes_read = reader2.read_until(b'\n', &mut line).await?;
+        sink(&line); // $ hasTaintFlow=url
+    }
+
+    {
+        // using the `AsyncBufReadExt::read_line` extension method
+        let mut line = String::new();
+        let _bytes_read = reader2.read_line(&mut line).await?;
+        sink(&line); // $ hasTaintFlow=url
+    }
+
+    {
+        // using the `AsyncBufReadExt::read_to_end` extension method
+        let mut buffer = Vec::with_capacity(1024);
+        let _bytes_read = reader2.read_to_end(&mut buffer).await?;
+        sink(&buffer); // $ hasTaintFlow=url
+    }
+
+    {
+        // using the `AsyncBufReadExt::lines` extension method
+        let mut lines_stream = reader2.lines();
+        sink(lines_stream.next().await.unwrap()); // $ hasTaintFlow=url
+        while let Some(line) = lines_stream.next().await {
+            sink(line.unwrap()); // $ MISSING: hasTaintFlow
+        }
+    }
+
+    Ok(())
+}
diff --git a/rust/ql/test/library-tests/dataflow/sources/web_frameworks.rs b/rust/ql/test/library-tests/dataflow/sources/web_frameworks.rs
index 6bfee08a3d2..f1bf3ab6b0b 100644
--- a/rust/ql/test/library-tests/dataflow/sources/web_frameworks.rs
+++ b/rust/ql/test/library-tests/dataflow/sources/web_frameworks.rs
@@ -10,9 +10,9 @@ mod poem_test {
 
     #[handler]
     fn my_poem_handler_1(Path(a): Path<String>) -> String { // $ Alert[rust/summary/taint-sources]
-        sink(a.as_str()); // $ MISSING: hasTaintFlow
-        sink(a.as_bytes()); // $ MISSING: hasTaintFlow
-        sink(a); // $ MISSING: hasTaintFlow
+        sink(a.as_str()); // $ hasTaintFlow
+        sink(a.as_bytes()); // $ hasTaintFlow
+        sink(a); // $ hasTaintFlow
 
         "".to_string()
     }
@@ -59,7 +59,7 @@ mod poem_test {
     fn my_poem_handler_6(
         Query(a): Query<String>, // $ Alert[rust/summary/taint-sources]
     ) -> String {
-        sink(a); // $ MISSING: hasTaintFlow
+        sink(a); // $ hasTaintFlow
 
         "".to_string()
     }
diff --git a/rust/ql/test/library-tests/dataflow/strings/CONSISTENCY/PathResolutionConsistency.expected b/rust/ql/test/library-tests/dataflow/strings/CONSISTENCY/PathResolutionConsistency.expected
new file mode 100644
index 00000000000..090ecfe601c
--- /dev/null
+++ b/rust/ql/test/library-tests/dataflow/strings/CONSISTENCY/PathResolutionConsistency.expected
@@ -0,0 +1,7 @@
+multiplePathResolutions
+| main.rs:52:11:52:22 | ...::from | file://:0:0:0:0 | fn from |
+| main.rs:52:11:52:22 | ...::from | file://:0:0:0:0 | fn from |
+| main.rs:52:11:52:22 | ...::from | file://:0:0:0:0 | fn from |
+| main.rs:52:11:52:22 | ...::from | file://:0:0:0:0 | fn from |
+| main.rs:52:11:52:22 | ...::from | file://:0:0:0:0 | fn from |
+| main.rs:52:11:52:22 | ...::from | file://:0:0:0:0 | fn from |
diff --git a/rust/ql/test/library-tests/dataflow/strings/inline-taint-flow.expected b/rust/ql/test/library-tests/dataflow/strings/inline-taint-flow.expected
index 63076f6b5df..5c56cf594e7 100644
--- a/rust/ql/test/library-tests/dataflow/strings/inline-taint-flow.expected
+++ b/rust/ql/test/library-tests/dataflow/strings/inline-taint-flow.expected
@@ -22,8 +22,10 @@ edges
 | main.rs:57:11:57:26 | source_slice(...) | main.rs:57:6:57:7 | s1 | provenance |  |
 | main.rs:58:6:58:7 | s2 | main.rs:59:7:59:8 | s2 | provenance |  |
 | main.rs:58:11:58:24 | s1.to_string() | main.rs:58:6:58:7 | s2 | provenance |  |
+| main.rs:63:9:63:9 | s | main.rs:64:16:64:16 | s | provenance |  |
 | main.rs:63:9:63:9 | s | main.rs:64:16:64:25 | s.as_str() | provenance | MaD:3 |
 | main.rs:63:13:63:22 | source(...) | main.rs:63:9:63:9 | s | provenance |  |
+| main.rs:64:16:64:16 | s | main.rs:64:16:64:25 | s.as_str() | provenance | MaD:3 |
 | main.rs:68:9:68:9 | s | main.rs:70:34:70:61 | MacroExpr | provenance |  |
 | main.rs:68:9:68:9 | s | main.rs:73:34:73:59 | MacroExpr | provenance |  |
 | main.rs:68:13:68:22 | source(...) | main.rs:68:9:68:9 | s | provenance |  |
@@ -75,6 +77,7 @@ nodes
 | main.rs:59:7:59:8 | s2 | semmle.label | s2 |
 | main.rs:63:9:63:9 | s | semmle.label | s |
 | main.rs:63:13:63:22 | source(...) | semmle.label | source(...) |
+| main.rs:64:16:64:16 | s | semmle.label | s |
 | main.rs:64:16:64:25 | s.as_str() | semmle.label | s.as_str() |
 | main.rs:68:9:68:9 | s | semmle.label | s |
 | main.rs:68:13:68:22 | source(...) | semmle.label | source(...) |
diff --git a/rust/ql/test/library-tests/path-resolution/main.rs b/rust/ql/test/library-tests/path-resolution/main.rs
index ce44915a9d4..3b68cff897a 100644
--- a/rust/ql/test/library-tests/path-resolution/main.rs
+++ b/rust/ql/test/library-tests/path-resolution/main.rs
@@ -285,7 +285,7 @@ mod m13 {
     pub struct f {} // I72
 
     mod m14 {
-        use crate::m13::f; // $ item=I71 item=I72
+        use zelf::m13::f; // $ item=I71 item=I72
 
         #[rustfmt::skip]
         fn g(x: f) { // $ item=I72
@@ -621,6 +621,8 @@ mod m24 {
     } // I121
 }
 
+extern crate self as zelf;
+
 fn main() {
     my::nested::nested1::nested2::f(); // $ item=I4
     my::f(); // $ item=I38
@@ -650,4 +652,5 @@ fn main() {
     m18::m19::m20::g(); // $ item=I103
     m23::f(); // $ item=I108
     m24::f(); // $ item=I121
+    zelf::h(); // $ item=I25
 }
diff --git a/rust/ql/test/library-tests/path-resolution/my.rs b/rust/ql/test/library-tests/path-resolution/my.rs
index 3d7b150214a..f2488df4959 100644
--- a/rust/ql/test/library-tests/path-resolution/my.rs
+++ b/rust/ql/test/library-tests/path-resolution/my.rs
@@ -21,7 +21,7 @@ type Result<
     T, // T
 > = ::std::result::Result<
     T, // $ item=T
-    String,> // $ item=Result
+    String,> // $ item=Result $ item=String
 ; // my::Result
 
 fn int_div(
diff --git a/rust/ql/test/library-tests/path-resolution/path-resolution.expected b/rust/ql/test/library-tests/path-resolution/path-resolution.expected
index 054905f3909..666c80dae77 100644
--- a/rust/ql/test/library-tests/path-resolution/path-resolution.expected
+++ b/rust/ql/test/library-tests/path-resolution/path-resolution.expected
@@ -61,7 +61,7 @@ resolvePath
 | main.rs:30:17:30:21 | super | main.rs:18:5:36:5 | mod m2 |
 | main.rs:30:17:30:24 | ...::f | main.rs:19:9:21:9 | fn f |
 | main.rs:33:17:33:17 | f | main.rs:19:9:21:9 | fn f |
-| main.rs:40:9:40:13 | super | main.rs:1:1:653:2 | SourceFile |
+| main.rs:40:9:40:13 | super | main.rs:1:1:656:2 | SourceFile |
 | main.rs:40:9:40:17 | ...::m1 | main.rs:13:1:37:1 | mod m1 |
 | main.rs:40:9:40:21 | ...::m2 | main.rs:18:5:36:5 | mod m2 |
 | main.rs:40:9:40:24 | ...::g | main.rs:23:9:27:9 | fn g |
@@ -73,7 +73,7 @@ resolvePath
 | main.rs:61:17:61:19 | Foo | main.rs:59:9:59:21 | struct Foo |
 | main.rs:64:13:64:15 | Foo | main.rs:53:5:53:17 | struct Foo |
 | main.rs:66:5:66:5 | f | main.rs:55:5:62:5 | fn f |
-| main.rs:68:5:68:8 | self | main.rs:1:1:653:2 | SourceFile |
+| main.rs:68:5:68:8 | self | main.rs:1:1:656:2 | SourceFile |
 | main.rs:68:5:68:11 | ...::i | main.rs:71:1:83:1 | fn i |
 | main.rs:74:13:74:15 | Foo | main.rs:48:1:48:13 | struct Foo |
 | main.rs:78:16:78:18 | i32 | {EXTERNAL LOCATION} | struct i32 |
@@ -88,7 +88,7 @@ resolvePath
 | main.rs:87:57:87:66 | ...::g | my2/nested2.rs:7:9:9:9 | fn g |
 | main.rs:87:80:87:86 | nested4 | my2/nested2.rs:2:5:10:5 | mod nested4 |
 | main.rs:100:5:100:22 | f_defined_in_macro | main.rs:99:18:99:42 | fn f_defined_in_macro |
-| main.rs:117:13:117:17 | super | main.rs:1:1:653:2 | SourceFile |
+| main.rs:117:13:117:17 | super | main.rs:1:1:656:2 | SourceFile |
 | main.rs:117:13:117:21 | ...::m5 | main.rs:103:1:107:1 | mod m5 |
 | main.rs:118:9:118:9 | f | main.rs:104:5:106:5 | fn f |
 | main.rs:118:9:118:9 | f | main.rs:110:5:112:5 | fn f |
@@ -145,10 +145,10 @@ resolvePath
 | main.rs:278:16:278:16 | T | main.rs:272:7:272:7 | T |
 | main.rs:279:14:279:17 | Self | main.rs:270:5:280:5 | trait MyParamTrait |
 | main.rs:279:14:279:33 | ...::AssociatedType | main.rs:274:9:274:28 | type AssociatedType |
-| main.rs:288:13:288:17 | crate | main.rs:0:0:0:0 | Crate(main@0.0.1) |
-| main.rs:288:13:288:22 | ...::m13 | main.rs:283:1:296:1 | mod m13 |
-| main.rs:288:13:288:25 | ...::f | main.rs:284:5:284:17 | fn f |
-| main.rs:288:13:288:25 | ...::f | main.rs:284:19:285:19 | struct f |
+| main.rs:288:13:288:16 | zelf | main.rs:0:0:0:0 | Crate(main@0.0.1) |
+| main.rs:288:13:288:21 | ...::m13 | main.rs:283:1:296:1 | mod m13 |
+| main.rs:288:13:288:24 | ...::f | main.rs:284:5:284:17 | fn f |
+| main.rs:288:13:288:24 | ...::f | main.rs:284:19:285:19 | struct f |
 | main.rs:291:17:291:17 | f | main.rs:284:19:285:19 | struct f |
 | main.rs:292:21:292:21 | f | main.rs:284:19:285:19 | struct f |
 | main.rs:293:13:293:13 | f | main.rs:284:5:284:17 | fn f |
@@ -266,65 +266,67 @@ resolvePath
 | main.rs:620:9:620:36 | GenericStruct::<...> | main.rs:563:5:566:5 | struct GenericStruct |
 | main.rs:620:9:620:47 | ...::call_both | main.rs:586:9:589:9 | fn call_both |
 | main.rs:620:25:620:35 | Implementor | main.rs:592:5:592:23 | struct Implementor |
-| main.rs:625:5:625:6 | my | main.rs:1:1:1:7 | mod my |
-| main.rs:625:5:625:14 | ...::nested | my.rs:1:1:1:15 | mod nested |
-| main.rs:625:5:625:23 | ...::nested1 | my/nested.rs:1:1:17:1 | mod nested1 |
-| main.rs:625:5:625:32 | ...::nested2 | my/nested.rs:2:5:11:5 | mod nested2 |
-| main.rs:625:5:625:35 | ...::f | my/nested.rs:3:9:5:9 | fn f |
-| main.rs:626:5:626:6 | my | main.rs:1:1:1:7 | mod my |
-| main.rs:626:5:626:9 | ...::f | my.rs:5:1:7:1 | fn f |
-| main.rs:627:5:627:11 | nested2 | my2/mod.rs:1:1:1:16 | mod nested2 |
-| main.rs:627:5:627:20 | ...::nested3 | my2/nested2.rs:1:1:11:1 | mod nested3 |
-| main.rs:627:5:627:29 | ...::nested4 | my2/nested2.rs:2:5:10:5 | mod nested4 |
-| main.rs:627:5:627:32 | ...::f | my2/nested2.rs:3:9:5:9 | fn f |
-| main.rs:628:5:628:5 | f | my2/nested2.rs:3:9:5:9 | fn f |
-| main.rs:629:5:629:5 | g | my2/nested2.rs:7:9:9:9 | fn g |
-| main.rs:630:5:630:9 | crate | main.rs:0:0:0:0 | Crate(main@0.0.1) |
-| main.rs:630:5:630:12 | ...::h | main.rs:50:1:69:1 | fn h |
-| main.rs:631:5:631:6 | m1 | main.rs:13:1:37:1 | mod m1 |
-| main.rs:631:5:631:10 | ...::m2 | main.rs:18:5:36:5 | mod m2 |
-| main.rs:631:5:631:13 | ...::g | main.rs:23:9:27:9 | fn g |
-| main.rs:632:5:632:6 | m1 | main.rs:13:1:37:1 | mod m1 |
-| main.rs:632:5:632:10 | ...::m2 | main.rs:18:5:36:5 | mod m2 |
-| main.rs:632:5:632:14 | ...::m3 | main.rs:29:9:35:9 | mod m3 |
-| main.rs:632:5:632:17 | ...::h | main.rs:30:27:34:13 | fn h |
-| main.rs:633:5:633:6 | m4 | main.rs:39:1:46:1 | mod m4 |
-| main.rs:633:5:633:9 | ...::i | main.rs:42:5:45:5 | fn i |
-| main.rs:634:5:634:5 | h | main.rs:50:1:69:1 | fn h |
-| main.rs:635:5:635:11 | f_alias | my2/nested2.rs:3:9:5:9 | fn f |
-| main.rs:636:5:636:11 | g_alias | my2/nested2.rs:7:9:9:9 | fn g |
-| main.rs:637:5:637:5 | j | main.rs:97:1:101:1 | fn j |
-| main.rs:638:5:638:6 | m6 | main.rs:109:1:120:1 | mod m6 |
-| main.rs:638:5:638:9 | ...::g | main.rs:114:5:119:5 | fn g |
-| main.rs:639:5:639:6 | m7 | main.rs:122:1:141:1 | mod m7 |
-| main.rs:639:5:639:9 | ...::f | main.rs:133:5:140:5 | fn f |
-| main.rs:640:5:640:6 | m8 | main.rs:143:1:197:1 | mod m8 |
-| main.rs:640:5:640:9 | ...::g | main.rs:181:5:196:5 | fn g |
-| main.rs:641:5:641:6 | m9 | main.rs:199:1:207:1 | mod m9 |
-| main.rs:641:5:641:9 | ...::f | main.rs:202:5:206:5 | fn f |
-| main.rs:642:5:642:7 | m11 | main.rs:230:1:267:1 | mod m11 |
-| main.rs:642:5:642:10 | ...::f | main.rs:235:5:238:5 | fn f |
-| main.rs:643:5:643:7 | m15 | main.rs:298:1:352:1 | mod m15 |
-| main.rs:643:5:643:10 | ...::f | main.rs:339:5:351:5 | fn f |
-| main.rs:644:5:644:7 | m16 | main.rs:354:1:446:1 | mod m16 |
-| main.rs:644:5:644:10 | ...::f | main.rs:421:5:445:5 | fn f |
-| main.rs:645:5:645:7 | m17 | main.rs:448:1:478:1 | mod m17 |
-| main.rs:645:5:645:10 | ...::f | main.rs:472:5:477:5 | fn f |
-| main.rs:646:5:646:11 | nested6 | my2/nested2.rs:14:5:18:5 | mod nested6 |
-| main.rs:646:5:646:14 | ...::f | my2/nested2.rs:15:9:17:9 | fn f |
-| main.rs:647:5:647:11 | nested8 | my2/nested2.rs:22:5:26:5 | mod nested8 |
-| main.rs:647:5:647:14 | ...::f | my2/nested2.rs:23:9:25:9 | fn f |
-| main.rs:648:5:648:7 | my3 | my2/mod.rs:12:1:12:12 | mod my3 |
-| main.rs:648:5:648:10 | ...::f | my2/my3/mod.rs:1:1:5:1 | fn f |
-| main.rs:649:5:649:12 | nested_f | my/my4/my5/mod.rs:1:1:3:1 | fn f |
-| main.rs:650:5:650:7 | m18 | main.rs:480:1:498:1 | mod m18 |
-| main.rs:650:5:650:12 | ...::m19 | main.rs:485:5:497:5 | mod m19 |
-| main.rs:650:5:650:17 | ...::m20 | main.rs:490:9:496:9 | mod m20 |
-| main.rs:650:5:650:20 | ...::g | main.rs:491:13:495:13 | fn g |
-| main.rs:651:5:651:7 | m23 | main.rs:527:1:552:1 | mod m23 |
-| main.rs:651:5:651:10 | ...::f | main.rs:547:5:551:5 | fn f |
-| main.rs:652:5:652:7 | m24 | main.rs:554:1:622:1 | mod m24 |
-| main.rs:652:5:652:10 | ...::f | main.rs:608:5:621:5 | fn f |
+| main.rs:627:5:627:6 | my | main.rs:1:1:1:7 | mod my |
+| main.rs:627:5:627:14 | ...::nested | my.rs:1:1:1:15 | mod nested |
+| main.rs:627:5:627:23 | ...::nested1 | my/nested.rs:1:1:17:1 | mod nested1 |
+| main.rs:627:5:627:32 | ...::nested2 | my/nested.rs:2:5:11:5 | mod nested2 |
+| main.rs:627:5:627:35 | ...::f | my/nested.rs:3:9:5:9 | fn f |
+| main.rs:628:5:628:6 | my | main.rs:1:1:1:7 | mod my |
+| main.rs:628:5:628:9 | ...::f | my.rs:5:1:7:1 | fn f |
+| main.rs:629:5:629:11 | nested2 | my2/mod.rs:1:1:1:16 | mod nested2 |
+| main.rs:629:5:629:20 | ...::nested3 | my2/nested2.rs:1:1:11:1 | mod nested3 |
+| main.rs:629:5:629:29 | ...::nested4 | my2/nested2.rs:2:5:10:5 | mod nested4 |
+| main.rs:629:5:629:32 | ...::f | my2/nested2.rs:3:9:5:9 | fn f |
+| main.rs:630:5:630:5 | f | my2/nested2.rs:3:9:5:9 | fn f |
+| main.rs:631:5:631:5 | g | my2/nested2.rs:7:9:9:9 | fn g |
+| main.rs:632:5:632:9 | crate | main.rs:0:0:0:0 | Crate(main@0.0.1) |
+| main.rs:632:5:632:12 | ...::h | main.rs:50:1:69:1 | fn h |
+| main.rs:633:5:633:6 | m1 | main.rs:13:1:37:1 | mod m1 |
+| main.rs:633:5:633:10 | ...::m2 | main.rs:18:5:36:5 | mod m2 |
+| main.rs:633:5:633:13 | ...::g | main.rs:23:9:27:9 | fn g |
+| main.rs:634:5:634:6 | m1 | main.rs:13:1:37:1 | mod m1 |
+| main.rs:634:5:634:10 | ...::m2 | main.rs:18:5:36:5 | mod m2 |
+| main.rs:634:5:634:14 | ...::m3 | main.rs:29:9:35:9 | mod m3 |
+| main.rs:634:5:634:17 | ...::h | main.rs:30:27:34:13 | fn h |
+| main.rs:635:5:635:6 | m4 | main.rs:39:1:46:1 | mod m4 |
+| main.rs:635:5:635:9 | ...::i | main.rs:42:5:45:5 | fn i |
+| main.rs:636:5:636:5 | h | main.rs:50:1:69:1 | fn h |
+| main.rs:637:5:637:11 | f_alias | my2/nested2.rs:3:9:5:9 | fn f |
+| main.rs:638:5:638:11 | g_alias | my2/nested2.rs:7:9:9:9 | fn g |
+| main.rs:639:5:639:5 | j | main.rs:97:1:101:1 | fn j |
+| main.rs:640:5:640:6 | m6 | main.rs:109:1:120:1 | mod m6 |
+| main.rs:640:5:640:9 | ...::g | main.rs:114:5:119:5 | fn g |
+| main.rs:641:5:641:6 | m7 | main.rs:122:1:141:1 | mod m7 |
+| main.rs:641:5:641:9 | ...::f | main.rs:133:5:140:5 | fn f |
+| main.rs:642:5:642:6 | m8 | main.rs:143:1:197:1 | mod m8 |
+| main.rs:642:5:642:9 | ...::g | main.rs:181:5:196:5 | fn g |
+| main.rs:643:5:643:6 | m9 | main.rs:199:1:207:1 | mod m9 |
+| main.rs:643:5:643:9 | ...::f | main.rs:202:5:206:5 | fn f |
+| main.rs:644:5:644:7 | m11 | main.rs:230:1:267:1 | mod m11 |
+| main.rs:644:5:644:10 | ...::f | main.rs:235:5:238:5 | fn f |
+| main.rs:645:5:645:7 | m15 | main.rs:298:1:352:1 | mod m15 |
+| main.rs:645:5:645:10 | ...::f | main.rs:339:5:351:5 | fn f |
+| main.rs:646:5:646:7 | m16 | main.rs:354:1:446:1 | mod m16 |
+| main.rs:646:5:646:10 | ...::f | main.rs:421:5:445:5 | fn f |
+| main.rs:647:5:647:7 | m17 | main.rs:448:1:478:1 | mod m17 |
+| main.rs:647:5:647:10 | ...::f | main.rs:472:5:477:5 | fn f |
+| main.rs:648:5:648:11 | nested6 | my2/nested2.rs:14:5:18:5 | mod nested6 |
+| main.rs:648:5:648:14 | ...::f | my2/nested2.rs:15:9:17:9 | fn f |
+| main.rs:649:5:649:11 | nested8 | my2/nested2.rs:22:5:26:5 | mod nested8 |
+| main.rs:649:5:649:14 | ...::f | my2/nested2.rs:23:9:25:9 | fn f |
+| main.rs:650:5:650:7 | my3 | my2/mod.rs:12:1:12:12 | mod my3 |
+| main.rs:650:5:650:10 | ...::f | my2/my3/mod.rs:1:1:5:1 | fn f |
+| main.rs:651:5:651:12 | nested_f | my/my4/my5/mod.rs:1:1:3:1 | fn f |
+| main.rs:652:5:652:7 | m18 | main.rs:480:1:498:1 | mod m18 |
+| main.rs:652:5:652:12 | ...::m19 | main.rs:485:5:497:5 | mod m19 |
+| main.rs:652:5:652:17 | ...::m20 | main.rs:490:9:496:9 | mod m20 |
+| main.rs:652:5:652:20 | ...::g | main.rs:491:13:495:13 | fn g |
+| main.rs:653:5:653:7 | m23 | main.rs:527:1:552:1 | mod m23 |
+| main.rs:653:5:653:10 | ...::f | main.rs:547:5:551:5 | fn f |
+| main.rs:654:5:654:7 | m24 | main.rs:554:1:622:1 | mod m24 |
+| main.rs:654:5:654:10 | ...::f | main.rs:608:5:621:5 | fn f |
+| main.rs:655:5:655:8 | zelf | main.rs:0:0:0:0 | Crate(main@0.0.1) |
+| main.rs:655:5:655:11 | ...::h | main.rs:50:1:69:1 | fn h |
 | my2/mod.rs:5:5:5:11 | nested2 | my2/mod.rs:1:1:1:16 | mod nested2 |
 | my2/mod.rs:5:5:5:20 | ...::nested3 | my2/nested2.rs:1:1:11:1 | mod nested3 |
 | my2/mod.rs:5:5:5:29 | ...::nested4 | my2/nested2.rs:2:5:10:5 | mod nested4 |
@@ -340,7 +342,7 @@ resolvePath
 | my2/my3/mod.rs:3:5:3:5 | g | my2/mod.rs:3:1:6:1 | fn g |
 | my2/my3/mod.rs:4:5:4:5 | h | main.rs:50:1:69:1 | fn h |
 | my2/my3/mod.rs:7:5:7:9 | super | my2/mod.rs:1:1:17:30 | SourceFile |
-| my2/my3/mod.rs:7:5:7:16 | ...::super | main.rs:1:1:653:2 | SourceFile |
+| my2/my3/mod.rs:7:5:7:16 | ...::super | main.rs:1:1:656:2 | SourceFile |
 | my2/my3/mod.rs:7:5:7:19 | ...::h | main.rs:50:1:69:1 | fn h |
 | my2/my3/mod.rs:8:5:8:9 | super | my2/mod.rs:1:1:17:30 | SourceFile |
 | my2/my3/mod.rs:8:5:8:12 | ...::g | my2/mod.rs:3:1:6:1 | fn g |
@@ -354,6 +356,7 @@ resolvePath
 | my.rs:22:5:22:17 | ...::result | {EXTERNAL LOCATION} | mod result |
 | my.rs:22:5:24:12 | ...::Result::<...> | {EXTERNAL LOCATION} | enum Result |
 | my.rs:23:5:23:5 | T | my.rs:21:5:21:5 | T |
+| my.rs:24:5:24:10 | String | {EXTERNAL LOCATION} | struct String |
 | my.rs:28:8:28:10 | i32 | {EXTERNAL LOCATION} | struct i32 |
 | my.rs:29:8:29:10 | i32 | {EXTERNAL LOCATION} | struct i32 |
 | my.rs:30:6:30:16 | Result::<...> | my.rs:18:34:25:1 | type Result<...> |
diff --git a/rust/ql/test/library-tests/type-inference/main.rs b/rust/ql/test/library-tests/type-inference/main.rs
index 36d3f5a82ea..1b72e15afc9 100644
--- a/rust/ql/test/library-tests/type-inference/main.rs
+++ b/rust/ql/test/library-tests/type-inference/main.rs
@@ -697,7 +697,7 @@ mod trait_associated_type {
         println!("{:?}", x3.put(1).unwrap()); // $ method=S::put method=unwrap
 
         // Call to default implementation in `trait` block
-        println!("{:?}", x3.putTwo(2, 3).unwrap()); // $ method=putTwo MISSING: method=unwrap
+        println!("{:?}", x3.putTwo(2, 3).unwrap()); // $ method=putTwo method=unwrap
 
         let x4 = g(S); // $ MISSING: type=x4:AT
         println!("{:?}", x4);
@@ -1098,9 +1098,9 @@ mod method_call_type_conversion {
         println!("{:?}", x5.m1()); // $ method=m1
         println!("{:?}", x5.0); // $ fieldof=S
 
-        let x6 = &S(S2);
+        let x6 = &S(S2); // $ SPURIOUS: type=x6:&T.&T.S
         // explicit dereference
-        println!("{:?}", (*x6).m1()); // $ method=m1
+        println!("{:?}", (*x6).m1()); // $ method=m1 method=deref
 
         let x7 = S(&S2);
         // Non-implicit dereference with nested borrow in order to test that the
@@ -1154,6 +1154,17 @@ mod implicit_self_borrow {
 }
 
 mod borrowed_typed {
+    #[derive(Debug, Copy, Clone, Default)]
+    struct MyFlag {
+        bool: bool,
+    }
+
+    impl MyFlag {
+        fn flip(&mut self) {
+            self.bool = !self.bool; // $ fieldof=MyFlag method=not
+        }
+    }
+
     struct S;
 
     impl S {
@@ -1179,6 +1190,14 @@ mod borrowed_typed {
         x.f1(); // $ method=f1
         x.f2(); // $ method=f2
         S::f3(&x);
+
+        let n = **&&true; // $ type=n:bool method=deref
+
+        // In this example the type of `flag` must be inferred at the call to
+        // `flip` and flow through the borrow in the argument.
+        let mut flag = Default::default();
+        MyFlag::flip(&mut flag);
+        println!("{:?}", flag); // $ type=flag:MyFlag
     }
 }
 
@@ -1630,6 +1649,162 @@ mod overloadable_operators {
     }
 }
 
+mod async_ {
+    use std::future::Future;
+
+    struct S1;
+
+    impl S1 {
+        pub fn f(self) {} // S1f
+    }
+
+    async fn f1() -> S1 {
+        S1
+    }
+
+    fn f2() -> impl Future<Output = S1> {
+        async {
+            S1
+        }
+    }
+
+    struct S2;
+
+    impl Future for S2 {
+        type Output = S1;
+
+        fn poll(self: std::pin::Pin<&mut Self>, _cx: &mut std::task::Context<'_>) -> std::task::Poll<Self::Output> {
+            std::task::Poll::Ready(S1)
+        }
+    }
+
+    fn f3() -> impl Future<Output = S1> {
+        S2
+    }
+
+    pub async fn f() {
+        f1().await.f(); // $ method=S1f
+        f2().await.f(); // $ method=S1f
+        f3().await.f(); // $ method=S1f
+        S2.await.f(); // $ method=S1f
+        let b = async {
+            S1
+        };
+        b.await.f(); // $ method=S1f
+    }
+}
+
+
+mod impl_trait {
+    struct S1;
+    struct S2;
+
+    trait Trait1 {
+        fn f1(&self) {} // Trait1f1
+    }
+
+    trait Trait2 {
+        fn f2(&self) {} // Trait2f2
+    }
+
+    impl Trait1 for S1 {
+        fn f1(&self) {} // S1f1
+    }
+
+    impl Trait2 for S1 {
+        fn f2(&self) {} // S1f2
+    }
+
+    fn f1() -> impl Trait1 + Trait2 {
+        S1
+    }
+
+    trait MyTrait<A> {
+        fn get_a(&self) -> A; // MyTrait::get_a
+    }
+
+    impl MyTrait<S2> for S1 {
+        fn get_a(&self) -> S2 {
+            S2
+        }
+    }
+
+    fn get_a_my_trait() -> impl MyTrait<S2> {
+        S1
+    }
+
+    fn uses_my_trait1<A, B: MyTrait<A>>(t: B) -> A {
+        t.get_a() // $ method=MyTrait::get_a
+    }
+
+    fn uses_my_trait2<A>(t: impl MyTrait<A>) -> A {
+        t.get_a() // $ method=MyTrait::get_a
+    }
+
+    pub fn f() {
+        let x = f1();
+        x.f1(); // $ method=Trait1f1
+        x.f2(); // $ method=Trait2f2
+        let a = get_a_my_trait();
+        let b = uses_my_trait1(a); // $ type=b:S2
+        let a = get_a_my_trait();
+        let c = uses_my_trait2(a); // $ type=c:S2
+        let d = uses_my_trait2(S1); // $ type=d:S2
+    }
+}
+
+mod indexers {
+    use std::ops::Index;
+
+    #[derive(Debug)]
+    struct S;
+
+    impl S {
+        fn foo(&self) -> Self {
+            S
+        }
+    }
+
+    #[derive(Debug)]
+    struct MyVec<T> {
+        data: Vec<T>,
+    }
+
+    impl<T> MyVec<T> {
+        fn new() -> Self {
+            MyVec { data: Vec::new() }
+        }
+
+        fn push(&mut self, value: T) {
+            self.data.push(value); // $ fieldof=MyVec method=push
+        }
+    }
+
+    impl<T> Index<usize> for MyVec<T> {
+        type Output = T;
+
+        // MyVec::index
+        fn index(&self, index: usize) -> &Self::Output {
+            &self.data[index] // $ fieldof=MyVec
+        }
+    }
+
+    fn analyze_slice(slice: &[S]) {
+        let x = slice[0].foo(); // $ method=foo type=x:S
+    }
+
+    pub fn f() {
+        let mut vec = MyVec::new(); // $ type=vec:T.S
+        vec.push(S); // $ method=push
+        vec[0].foo(); // $ MISSING: method=foo -- type inference does not support the `Index` trait yet
+
+        let xs: [S; 1] = [S];
+        let x = xs[0].foo(); // $ method=foo type=x:S
+
+        analyze_slice(&xs);
+    }
+}
+
 fn main() {
     field_access::f();
     method_impl::f();
@@ -1649,4 +1824,7 @@ fn main() {
     try_expressions::f();
     builtins::f();
     operators::f();
+    async_::f();
+    impl_trait::f();
+    indexers::f();
 }
diff --git a/rust/ql/test/library-tests/type-inference/type-inference.expected b/rust/ql/test/library-tests/type-inference/type-inference.expected
index ff33ad89cb8..bb45bea016a 100644
--- a/rust/ql/test/library-tests/type-inference/type-inference.expected
+++ b/rust/ql/test/library-tests/type-inference/type-inference.expected
@@ -778,6 +778,9 @@ inferType
 | main.rs:697:33:697:33 | 1 |  | {EXTERNAL LOCATION} | i32 |
 | main.rs:700:18:700:23 | "{:?}\\n" |  | {EXTERNAL LOCATION} | str |
 | main.rs:700:26:700:27 | x3 |  | main.rs:619:5:620:13 | S |
+| main.rs:700:26:700:40 | x3.putTwo(...) |  | main.rs:568:5:571:5 | Wrapper |
+| main.rs:700:26:700:40 | x3.putTwo(...) | A | main.rs:639:36:639:50 | AssociatedParam |
+| main.rs:700:26:700:49 | ... .unwrap() |  | main.rs:639:36:639:50 | AssociatedParam |
 | main.rs:700:36:700:36 | 2 |  | {EXTERNAL LOCATION} | i32 |
 | main.rs:700:39:700:39 | 3 |  | {EXTERNAL LOCATION} | i32 |
 | main.rs:702:20:702:20 | S |  | main.rs:619:5:620:13 | S |
@@ -1352,22 +1355,40 @@ inferType
 | main.rs:1099:26:1099:27 | x5 | &T.T | main.rs:1060:5:1061:14 | S2 |
 | main.rs:1099:26:1099:29 | x5.0 |  | main.rs:1060:5:1061:14 | S2 |
 | main.rs:1101:13:1101:14 | x6 |  | file://:0:0:0:0 | & |
+| main.rs:1101:13:1101:14 | x6 | &T | file://:0:0:0:0 | & |
 | main.rs:1101:13:1101:14 | x6 | &T | main.rs:1057:5:1058:19 | S |
+| main.rs:1101:13:1101:14 | x6 | &T.&T | main.rs:1057:5:1058:19 | S |
+| main.rs:1101:13:1101:14 | x6 | &T.&T.T | main.rs:1060:5:1061:14 | S2 |
 | main.rs:1101:13:1101:14 | x6 | &T.T | main.rs:1060:5:1061:14 | S2 |
 | main.rs:1101:18:1101:23 | &... |  | file://:0:0:0:0 | & |
+| main.rs:1101:18:1101:23 | &... | &T | file://:0:0:0:0 | & |
 | main.rs:1101:18:1101:23 | &... | &T | main.rs:1057:5:1058:19 | S |
+| main.rs:1101:18:1101:23 | &... | &T.&T | main.rs:1057:5:1058:19 | S |
+| main.rs:1101:18:1101:23 | &... | &T.&T.T | main.rs:1060:5:1061:14 | S2 |
 | main.rs:1101:18:1101:23 | &... | &T.T | main.rs:1060:5:1061:14 | S2 |
+| main.rs:1101:19:1101:23 | S(...) |  | file://:0:0:0:0 | & |
 | main.rs:1101:19:1101:23 | S(...) |  | main.rs:1057:5:1058:19 | S |
+| main.rs:1101:19:1101:23 | S(...) | &T | main.rs:1057:5:1058:19 | S |
+| main.rs:1101:19:1101:23 | S(...) | &T.T | main.rs:1060:5:1061:14 | S2 |
 | main.rs:1101:19:1101:23 | S(...) | T | main.rs:1060:5:1061:14 | S2 |
 | main.rs:1101:21:1101:22 | S2 |  | main.rs:1060:5:1061:14 | S2 |
 | main.rs:1103:18:1103:23 | "{:?}\\n" |  | {EXTERNAL LOCATION} | str |
+| main.rs:1103:26:1103:30 | (...) |  | file://:0:0:0:0 | & |
 | main.rs:1103:26:1103:30 | (...) |  | main.rs:1057:5:1058:19 | S |
+| main.rs:1103:26:1103:30 | (...) | &T | main.rs:1057:5:1058:19 | S |
+| main.rs:1103:26:1103:30 | (...) | &T.T | main.rs:1060:5:1061:14 | S2 |
 | main.rs:1103:26:1103:30 | (...) | T | main.rs:1060:5:1061:14 | S2 |
 | main.rs:1103:26:1103:35 | ... .m1() |  | main.rs:1060:5:1061:14 | S2 |
+| main.rs:1103:27:1103:29 | * ... |  | file://:0:0:0:0 | & |
 | main.rs:1103:27:1103:29 | * ... |  | main.rs:1057:5:1058:19 | S |
+| main.rs:1103:27:1103:29 | * ... | &T | main.rs:1057:5:1058:19 | S |
+| main.rs:1103:27:1103:29 | * ... | &T.T | main.rs:1060:5:1061:14 | S2 |
 | main.rs:1103:27:1103:29 | * ... | T | main.rs:1060:5:1061:14 | S2 |
 | main.rs:1103:28:1103:29 | x6 |  | file://:0:0:0:0 | & |
+| main.rs:1103:28:1103:29 | x6 | &T | file://:0:0:0:0 | & |
 | main.rs:1103:28:1103:29 | x6 | &T | main.rs:1057:5:1058:19 | S |
+| main.rs:1103:28:1103:29 | x6 | &T.&T | main.rs:1057:5:1058:19 | S |
+| main.rs:1103:28:1103:29 | x6 | &T.&T.T | main.rs:1060:5:1061:14 | S2 |
 | main.rs:1103:28:1103:29 | x6 | &T.T | main.rs:1060:5:1061:14 | S2 |
 | main.rs:1105:13:1105:14 | x7 |  | main.rs:1057:5:1058:19 | S |
 | main.rs:1105:13:1105:14 | x7 | T | file://:0:0:0:0 | & |
@@ -1429,953 +1450,1193 @@ inferType
 | main.rs:1152:9:1152:15 | x.foo() |  | file://:0:0:0:0 | & |
 | main.rs:1152:9:1152:15 | x.foo() | &T | main.rs:1142:5:1142:26 | MyStruct |
 | main.rs:1152:9:1152:15 | x.foo() | &T.T | main.rs:1140:5:1140:13 | S |
-| main.rs:1160:15:1160:19 | SelfParam |  | file://:0:0:0:0 | & |
-| main.rs:1160:15:1160:19 | SelfParam | &T | main.rs:1157:5:1157:13 | S |
-| main.rs:1160:31:1162:9 | { ... } |  | file://:0:0:0:0 | & |
-| main.rs:1160:31:1162:9 | { ... } | &T | main.rs:1157:5:1157:13 | S |
-| main.rs:1161:13:1161:19 | &... |  | file://:0:0:0:0 | & |
-| main.rs:1161:13:1161:19 | &... | &T | main.rs:1157:5:1157:13 | S |
-| main.rs:1161:14:1161:19 | &... |  | file://:0:0:0:0 | & |
-| main.rs:1161:14:1161:19 | &... | &T | main.rs:1157:5:1157:13 | S |
-| main.rs:1161:15:1161:19 | &self |  | file://:0:0:0:0 | & |
-| main.rs:1161:15:1161:19 | &self | &T | main.rs:1157:5:1157:13 | S |
-| main.rs:1161:16:1161:19 | self |  | file://:0:0:0:0 | & |
-| main.rs:1161:16:1161:19 | self | &T | main.rs:1157:5:1157:13 | S |
-| main.rs:1164:15:1164:25 | SelfParam |  | file://:0:0:0:0 | & |
-| main.rs:1164:15:1164:25 | SelfParam | &T | main.rs:1157:5:1157:13 | S |
-| main.rs:1164:37:1166:9 | { ... } |  | file://:0:0:0:0 | & |
-| main.rs:1164:37:1166:9 | { ... } | &T | main.rs:1157:5:1157:13 | S |
-| main.rs:1165:13:1165:19 | &... |  | file://:0:0:0:0 | & |
-| main.rs:1165:13:1165:19 | &... | &T | main.rs:1157:5:1157:13 | S |
-| main.rs:1165:14:1165:19 | &... |  | file://:0:0:0:0 | & |
-| main.rs:1165:14:1165:19 | &... | &T | main.rs:1157:5:1157:13 | S |
-| main.rs:1165:15:1165:19 | &self |  | file://:0:0:0:0 | & |
-| main.rs:1165:15:1165:19 | &self | &T | main.rs:1157:5:1157:13 | S |
-| main.rs:1165:16:1165:19 | self |  | file://:0:0:0:0 | & |
-| main.rs:1165:16:1165:19 | self | &T | main.rs:1157:5:1157:13 | S |
-| main.rs:1168:15:1168:15 | x |  | file://:0:0:0:0 | & |
-| main.rs:1168:15:1168:15 | x | &T | main.rs:1157:5:1157:13 | S |
-| main.rs:1168:34:1170:9 | { ... } |  | file://:0:0:0:0 | & |
-| main.rs:1168:34:1170:9 | { ... } | &T | main.rs:1157:5:1157:13 | S |
-| main.rs:1169:13:1169:13 | x |  | file://:0:0:0:0 | & |
-| main.rs:1169:13:1169:13 | x | &T | main.rs:1157:5:1157:13 | S |
-| main.rs:1172:15:1172:15 | x |  | file://:0:0:0:0 | & |
-| main.rs:1172:15:1172:15 | x | &T | main.rs:1157:5:1157:13 | S |
-| main.rs:1172:34:1174:9 | { ... } |  | file://:0:0:0:0 | & |
-| main.rs:1172:34:1174:9 | { ... } | &T | main.rs:1157:5:1157:13 | S |
-| main.rs:1173:13:1173:16 | &... |  | file://:0:0:0:0 | & |
-| main.rs:1173:13:1173:16 | &... | &T | main.rs:1157:5:1157:13 | S |
-| main.rs:1173:14:1173:16 | &... |  | file://:0:0:0:0 | & |
-| main.rs:1173:14:1173:16 | &... | &T | main.rs:1157:5:1157:13 | S |
-| main.rs:1173:15:1173:16 | &x |  | file://:0:0:0:0 | & |
-| main.rs:1173:15:1173:16 | &x | &T | main.rs:1157:5:1157:13 | S |
-| main.rs:1173:16:1173:16 | x |  | file://:0:0:0:0 | & |
-| main.rs:1173:16:1173:16 | x | &T | main.rs:1157:5:1157:13 | S |
-| main.rs:1178:13:1178:13 | x |  | main.rs:1157:5:1157:13 | S |
-| main.rs:1178:17:1178:20 | S {...} |  | main.rs:1157:5:1157:13 | S |
-| main.rs:1179:9:1179:9 | x |  | main.rs:1157:5:1157:13 | S |
-| main.rs:1179:9:1179:14 | x.f1() |  | file://:0:0:0:0 | & |
-| main.rs:1179:9:1179:14 | x.f1() | &T | main.rs:1157:5:1157:13 | S |
-| main.rs:1180:9:1180:9 | x |  | main.rs:1157:5:1157:13 | S |
-| main.rs:1180:9:1180:14 | x.f2() |  | file://:0:0:0:0 | & |
-| main.rs:1180:9:1180:14 | x.f2() | &T | main.rs:1157:5:1157:13 | S |
-| main.rs:1181:9:1181:17 | ...::f3(...) |  | file://:0:0:0:0 | & |
-| main.rs:1181:9:1181:17 | ...::f3(...) | &T | main.rs:1157:5:1157:13 | S |
-| main.rs:1181:15:1181:16 | &x |  | file://:0:0:0:0 | & |
-| main.rs:1181:15:1181:16 | &x | &T | main.rs:1157:5:1157:13 | S |
-| main.rs:1181:16:1181:16 | x |  | main.rs:1157:5:1157:13 | S |
-| main.rs:1195:43:1198:5 | { ... } |  | {EXTERNAL LOCATION} | Result |
-| main.rs:1195:43:1198:5 | { ... } | E | main.rs:1188:5:1189:14 | S1 |
-| main.rs:1195:43:1198:5 | { ... } | T | main.rs:1188:5:1189:14 | S1 |
-| main.rs:1196:13:1196:13 | x |  | main.rs:1188:5:1189:14 | S1 |
-| main.rs:1196:17:1196:30 | ...::Ok(...) |  | {EXTERNAL LOCATION} | Result |
-| main.rs:1196:17:1196:30 | ...::Ok(...) | T | main.rs:1188:5:1189:14 | S1 |
-| main.rs:1196:17:1196:31 | TryExpr |  | main.rs:1188:5:1189:14 | S1 |
-| main.rs:1196:28:1196:29 | S1 |  | main.rs:1188:5:1189:14 | S1 |
-| main.rs:1197:9:1197:22 | ...::Ok(...) |  | {EXTERNAL LOCATION} | Result |
-| main.rs:1197:9:1197:22 | ...::Ok(...) | E | main.rs:1188:5:1189:14 | S1 |
-| main.rs:1197:9:1197:22 | ...::Ok(...) | T | main.rs:1188:5:1189:14 | S1 |
-| main.rs:1197:20:1197:21 | S1 |  | main.rs:1188:5:1189:14 | S1 |
-| main.rs:1201:46:1205:5 | { ... } |  | {EXTERNAL LOCATION} | Result |
-| main.rs:1201:46:1205:5 | { ... } | E | main.rs:1191:5:1192:14 | S2 |
-| main.rs:1201:46:1205:5 | { ... } | T | main.rs:1188:5:1189:14 | S1 |
-| main.rs:1202:13:1202:13 | x |  | {EXTERNAL LOCATION} | Result |
-| main.rs:1202:13:1202:13 | x | T | main.rs:1188:5:1189:14 | S1 |
-| main.rs:1202:17:1202:30 | ...::Ok(...) |  | {EXTERNAL LOCATION} | Result |
-| main.rs:1202:17:1202:30 | ...::Ok(...) | T | main.rs:1188:5:1189:14 | S1 |
-| main.rs:1202:28:1202:29 | S1 |  | main.rs:1188:5:1189:14 | S1 |
-| main.rs:1203:13:1203:13 | y |  | main.rs:1188:5:1189:14 | S1 |
-| main.rs:1203:17:1203:17 | x |  | {EXTERNAL LOCATION} | Result |
-| main.rs:1203:17:1203:17 | x | T | main.rs:1188:5:1189:14 | S1 |
-| main.rs:1203:17:1203:18 | TryExpr |  | main.rs:1188:5:1189:14 | S1 |
-| main.rs:1204:9:1204:22 | ...::Ok(...) |  | {EXTERNAL LOCATION} | Result |
-| main.rs:1204:9:1204:22 | ...::Ok(...) | E | main.rs:1191:5:1192:14 | S2 |
-| main.rs:1204:9:1204:22 | ...::Ok(...) | T | main.rs:1188:5:1189:14 | S1 |
-| main.rs:1204:20:1204:21 | S1 |  | main.rs:1188:5:1189:14 | S1 |
-| main.rs:1208:40:1213:5 | { ... } |  | {EXTERNAL LOCATION} | Result |
-| main.rs:1208:40:1213:5 | { ... } | E | main.rs:1191:5:1192:14 | S2 |
-| main.rs:1208:40:1213:5 | { ... } | T | main.rs:1188:5:1189:14 | S1 |
-| main.rs:1209:13:1209:13 | x |  | {EXTERNAL LOCATION} | Result |
-| main.rs:1209:13:1209:13 | x | T | {EXTERNAL LOCATION} | Result |
-| main.rs:1209:13:1209:13 | x | T.T | main.rs:1188:5:1189:14 | S1 |
-| main.rs:1209:17:1209:42 | ...::Ok(...) |  | {EXTERNAL LOCATION} | Result |
-| main.rs:1209:17:1209:42 | ...::Ok(...) | T | {EXTERNAL LOCATION} | Result |
-| main.rs:1209:17:1209:42 | ...::Ok(...) | T.T | main.rs:1188:5:1189:14 | S1 |
-| main.rs:1209:28:1209:41 | ...::Ok(...) |  | {EXTERNAL LOCATION} | Result |
-| main.rs:1209:28:1209:41 | ...::Ok(...) | T | main.rs:1188:5:1189:14 | S1 |
-| main.rs:1209:39:1209:40 | S1 |  | main.rs:1188:5:1189:14 | S1 |
-| main.rs:1211:17:1211:17 | x |  | {EXTERNAL LOCATION} | Result |
-| main.rs:1211:17:1211:17 | x | T | {EXTERNAL LOCATION} | Result |
-| main.rs:1211:17:1211:17 | x | T.T | main.rs:1188:5:1189:14 | S1 |
-| main.rs:1211:17:1211:18 | TryExpr |  | {EXTERNAL LOCATION} | Result |
-| main.rs:1211:17:1211:18 | TryExpr | T | main.rs:1188:5:1189:14 | S1 |
-| main.rs:1211:17:1211:29 | ... .map(...) |  | {EXTERNAL LOCATION} | Result |
-| main.rs:1212:9:1212:22 | ...::Ok(...) |  | {EXTERNAL LOCATION} | Result |
-| main.rs:1212:9:1212:22 | ...::Ok(...) | E | main.rs:1191:5:1192:14 | S2 |
-| main.rs:1212:9:1212:22 | ...::Ok(...) | T | main.rs:1188:5:1189:14 | S1 |
-| main.rs:1212:20:1212:21 | S1 |  | main.rs:1188:5:1189:14 | S1 |
-| main.rs:1216:30:1216:34 | input |  | {EXTERNAL LOCATION} | Result |
-| main.rs:1216:30:1216:34 | input | E | main.rs:1188:5:1189:14 | S1 |
-| main.rs:1216:30:1216:34 | input | T | main.rs:1216:20:1216:27 | T |
-| main.rs:1216:69:1223:5 | { ... } |  | {EXTERNAL LOCATION} | Result |
-| main.rs:1216:69:1223:5 | { ... } | E | main.rs:1188:5:1189:14 | S1 |
-| main.rs:1216:69:1223:5 | { ... } | T | main.rs:1216:20:1216:27 | T |
-| main.rs:1217:13:1217:17 | value |  | main.rs:1216:20:1216:27 | T |
-| main.rs:1217:21:1217:25 | input |  | {EXTERNAL LOCATION} | Result |
-| main.rs:1217:21:1217:25 | input | E | main.rs:1188:5:1189:14 | S1 |
-| main.rs:1217:21:1217:25 | input | T | main.rs:1216:20:1216:27 | T |
-| main.rs:1217:21:1217:26 | TryExpr |  | main.rs:1216:20:1216:27 | T |
-| main.rs:1218:22:1218:38 | ...::Ok(...) |  | {EXTERNAL LOCATION} | Result |
-| main.rs:1218:22:1218:38 | ...::Ok(...) | T | main.rs:1216:20:1216:27 | T |
-| main.rs:1218:22:1221:10 | ... .and_then(...) |  | {EXTERNAL LOCATION} | Result |
-| main.rs:1218:33:1218:37 | value |  | main.rs:1216:20:1216:27 | T |
-| main.rs:1218:53:1221:9 | { ... } |  | {EXTERNAL LOCATION} | Result |
-| main.rs:1218:53:1221:9 | { ... } | E | main.rs:1188:5:1189:14 | S1 |
-| main.rs:1219:22:1219:27 | "{:?}\\n" |  | {EXTERNAL LOCATION} | str |
-| main.rs:1220:13:1220:34 | ...::Ok::<...>(...) |  | {EXTERNAL LOCATION} | Result |
-| main.rs:1220:13:1220:34 | ...::Ok::<...>(...) | E | main.rs:1188:5:1189:14 | S1 |
-| main.rs:1222:9:1222:23 | ...::Err(...) |  | {EXTERNAL LOCATION} | Result |
-| main.rs:1222:9:1222:23 | ...::Err(...) | E | main.rs:1188:5:1189:14 | S1 |
-| main.rs:1222:9:1222:23 | ...::Err(...) | T | main.rs:1216:20:1216:27 | T |
-| main.rs:1222:21:1222:22 | S1 |  | main.rs:1188:5:1189:14 | S1 |
-| main.rs:1226:37:1226:52 | try_same_error(...) |  | {EXTERNAL LOCATION} | Result |
-| main.rs:1226:37:1226:52 | try_same_error(...) | E | main.rs:1188:5:1189:14 | S1 |
-| main.rs:1226:37:1226:52 | try_same_error(...) | T | main.rs:1188:5:1189:14 | S1 |
-| main.rs:1227:22:1227:27 | "{:?}\\n" |  | {EXTERNAL LOCATION} | str |
-| main.rs:1230:37:1230:55 | try_convert_error(...) |  | {EXTERNAL LOCATION} | Result |
-| main.rs:1230:37:1230:55 | try_convert_error(...) | E | main.rs:1191:5:1192:14 | S2 |
-| main.rs:1230:37:1230:55 | try_convert_error(...) | T | main.rs:1188:5:1189:14 | S1 |
-| main.rs:1231:22:1231:27 | "{:?}\\n" |  | {EXTERNAL LOCATION} | str |
-| main.rs:1234:37:1234:49 | try_chained(...) |  | {EXTERNAL LOCATION} | Result |
-| main.rs:1234:37:1234:49 | try_chained(...) | E | main.rs:1191:5:1192:14 | S2 |
-| main.rs:1234:37:1234:49 | try_chained(...) | T | main.rs:1188:5:1189:14 | S1 |
-| main.rs:1235:22:1235:27 | "{:?}\\n" |  | {EXTERNAL LOCATION} | str |
-| main.rs:1238:37:1238:63 | try_complex(...) |  | {EXTERNAL LOCATION} | Result |
-| main.rs:1238:37:1238:63 | try_complex(...) | E | main.rs:1188:5:1189:14 | S1 |
-| main.rs:1238:37:1238:63 | try_complex(...) | T | main.rs:1188:5:1189:14 | S1 |
-| main.rs:1238:49:1238:62 | ...::Ok(...) |  | {EXTERNAL LOCATION} | Result |
-| main.rs:1238:49:1238:62 | ...::Ok(...) | E | main.rs:1188:5:1189:14 | S1 |
-| main.rs:1238:49:1238:62 | ...::Ok(...) | T | main.rs:1188:5:1189:14 | S1 |
-| main.rs:1238:60:1238:61 | S1 |  | main.rs:1188:5:1189:14 | S1 |
-| main.rs:1239:22:1239:27 | "{:?}\\n" |  | {EXTERNAL LOCATION} | str |
-| main.rs:1246:13:1246:13 | x |  | {EXTERNAL LOCATION} | i32 |
-| main.rs:1246:22:1246:22 | 1 |  | {EXTERNAL LOCATION} | i32 |
-| main.rs:1247:13:1247:13 | y |  | {EXTERNAL LOCATION} | i32 |
-| main.rs:1247:17:1247:17 | 2 |  | {EXTERNAL LOCATION} | i32 |
-| main.rs:1248:13:1248:13 | z |  | {EXTERNAL LOCATION} | i32 |
-| main.rs:1248:17:1248:17 | x |  | {EXTERNAL LOCATION} | i32 |
-| main.rs:1248:17:1248:21 | ... + ... |  | {EXTERNAL LOCATION} | i32 |
-| main.rs:1248:21:1248:21 | y |  | {EXTERNAL LOCATION} | i32 |
-| main.rs:1249:13:1249:13 | z |  | {EXTERNAL LOCATION} | i32 |
-| main.rs:1249:17:1249:17 | x |  | {EXTERNAL LOCATION} | i32 |
-| main.rs:1249:17:1249:23 | x.abs() |  | {EXTERNAL LOCATION} | i32 |
-| main.rs:1250:13:1250:13 | c |  | {EXTERNAL LOCATION} | char |
-| main.rs:1250:17:1250:19 | 'c' |  | {EXTERNAL LOCATION} | char |
-| main.rs:1251:13:1251:17 | hello |  | {EXTERNAL LOCATION} | str |
-| main.rs:1251:21:1251:27 | "Hello" |  | {EXTERNAL LOCATION} | str |
-| main.rs:1252:13:1252:13 | f |  | {EXTERNAL LOCATION} | f64 |
-| main.rs:1252:17:1252:24 | 123.0f64 |  | {EXTERNAL LOCATION} | f64 |
-| main.rs:1253:13:1253:13 | t |  | {EXTERNAL LOCATION} | bool |
-| main.rs:1253:17:1253:20 | true |  | {EXTERNAL LOCATION} | bool |
-| main.rs:1254:13:1254:13 | f |  | {EXTERNAL LOCATION} | bool |
-| main.rs:1254:17:1254:21 | false |  | {EXTERNAL LOCATION} | bool |
-| main.rs:1261:13:1261:13 | x |  | {EXTERNAL LOCATION} | bool |
-| main.rs:1261:17:1261:20 | true |  | {EXTERNAL LOCATION} | bool |
-| main.rs:1261:17:1261:29 | ... && ... |  | {EXTERNAL LOCATION} | bool |
-| main.rs:1261:25:1261:29 | false |  | {EXTERNAL LOCATION} | bool |
-| main.rs:1262:13:1262:13 | y |  | {EXTERNAL LOCATION} | bool |
-| main.rs:1262:17:1262:20 | true |  | {EXTERNAL LOCATION} | bool |
-| main.rs:1262:17:1262:29 | ... \|\| ... |  | {EXTERNAL LOCATION} | bool |
-| main.rs:1262:25:1262:29 | false |  | {EXTERNAL LOCATION} | bool |
-| main.rs:1264:13:1264:17 | mut a |  | {EXTERNAL LOCATION} | i32 |
-| main.rs:1265:13:1265:16 | cond |  | {EXTERNAL LOCATION} | bool |
-| main.rs:1265:20:1265:21 | 34 |  | {EXTERNAL LOCATION} | i32 |
-| main.rs:1265:20:1265:27 | ... == ... |  | {EXTERNAL LOCATION} | bool |
-| main.rs:1265:26:1265:27 | 33 |  | {EXTERNAL LOCATION} | i32 |
-| main.rs:1266:12:1266:15 | cond |  | {EXTERNAL LOCATION} | bool |
-| main.rs:1267:17:1267:17 | z |  | file://:0:0:0:0 | () |
-| main.rs:1267:21:1267:27 | (...) |  | file://:0:0:0:0 | () |
-| main.rs:1267:22:1267:22 | a |  | {EXTERNAL LOCATION} | i32 |
-| main.rs:1267:22:1267:26 | ... = ... |  | file://:0:0:0:0 | () |
-| main.rs:1267:26:1267:26 | 1 |  | {EXTERNAL LOCATION} | i32 |
-| main.rs:1269:13:1269:13 | a |  | {EXTERNAL LOCATION} | i32 |
-| main.rs:1269:13:1269:17 | ... = ... |  | file://:0:0:0:0 | () |
-| main.rs:1269:17:1269:17 | 2 |  | {EXTERNAL LOCATION} | i32 |
-| main.rs:1271:9:1271:9 | a |  | {EXTERNAL LOCATION} | i32 |
-| main.rs:1288:16:1288:19 | SelfParam |  | main.rs:1278:5:1283:5 | Vec2 |
-| main.rs:1288:22:1288:24 | rhs |  | main.rs:1278:5:1283:5 | Vec2 |
-| main.rs:1288:41:1293:9 | { ... } |  | main.rs:1278:5:1283:5 | Vec2 |
-| main.rs:1289:13:1292:13 | Vec2 {...} |  | main.rs:1278:5:1283:5 | Vec2 |
-| main.rs:1290:20:1290:23 | self |  | main.rs:1278:5:1283:5 | Vec2 |
-| main.rs:1290:20:1290:25 | self.x |  | {EXTERNAL LOCATION} | i64 |
-| main.rs:1290:20:1290:33 | ... + ... |  | {EXTERNAL LOCATION} | i64 |
-| main.rs:1290:29:1290:31 | rhs |  | main.rs:1278:5:1283:5 | Vec2 |
-| main.rs:1290:29:1290:33 | rhs.x |  | {EXTERNAL LOCATION} | i64 |
-| main.rs:1291:20:1291:23 | self |  | main.rs:1278:5:1283:5 | Vec2 |
-| main.rs:1291:20:1291:25 | self.y |  | {EXTERNAL LOCATION} | i64 |
-| main.rs:1291:20:1291:33 | ... + ... |  | {EXTERNAL LOCATION} | i64 |
-| main.rs:1291:29:1291:31 | rhs |  | main.rs:1278:5:1283:5 | Vec2 |
-| main.rs:1291:29:1291:33 | rhs.y |  | {EXTERNAL LOCATION} | i64 |
-| main.rs:1298:23:1298:31 | SelfParam |  | file://:0:0:0:0 | & |
-| main.rs:1298:23:1298:31 | SelfParam | &T | main.rs:1278:5:1283:5 | Vec2 |
-| main.rs:1298:34:1298:36 | rhs |  | main.rs:1278:5:1283:5 | Vec2 |
-| main.rs:1299:13:1299:16 | self |  | file://:0:0:0:0 | & |
-| main.rs:1299:13:1299:16 | self | &T | main.rs:1278:5:1283:5 | Vec2 |
-| main.rs:1299:13:1299:18 | self.x |  | {EXTERNAL LOCATION} | i64 |
-| main.rs:1299:13:1299:27 | ... += ... |  | file://:0:0:0:0 | () |
-| main.rs:1299:23:1299:25 | rhs |  | main.rs:1278:5:1283:5 | Vec2 |
-| main.rs:1299:23:1299:27 | rhs.x |  | {EXTERNAL LOCATION} | i64 |
-| main.rs:1300:13:1300:16 | self |  | file://:0:0:0:0 | & |
-| main.rs:1300:13:1300:16 | self | &T | main.rs:1278:5:1283:5 | Vec2 |
-| main.rs:1300:13:1300:18 | self.y |  | {EXTERNAL LOCATION} | i64 |
-| main.rs:1300:13:1300:27 | ... += ... |  | file://:0:0:0:0 | () |
-| main.rs:1300:23:1300:25 | rhs |  | main.rs:1278:5:1283:5 | Vec2 |
-| main.rs:1300:23:1300:27 | rhs.y |  | {EXTERNAL LOCATION} | i64 |
-| main.rs:1306:16:1306:19 | SelfParam |  | main.rs:1278:5:1283:5 | Vec2 |
-| main.rs:1306:22:1306:24 | rhs |  | main.rs:1278:5:1283:5 | Vec2 |
-| main.rs:1306:41:1311:9 | { ... } |  | main.rs:1278:5:1283:5 | Vec2 |
-| main.rs:1307:13:1310:13 | Vec2 {...} |  | main.rs:1278:5:1283:5 | Vec2 |
-| main.rs:1308:20:1308:23 | self |  | main.rs:1278:5:1283:5 | Vec2 |
-| main.rs:1308:20:1308:25 | self.x |  | {EXTERNAL LOCATION} | i64 |
-| main.rs:1308:20:1308:33 | ... - ... |  | {EXTERNAL LOCATION} | i64 |
-| main.rs:1308:29:1308:31 | rhs |  | main.rs:1278:5:1283:5 | Vec2 |
-| main.rs:1308:29:1308:33 | rhs.x |  | {EXTERNAL LOCATION} | i64 |
-| main.rs:1309:20:1309:23 | self |  | main.rs:1278:5:1283:5 | Vec2 |
-| main.rs:1309:20:1309:25 | self.y |  | {EXTERNAL LOCATION} | i64 |
-| main.rs:1309:20:1309:33 | ... - ... |  | {EXTERNAL LOCATION} | i64 |
-| main.rs:1309:29:1309:31 | rhs |  | main.rs:1278:5:1283:5 | Vec2 |
-| main.rs:1309:29:1309:33 | rhs.y |  | {EXTERNAL LOCATION} | i64 |
-| main.rs:1316:23:1316:31 | SelfParam |  | file://:0:0:0:0 | & |
-| main.rs:1316:23:1316:31 | SelfParam | &T | main.rs:1278:5:1283:5 | Vec2 |
-| main.rs:1316:34:1316:36 | rhs |  | main.rs:1278:5:1283:5 | Vec2 |
-| main.rs:1317:13:1317:16 | self |  | file://:0:0:0:0 | & |
-| main.rs:1317:13:1317:16 | self | &T | main.rs:1278:5:1283:5 | Vec2 |
-| main.rs:1317:13:1317:18 | self.x |  | {EXTERNAL LOCATION} | i64 |
-| main.rs:1317:13:1317:27 | ... -= ... |  | file://:0:0:0:0 | () |
-| main.rs:1317:23:1317:25 | rhs |  | main.rs:1278:5:1283:5 | Vec2 |
-| main.rs:1317:23:1317:27 | rhs.x |  | {EXTERNAL LOCATION} | i64 |
+| main.rs:1163:17:1163:25 | SelfParam |  | file://:0:0:0:0 | & |
+| main.rs:1163:17:1163:25 | SelfParam | &T | main.rs:1157:5:1160:5 | MyFlag |
+| main.rs:1164:13:1164:16 | self |  | file://:0:0:0:0 | & |
+| main.rs:1164:13:1164:16 | self | &T | main.rs:1157:5:1160:5 | MyFlag |
+| main.rs:1164:13:1164:21 | self.bool |  | {EXTERNAL LOCATION} | bool |
+| main.rs:1164:13:1164:34 | ... = ... |  | file://:0:0:0:0 | () |
+| main.rs:1164:25:1164:34 | ! ... |  | {EXTERNAL LOCATION} | bool |
+| main.rs:1164:26:1164:29 | self |  | file://:0:0:0:0 | & |
+| main.rs:1164:26:1164:29 | self | &T | main.rs:1157:5:1160:5 | MyFlag |
+| main.rs:1164:26:1164:34 | self.bool |  | {EXTERNAL LOCATION} | bool |
+| main.rs:1171:15:1171:19 | SelfParam |  | file://:0:0:0:0 | & |
+| main.rs:1171:15:1171:19 | SelfParam | &T | main.rs:1168:5:1168:13 | S |
+| main.rs:1171:31:1173:9 | { ... } |  | file://:0:0:0:0 | & |
+| main.rs:1171:31:1173:9 | { ... } | &T | file://:0:0:0:0 | & |
+| main.rs:1171:31:1173:9 | { ... } | &T | main.rs:1168:5:1168:13 | S |
+| main.rs:1171:31:1173:9 | { ... } | &T.&T | file://:0:0:0:0 | & |
+| main.rs:1171:31:1173:9 | { ... } | &T.&T.&T | file://:0:0:0:0 | & |
+| main.rs:1171:31:1173:9 | { ... } | &T.&T.&T.&T | main.rs:1168:5:1168:13 | S |
+| main.rs:1172:13:1172:19 | &... |  | file://:0:0:0:0 | & |
+| main.rs:1172:13:1172:19 | &... | &T | file://:0:0:0:0 | & |
+| main.rs:1172:13:1172:19 | &... | &T | main.rs:1168:5:1168:13 | S |
+| main.rs:1172:13:1172:19 | &... | &T.&T | file://:0:0:0:0 | & |
+| main.rs:1172:13:1172:19 | &... | &T.&T.&T | file://:0:0:0:0 | & |
+| main.rs:1172:13:1172:19 | &... | &T.&T.&T.&T | main.rs:1168:5:1168:13 | S |
+| main.rs:1172:14:1172:19 | &... |  | file://:0:0:0:0 | & |
+| main.rs:1172:14:1172:19 | &... |  | main.rs:1168:5:1168:13 | S |
+| main.rs:1172:14:1172:19 | &... | &T | file://:0:0:0:0 | & |
+| main.rs:1172:14:1172:19 | &... | &T.&T | file://:0:0:0:0 | & |
+| main.rs:1172:14:1172:19 | &... | &T.&T.&T | main.rs:1168:5:1168:13 | S |
+| main.rs:1172:15:1172:19 | &self |  | file://:0:0:0:0 | & |
+| main.rs:1172:15:1172:19 | &self | &T | file://:0:0:0:0 | & |
+| main.rs:1172:15:1172:19 | &self | &T.&T | main.rs:1168:5:1168:13 | S |
+| main.rs:1172:16:1172:19 | self |  | file://:0:0:0:0 | & |
+| main.rs:1172:16:1172:19 | self | &T | main.rs:1168:5:1168:13 | S |
+| main.rs:1175:15:1175:25 | SelfParam |  | file://:0:0:0:0 | & |
+| main.rs:1175:15:1175:25 | SelfParam | &T | main.rs:1168:5:1168:13 | S |
+| main.rs:1175:37:1177:9 | { ... } |  | file://:0:0:0:0 | & |
+| main.rs:1175:37:1177:9 | { ... } | &T | file://:0:0:0:0 | & |
+| main.rs:1175:37:1177:9 | { ... } | &T | main.rs:1168:5:1168:13 | S |
+| main.rs:1175:37:1177:9 | { ... } | &T.&T | file://:0:0:0:0 | & |
+| main.rs:1175:37:1177:9 | { ... } | &T.&T.&T | file://:0:0:0:0 | & |
+| main.rs:1175:37:1177:9 | { ... } | &T.&T.&T.&T | main.rs:1168:5:1168:13 | S |
+| main.rs:1176:13:1176:19 | &... |  | file://:0:0:0:0 | & |
+| main.rs:1176:13:1176:19 | &... | &T | file://:0:0:0:0 | & |
+| main.rs:1176:13:1176:19 | &... | &T | main.rs:1168:5:1168:13 | S |
+| main.rs:1176:13:1176:19 | &... | &T.&T | file://:0:0:0:0 | & |
+| main.rs:1176:13:1176:19 | &... | &T.&T.&T | file://:0:0:0:0 | & |
+| main.rs:1176:13:1176:19 | &... | &T.&T.&T.&T | main.rs:1168:5:1168:13 | S |
+| main.rs:1176:14:1176:19 | &... |  | file://:0:0:0:0 | & |
+| main.rs:1176:14:1176:19 | &... |  | main.rs:1168:5:1168:13 | S |
+| main.rs:1176:14:1176:19 | &... | &T | file://:0:0:0:0 | & |
+| main.rs:1176:14:1176:19 | &... | &T.&T | file://:0:0:0:0 | & |
+| main.rs:1176:14:1176:19 | &... | &T.&T.&T | main.rs:1168:5:1168:13 | S |
+| main.rs:1176:15:1176:19 | &self |  | file://:0:0:0:0 | & |
+| main.rs:1176:15:1176:19 | &self | &T | file://:0:0:0:0 | & |
+| main.rs:1176:15:1176:19 | &self | &T.&T | main.rs:1168:5:1168:13 | S |
+| main.rs:1176:16:1176:19 | self |  | file://:0:0:0:0 | & |
+| main.rs:1176:16:1176:19 | self | &T | main.rs:1168:5:1168:13 | S |
+| main.rs:1179:15:1179:15 | x |  | file://:0:0:0:0 | & |
+| main.rs:1179:15:1179:15 | x | &T | main.rs:1168:5:1168:13 | S |
+| main.rs:1179:34:1181:9 | { ... } |  | file://:0:0:0:0 | & |
+| main.rs:1179:34:1181:9 | { ... } | &T | main.rs:1168:5:1168:13 | S |
+| main.rs:1180:13:1180:13 | x |  | file://:0:0:0:0 | & |
+| main.rs:1180:13:1180:13 | x | &T | main.rs:1168:5:1168:13 | S |
+| main.rs:1183:15:1183:15 | x |  | file://:0:0:0:0 | & |
+| main.rs:1183:15:1183:15 | x | &T | main.rs:1168:5:1168:13 | S |
+| main.rs:1183:34:1185:9 | { ... } |  | file://:0:0:0:0 | & |
+| main.rs:1183:34:1185:9 | { ... } | &T | file://:0:0:0:0 | & |
+| main.rs:1183:34:1185:9 | { ... } | &T | main.rs:1168:5:1168:13 | S |
+| main.rs:1183:34:1185:9 | { ... } | &T.&T | file://:0:0:0:0 | & |
+| main.rs:1183:34:1185:9 | { ... } | &T.&T.&T | file://:0:0:0:0 | & |
+| main.rs:1183:34:1185:9 | { ... } | &T.&T.&T.&T | main.rs:1168:5:1168:13 | S |
+| main.rs:1184:13:1184:16 | &... |  | file://:0:0:0:0 | & |
+| main.rs:1184:13:1184:16 | &... | &T | file://:0:0:0:0 | & |
+| main.rs:1184:13:1184:16 | &... | &T | main.rs:1168:5:1168:13 | S |
+| main.rs:1184:13:1184:16 | &... | &T.&T | file://:0:0:0:0 | & |
+| main.rs:1184:13:1184:16 | &... | &T.&T.&T | file://:0:0:0:0 | & |
+| main.rs:1184:13:1184:16 | &... | &T.&T.&T.&T | main.rs:1168:5:1168:13 | S |
+| main.rs:1184:14:1184:16 | &... |  | file://:0:0:0:0 | & |
+| main.rs:1184:14:1184:16 | &... |  | main.rs:1168:5:1168:13 | S |
+| main.rs:1184:14:1184:16 | &... | &T | file://:0:0:0:0 | & |
+| main.rs:1184:14:1184:16 | &... | &T.&T | file://:0:0:0:0 | & |
+| main.rs:1184:14:1184:16 | &... | &T.&T.&T | main.rs:1168:5:1168:13 | S |
+| main.rs:1184:15:1184:16 | &x |  | file://:0:0:0:0 | & |
+| main.rs:1184:15:1184:16 | &x | &T | file://:0:0:0:0 | & |
+| main.rs:1184:15:1184:16 | &x | &T.&T | main.rs:1168:5:1168:13 | S |
+| main.rs:1184:16:1184:16 | x |  | file://:0:0:0:0 | & |
+| main.rs:1184:16:1184:16 | x | &T | main.rs:1168:5:1168:13 | S |
+| main.rs:1189:13:1189:13 | x |  | main.rs:1168:5:1168:13 | S |
+| main.rs:1189:17:1189:20 | S {...} |  | main.rs:1168:5:1168:13 | S |
+| main.rs:1190:9:1190:9 | x |  | main.rs:1168:5:1168:13 | S |
+| main.rs:1190:9:1190:14 | x.f1() |  | file://:0:0:0:0 | & |
+| main.rs:1190:9:1190:14 | x.f1() | &T | main.rs:1168:5:1168:13 | S |
+| main.rs:1191:9:1191:9 | x |  | main.rs:1168:5:1168:13 | S |
+| main.rs:1191:9:1191:14 | x.f2() |  | file://:0:0:0:0 | & |
+| main.rs:1191:9:1191:14 | x.f2() | &T | main.rs:1168:5:1168:13 | S |
+| main.rs:1192:9:1192:17 | ...::f3(...) |  | file://:0:0:0:0 | & |
+| main.rs:1192:9:1192:17 | ...::f3(...) | &T | main.rs:1168:5:1168:13 | S |
+| main.rs:1192:15:1192:16 | &x |  | file://:0:0:0:0 | & |
+| main.rs:1192:15:1192:16 | &x | &T | main.rs:1168:5:1168:13 | S |
+| main.rs:1192:16:1192:16 | x |  | main.rs:1168:5:1168:13 | S |
+| main.rs:1194:13:1194:13 | n |  | {EXTERNAL LOCATION} | bool |
+| main.rs:1194:13:1194:13 | n |  | file://:0:0:0:0 | & |
+| main.rs:1194:17:1194:24 | * ... |  | {EXTERNAL LOCATION} | bool |
+| main.rs:1194:17:1194:24 | * ... |  | file://:0:0:0:0 | & |
+| main.rs:1194:18:1194:24 | * ... |  | file://:0:0:0:0 | & |
+| main.rs:1194:18:1194:24 | * ... | &T | {EXTERNAL LOCATION} | bool |
+| main.rs:1194:18:1194:24 | * ... | &T | file://:0:0:0:0 | & |
+| main.rs:1194:19:1194:24 | &... |  | file://:0:0:0:0 | & |
+| main.rs:1194:19:1194:24 | &... | &T | file://:0:0:0:0 | & |
+| main.rs:1194:19:1194:24 | &... | &T.&T | {EXTERNAL LOCATION} | bool |
+| main.rs:1194:19:1194:24 | &... | &T.&T | file://:0:0:0:0 | & |
+| main.rs:1194:20:1194:24 | &true |  | file://:0:0:0:0 | & |
+| main.rs:1194:20:1194:24 | &true | &T | {EXTERNAL LOCATION} | bool |
+| main.rs:1194:20:1194:24 | &true | &T | file://:0:0:0:0 | & |
+| main.rs:1194:21:1194:24 | true |  | {EXTERNAL LOCATION} | bool |
+| main.rs:1194:21:1194:24 | true |  | file://:0:0:0:0 | & |
+| main.rs:1198:13:1198:20 | mut flag |  | main.rs:1157:5:1160:5 | MyFlag |
+| main.rs:1198:24:1198:41 | ...::default(...) |  | main.rs:1157:5:1160:5 | MyFlag |
+| main.rs:1199:22:1199:30 | &mut flag |  | file://:0:0:0:0 | & |
+| main.rs:1199:22:1199:30 | &mut flag | &T | main.rs:1157:5:1160:5 | MyFlag |
+| main.rs:1199:27:1199:30 | flag |  | main.rs:1157:5:1160:5 | MyFlag |
+| main.rs:1200:18:1200:23 | "{:?}\\n" |  | {EXTERNAL LOCATION} | str |
+| main.rs:1200:26:1200:29 | flag |  | main.rs:1157:5:1160:5 | MyFlag |
+| main.rs:1214:43:1217:5 | { ... } |  | {EXTERNAL LOCATION} | Result |
+| main.rs:1214:43:1217:5 | { ... } | E | main.rs:1207:5:1208:14 | S1 |
+| main.rs:1214:43:1217:5 | { ... } | T | main.rs:1207:5:1208:14 | S1 |
+| main.rs:1215:13:1215:13 | x |  | main.rs:1207:5:1208:14 | S1 |
+| main.rs:1215:17:1215:30 | ...::Ok(...) |  | {EXTERNAL LOCATION} | Result |
+| main.rs:1215:17:1215:30 | ...::Ok(...) | T | main.rs:1207:5:1208:14 | S1 |
+| main.rs:1215:17:1215:31 | TryExpr |  | main.rs:1207:5:1208:14 | S1 |
+| main.rs:1215:28:1215:29 | S1 |  | main.rs:1207:5:1208:14 | S1 |
+| main.rs:1216:9:1216:22 | ...::Ok(...) |  | {EXTERNAL LOCATION} | Result |
+| main.rs:1216:9:1216:22 | ...::Ok(...) | E | main.rs:1207:5:1208:14 | S1 |
+| main.rs:1216:9:1216:22 | ...::Ok(...) | T | main.rs:1207:5:1208:14 | S1 |
+| main.rs:1216:20:1216:21 | S1 |  | main.rs:1207:5:1208:14 | S1 |
+| main.rs:1220:46:1224:5 | { ... } |  | {EXTERNAL LOCATION} | Result |
+| main.rs:1220:46:1224:5 | { ... } | E | main.rs:1210:5:1211:14 | S2 |
+| main.rs:1220:46:1224:5 | { ... } | T | main.rs:1207:5:1208:14 | S1 |
+| main.rs:1221:13:1221:13 | x |  | {EXTERNAL LOCATION} | Result |
+| main.rs:1221:13:1221:13 | x | T | main.rs:1207:5:1208:14 | S1 |
+| main.rs:1221:17:1221:30 | ...::Ok(...) |  | {EXTERNAL LOCATION} | Result |
+| main.rs:1221:17:1221:30 | ...::Ok(...) | T | main.rs:1207:5:1208:14 | S1 |
+| main.rs:1221:28:1221:29 | S1 |  | main.rs:1207:5:1208:14 | S1 |
+| main.rs:1222:13:1222:13 | y |  | main.rs:1207:5:1208:14 | S1 |
+| main.rs:1222:17:1222:17 | x |  | {EXTERNAL LOCATION} | Result |
+| main.rs:1222:17:1222:17 | x | T | main.rs:1207:5:1208:14 | S1 |
+| main.rs:1222:17:1222:18 | TryExpr |  | main.rs:1207:5:1208:14 | S1 |
+| main.rs:1223:9:1223:22 | ...::Ok(...) |  | {EXTERNAL LOCATION} | Result |
+| main.rs:1223:9:1223:22 | ...::Ok(...) | E | main.rs:1210:5:1211:14 | S2 |
+| main.rs:1223:9:1223:22 | ...::Ok(...) | T | main.rs:1207:5:1208:14 | S1 |
+| main.rs:1223:20:1223:21 | S1 |  | main.rs:1207:5:1208:14 | S1 |
+| main.rs:1227:40:1232:5 | { ... } |  | {EXTERNAL LOCATION} | Result |
+| main.rs:1227:40:1232:5 | { ... } | E | main.rs:1210:5:1211:14 | S2 |
+| main.rs:1227:40:1232:5 | { ... } | T | main.rs:1207:5:1208:14 | S1 |
+| main.rs:1228:13:1228:13 | x |  | {EXTERNAL LOCATION} | Result |
+| main.rs:1228:13:1228:13 | x | T | {EXTERNAL LOCATION} | Result |
+| main.rs:1228:13:1228:13 | x | T.T | main.rs:1207:5:1208:14 | S1 |
+| main.rs:1228:17:1228:42 | ...::Ok(...) |  | {EXTERNAL LOCATION} | Result |
+| main.rs:1228:17:1228:42 | ...::Ok(...) | T | {EXTERNAL LOCATION} | Result |
+| main.rs:1228:17:1228:42 | ...::Ok(...) | T.T | main.rs:1207:5:1208:14 | S1 |
+| main.rs:1228:28:1228:41 | ...::Ok(...) |  | {EXTERNAL LOCATION} | Result |
+| main.rs:1228:28:1228:41 | ...::Ok(...) | T | main.rs:1207:5:1208:14 | S1 |
+| main.rs:1228:39:1228:40 | S1 |  | main.rs:1207:5:1208:14 | S1 |
+| main.rs:1230:17:1230:17 | x |  | {EXTERNAL LOCATION} | Result |
+| main.rs:1230:17:1230:17 | x | T | {EXTERNAL LOCATION} | Result |
+| main.rs:1230:17:1230:17 | x | T.T | main.rs:1207:5:1208:14 | S1 |
+| main.rs:1230:17:1230:18 | TryExpr |  | {EXTERNAL LOCATION} | Result |
+| main.rs:1230:17:1230:18 | TryExpr | T | main.rs:1207:5:1208:14 | S1 |
+| main.rs:1230:17:1230:29 | ... .map(...) |  | {EXTERNAL LOCATION} | Result |
+| main.rs:1231:9:1231:22 | ...::Ok(...) |  | {EXTERNAL LOCATION} | Result |
+| main.rs:1231:9:1231:22 | ...::Ok(...) | E | main.rs:1210:5:1211:14 | S2 |
+| main.rs:1231:9:1231:22 | ...::Ok(...) | T | main.rs:1207:5:1208:14 | S1 |
+| main.rs:1231:20:1231:21 | S1 |  | main.rs:1207:5:1208:14 | S1 |
+| main.rs:1235:30:1235:34 | input |  | {EXTERNAL LOCATION} | Result |
+| main.rs:1235:30:1235:34 | input | E | main.rs:1207:5:1208:14 | S1 |
+| main.rs:1235:30:1235:34 | input | T | main.rs:1235:20:1235:27 | T |
+| main.rs:1235:69:1242:5 | { ... } |  | {EXTERNAL LOCATION} | Result |
+| main.rs:1235:69:1242:5 | { ... } | E | main.rs:1207:5:1208:14 | S1 |
+| main.rs:1235:69:1242:5 | { ... } | T | main.rs:1235:20:1235:27 | T |
+| main.rs:1236:13:1236:17 | value |  | main.rs:1235:20:1235:27 | T |
+| main.rs:1236:21:1236:25 | input |  | {EXTERNAL LOCATION} | Result |
+| main.rs:1236:21:1236:25 | input | E | main.rs:1207:5:1208:14 | S1 |
+| main.rs:1236:21:1236:25 | input | T | main.rs:1235:20:1235:27 | T |
+| main.rs:1236:21:1236:26 | TryExpr |  | main.rs:1235:20:1235:27 | T |
+| main.rs:1237:22:1237:38 | ...::Ok(...) |  | {EXTERNAL LOCATION} | Result |
+| main.rs:1237:22:1237:38 | ...::Ok(...) | T | main.rs:1235:20:1235:27 | T |
+| main.rs:1237:22:1240:10 | ... .and_then(...) |  | {EXTERNAL LOCATION} | Result |
+| main.rs:1237:33:1237:37 | value |  | main.rs:1235:20:1235:27 | T |
+| main.rs:1237:53:1240:9 | { ... } |  | {EXTERNAL LOCATION} | Result |
+| main.rs:1237:53:1240:9 | { ... } | E | main.rs:1207:5:1208:14 | S1 |
+| main.rs:1238:22:1238:27 | "{:?}\\n" |  | {EXTERNAL LOCATION} | str |
+| main.rs:1239:13:1239:34 | ...::Ok::<...>(...) |  | {EXTERNAL LOCATION} | Result |
+| main.rs:1239:13:1239:34 | ...::Ok::<...>(...) | E | main.rs:1207:5:1208:14 | S1 |
+| main.rs:1241:9:1241:23 | ...::Err(...) |  | {EXTERNAL LOCATION} | Result |
+| main.rs:1241:9:1241:23 | ...::Err(...) | E | main.rs:1207:5:1208:14 | S1 |
+| main.rs:1241:9:1241:23 | ...::Err(...) | T | main.rs:1235:20:1235:27 | T |
+| main.rs:1241:21:1241:22 | S1 |  | main.rs:1207:5:1208:14 | S1 |
+| main.rs:1245:37:1245:52 | try_same_error(...) |  | {EXTERNAL LOCATION} | Result |
+| main.rs:1245:37:1245:52 | try_same_error(...) | E | main.rs:1207:5:1208:14 | S1 |
+| main.rs:1245:37:1245:52 | try_same_error(...) | T | main.rs:1207:5:1208:14 | S1 |
+| main.rs:1246:22:1246:27 | "{:?}\\n" |  | {EXTERNAL LOCATION} | str |
+| main.rs:1249:37:1249:55 | try_convert_error(...) |  | {EXTERNAL LOCATION} | Result |
+| main.rs:1249:37:1249:55 | try_convert_error(...) | E | main.rs:1210:5:1211:14 | S2 |
+| main.rs:1249:37:1249:55 | try_convert_error(...) | T | main.rs:1207:5:1208:14 | S1 |
+| main.rs:1250:22:1250:27 | "{:?}\\n" |  | {EXTERNAL LOCATION} | str |
+| main.rs:1253:37:1253:49 | try_chained(...) |  | {EXTERNAL LOCATION} | Result |
+| main.rs:1253:37:1253:49 | try_chained(...) | E | main.rs:1210:5:1211:14 | S2 |
+| main.rs:1253:37:1253:49 | try_chained(...) | T | main.rs:1207:5:1208:14 | S1 |
+| main.rs:1254:22:1254:27 | "{:?}\\n" |  | {EXTERNAL LOCATION} | str |
+| main.rs:1257:37:1257:63 | try_complex(...) |  | {EXTERNAL LOCATION} | Result |
+| main.rs:1257:37:1257:63 | try_complex(...) | E | main.rs:1207:5:1208:14 | S1 |
+| main.rs:1257:37:1257:63 | try_complex(...) | T | main.rs:1207:5:1208:14 | S1 |
+| main.rs:1257:49:1257:62 | ...::Ok(...) |  | {EXTERNAL LOCATION} | Result |
+| main.rs:1257:49:1257:62 | ...::Ok(...) | E | main.rs:1207:5:1208:14 | S1 |
+| main.rs:1257:49:1257:62 | ...::Ok(...) | T | main.rs:1207:5:1208:14 | S1 |
+| main.rs:1257:60:1257:61 | S1 |  | main.rs:1207:5:1208:14 | S1 |
+| main.rs:1258:22:1258:27 | "{:?}\\n" |  | {EXTERNAL LOCATION} | str |
+| main.rs:1265:13:1265:13 | x |  | {EXTERNAL LOCATION} | i32 |
+| main.rs:1265:22:1265:22 | 1 |  | {EXTERNAL LOCATION} | i32 |
+| main.rs:1266:13:1266:13 | y |  | {EXTERNAL LOCATION} | i32 |
+| main.rs:1266:17:1266:17 | 2 |  | {EXTERNAL LOCATION} | i32 |
+| main.rs:1267:13:1267:13 | z |  | {EXTERNAL LOCATION} | i32 |
+| main.rs:1267:17:1267:17 | x |  | {EXTERNAL LOCATION} | i32 |
+| main.rs:1267:17:1267:21 | ... + ... |  | {EXTERNAL LOCATION} | i32 |
+| main.rs:1267:21:1267:21 | y |  | {EXTERNAL LOCATION} | i32 |
+| main.rs:1268:13:1268:13 | z |  | {EXTERNAL LOCATION} | i32 |
+| main.rs:1268:17:1268:17 | x |  | {EXTERNAL LOCATION} | i32 |
+| main.rs:1268:17:1268:23 | x.abs() |  | {EXTERNAL LOCATION} | i32 |
+| main.rs:1269:13:1269:13 | c |  | {EXTERNAL LOCATION} | char |
+| main.rs:1269:17:1269:19 | 'c' |  | {EXTERNAL LOCATION} | char |
+| main.rs:1270:13:1270:17 | hello |  | {EXTERNAL LOCATION} | str |
+| main.rs:1270:21:1270:27 | "Hello" |  | {EXTERNAL LOCATION} | str |
+| main.rs:1271:13:1271:13 | f |  | {EXTERNAL LOCATION} | f64 |
+| main.rs:1271:17:1271:24 | 123.0f64 |  | {EXTERNAL LOCATION} | f64 |
+| main.rs:1272:13:1272:13 | t |  | {EXTERNAL LOCATION} | bool |
+| main.rs:1272:17:1272:20 | true |  | {EXTERNAL LOCATION} | bool |
+| main.rs:1273:13:1273:13 | f |  | {EXTERNAL LOCATION} | bool |
+| main.rs:1273:17:1273:21 | false |  | {EXTERNAL LOCATION} | bool |
+| main.rs:1280:13:1280:13 | x |  | {EXTERNAL LOCATION} | bool |
+| main.rs:1280:17:1280:20 | true |  | {EXTERNAL LOCATION} | bool |
+| main.rs:1280:17:1280:29 | ... && ... |  | {EXTERNAL LOCATION} | bool |
+| main.rs:1280:25:1280:29 | false |  | {EXTERNAL LOCATION} | bool |
+| main.rs:1281:13:1281:13 | y |  | {EXTERNAL LOCATION} | bool |
+| main.rs:1281:17:1281:20 | true |  | {EXTERNAL LOCATION} | bool |
+| main.rs:1281:17:1281:29 | ... \|\| ... |  | {EXTERNAL LOCATION} | bool |
+| main.rs:1281:25:1281:29 | false |  | {EXTERNAL LOCATION} | bool |
+| main.rs:1283:13:1283:17 | mut a |  | {EXTERNAL LOCATION} | i32 |
+| main.rs:1284:13:1284:16 | cond |  | {EXTERNAL LOCATION} | bool |
+| main.rs:1284:20:1284:21 | 34 |  | {EXTERNAL LOCATION} | i32 |
+| main.rs:1284:20:1284:27 | ... == ... |  | {EXTERNAL LOCATION} | bool |
+| main.rs:1284:26:1284:27 | 33 |  | {EXTERNAL LOCATION} | i32 |
+| main.rs:1285:12:1285:15 | cond |  | {EXTERNAL LOCATION} | bool |
+| main.rs:1286:17:1286:17 | z |  | file://:0:0:0:0 | () |
+| main.rs:1286:21:1286:27 | (...) |  | file://:0:0:0:0 | () |
+| main.rs:1286:22:1286:22 | a |  | {EXTERNAL LOCATION} | i32 |
+| main.rs:1286:22:1286:26 | ... = ... |  | file://:0:0:0:0 | () |
+| main.rs:1286:26:1286:26 | 1 |  | {EXTERNAL LOCATION} | i32 |
+| main.rs:1288:13:1288:13 | a |  | {EXTERNAL LOCATION} | i32 |
+| main.rs:1288:13:1288:17 | ... = ... |  | file://:0:0:0:0 | () |
+| main.rs:1288:17:1288:17 | 2 |  | {EXTERNAL LOCATION} | i32 |
+| main.rs:1290:9:1290:9 | a |  | {EXTERNAL LOCATION} | i32 |
+| main.rs:1307:16:1307:19 | SelfParam |  | main.rs:1297:5:1302:5 | Vec2 |
+| main.rs:1307:22:1307:24 | rhs |  | main.rs:1297:5:1302:5 | Vec2 |
+| main.rs:1307:41:1312:9 | { ... } |  | main.rs:1297:5:1302:5 | Vec2 |
+| main.rs:1308:13:1311:13 | Vec2 {...} |  | main.rs:1297:5:1302:5 | Vec2 |
+| main.rs:1309:20:1309:23 | self |  | main.rs:1297:5:1302:5 | Vec2 |
+| main.rs:1309:20:1309:25 | self.x |  | {EXTERNAL LOCATION} | i64 |
+| main.rs:1309:20:1309:33 | ... + ... |  | {EXTERNAL LOCATION} | i64 |
+| main.rs:1309:29:1309:31 | rhs |  | main.rs:1297:5:1302:5 | Vec2 |
+| main.rs:1309:29:1309:33 | rhs.x |  | {EXTERNAL LOCATION} | i64 |
+| main.rs:1310:20:1310:23 | self |  | main.rs:1297:5:1302:5 | Vec2 |
+| main.rs:1310:20:1310:25 | self.y |  | {EXTERNAL LOCATION} | i64 |
+| main.rs:1310:20:1310:33 | ... + ... |  | {EXTERNAL LOCATION} | i64 |
+| main.rs:1310:29:1310:31 | rhs |  | main.rs:1297:5:1302:5 | Vec2 |
+| main.rs:1310:29:1310:33 | rhs.y |  | {EXTERNAL LOCATION} | i64 |
+| main.rs:1317:23:1317:31 | SelfParam |  | file://:0:0:0:0 | & |
+| main.rs:1317:23:1317:31 | SelfParam | &T | main.rs:1297:5:1302:5 | Vec2 |
+| main.rs:1317:34:1317:36 | rhs |  | main.rs:1297:5:1302:5 | Vec2 |
 | main.rs:1318:13:1318:16 | self |  | file://:0:0:0:0 | & |
-| main.rs:1318:13:1318:16 | self | &T | main.rs:1278:5:1283:5 | Vec2 |
-| main.rs:1318:13:1318:18 | self.y |  | {EXTERNAL LOCATION} | i64 |
-| main.rs:1318:13:1318:27 | ... -= ... |  | file://:0:0:0:0 | () |
-| main.rs:1318:23:1318:25 | rhs |  | main.rs:1278:5:1283:5 | Vec2 |
-| main.rs:1318:23:1318:27 | rhs.y |  | {EXTERNAL LOCATION} | i64 |
-| main.rs:1324:16:1324:19 | SelfParam |  | main.rs:1278:5:1283:5 | Vec2 |
-| main.rs:1324:22:1324:24 | rhs |  | main.rs:1278:5:1283:5 | Vec2 |
-| main.rs:1324:41:1329:9 | { ... } |  | main.rs:1278:5:1283:5 | Vec2 |
-| main.rs:1325:13:1328:13 | Vec2 {...} |  | main.rs:1278:5:1283:5 | Vec2 |
-| main.rs:1326:20:1326:23 | self |  | main.rs:1278:5:1283:5 | Vec2 |
-| main.rs:1326:20:1326:25 | self.x |  | {EXTERNAL LOCATION} | i64 |
-| main.rs:1326:20:1326:33 | ... * ... |  | {EXTERNAL LOCATION} | i64 |
-| main.rs:1326:29:1326:31 | rhs |  | main.rs:1278:5:1283:5 | Vec2 |
-| main.rs:1326:29:1326:33 | rhs.x |  | {EXTERNAL LOCATION} | i64 |
-| main.rs:1327:20:1327:23 | self |  | main.rs:1278:5:1283:5 | Vec2 |
-| main.rs:1327:20:1327:25 | self.y |  | {EXTERNAL LOCATION} | i64 |
-| main.rs:1327:20:1327:33 | ... * ... |  | {EXTERNAL LOCATION} | i64 |
-| main.rs:1327:29:1327:31 | rhs |  | main.rs:1278:5:1283:5 | Vec2 |
-| main.rs:1327:29:1327:33 | rhs.y |  | {EXTERNAL LOCATION} | i64 |
-| main.rs:1333:23:1333:31 | SelfParam |  | file://:0:0:0:0 | & |
-| main.rs:1333:23:1333:31 | SelfParam | &T | main.rs:1278:5:1283:5 | Vec2 |
-| main.rs:1333:34:1333:36 | rhs |  | main.rs:1278:5:1283:5 | Vec2 |
-| main.rs:1334:13:1334:16 | self |  | file://:0:0:0:0 | & |
-| main.rs:1334:13:1334:16 | self | &T | main.rs:1278:5:1283:5 | Vec2 |
-| main.rs:1334:13:1334:18 | self.x |  | {EXTERNAL LOCATION} | i64 |
-| main.rs:1334:13:1334:27 | ... *= ... |  | file://:0:0:0:0 | () |
-| main.rs:1334:23:1334:25 | rhs |  | main.rs:1278:5:1283:5 | Vec2 |
-| main.rs:1334:23:1334:27 | rhs.x |  | {EXTERNAL LOCATION} | i64 |
-| main.rs:1335:13:1335:16 | self |  | file://:0:0:0:0 | & |
-| main.rs:1335:13:1335:16 | self | &T | main.rs:1278:5:1283:5 | Vec2 |
-| main.rs:1335:13:1335:18 | self.y |  | {EXTERNAL LOCATION} | i64 |
-| main.rs:1335:13:1335:27 | ... *= ... |  | file://:0:0:0:0 | () |
-| main.rs:1335:23:1335:25 | rhs |  | main.rs:1278:5:1283:5 | Vec2 |
-| main.rs:1335:23:1335:27 | rhs.y |  | {EXTERNAL LOCATION} | i64 |
-| main.rs:1341:16:1341:19 | SelfParam |  | main.rs:1278:5:1283:5 | Vec2 |
-| main.rs:1341:22:1341:24 | rhs |  | main.rs:1278:5:1283:5 | Vec2 |
-| main.rs:1341:41:1346:9 | { ... } |  | main.rs:1278:5:1283:5 | Vec2 |
-| main.rs:1342:13:1345:13 | Vec2 {...} |  | main.rs:1278:5:1283:5 | Vec2 |
-| main.rs:1343:20:1343:23 | self |  | main.rs:1278:5:1283:5 | Vec2 |
-| main.rs:1343:20:1343:25 | self.x |  | {EXTERNAL LOCATION} | i64 |
-| main.rs:1343:20:1343:33 | ... / ... |  | {EXTERNAL LOCATION} | i64 |
-| main.rs:1343:29:1343:31 | rhs |  | main.rs:1278:5:1283:5 | Vec2 |
-| main.rs:1343:29:1343:33 | rhs.x |  | {EXTERNAL LOCATION} | i64 |
-| main.rs:1344:20:1344:23 | self |  | main.rs:1278:5:1283:5 | Vec2 |
-| main.rs:1344:20:1344:25 | self.y |  | {EXTERNAL LOCATION} | i64 |
-| main.rs:1344:20:1344:33 | ... / ... |  | {EXTERNAL LOCATION} | i64 |
-| main.rs:1344:29:1344:31 | rhs |  | main.rs:1278:5:1283:5 | Vec2 |
-| main.rs:1344:29:1344:33 | rhs.y |  | {EXTERNAL LOCATION} | i64 |
-| main.rs:1350:23:1350:31 | SelfParam |  | file://:0:0:0:0 | & |
-| main.rs:1350:23:1350:31 | SelfParam | &T | main.rs:1278:5:1283:5 | Vec2 |
-| main.rs:1350:34:1350:36 | rhs |  | main.rs:1278:5:1283:5 | Vec2 |
-| main.rs:1351:13:1351:16 | self |  | file://:0:0:0:0 | & |
-| main.rs:1351:13:1351:16 | self | &T | main.rs:1278:5:1283:5 | Vec2 |
-| main.rs:1351:13:1351:18 | self.x |  | {EXTERNAL LOCATION} | i64 |
-| main.rs:1351:13:1351:27 | ... /= ... |  | file://:0:0:0:0 | () |
-| main.rs:1351:23:1351:25 | rhs |  | main.rs:1278:5:1283:5 | Vec2 |
-| main.rs:1351:23:1351:27 | rhs.x |  | {EXTERNAL LOCATION} | i64 |
-| main.rs:1352:13:1352:16 | self |  | file://:0:0:0:0 | & |
-| main.rs:1352:13:1352:16 | self | &T | main.rs:1278:5:1283:5 | Vec2 |
-| main.rs:1352:13:1352:18 | self.y |  | {EXTERNAL LOCATION} | i64 |
-| main.rs:1352:13:1352:27 | ... /= ... |  | file://:0:0:0:0 | () |
-| main.rs:1352:23:1352:25 | rhs |  | main.rs:1278:5:1283:5 | Vec2 |
-| main.rs:1352:23:1352:27 | rhs.y |  | {EXTERNAL LOCATION} | i64 |
-| main.rs:1358:16:1358:19 | SelfParam |  | main.rs:1278:5:1283:5 | Vec2 |
-| main.rs:1358:22:1358:24 | rhs |  | main.rs:1278:5:1283:5 | Vec2 |
-| main.rs:1358:41:1363:9 | { ... } |  | main.rs:1278:5:1283:5 | Vec2 |
-| main.rs:1359:13:1362:13 | Vec2 {...} |  | main.rs:1278:5:1283:5 | Vec2 |
-| main.rs:1360:20:1360:23 | self |  | main.rs:1278:5:1283:5 | Vec2 |
-| main.rs:1360:20:1360:25 | self.x |  | {EXTERNAL LOCATION} | i64 |
-| main.rs:1360:20:1360:33 | ... % ... |  | {EXTERNAL LOCATION} | i64 |
-| main.rs:1360:29:1360:31 | rhs |  | main.rs:1278:5:1283:5 | Vec2 |
-| main.rs:1360:29:1360:33 | rhs.x |  | {EXTERNAL LOCATION} | i64 |
-| main.rs:1361:20:1361:23 | self |  | main.rs:1278:5:1283:5 | Vec2 |
-| main.rs:1361:20:1361:25 | self.y |  | {EXTERNAL LOCATION} | i64 |
-| main.rs:1361:20:1361:33 | ... % ... |  | {EXTERNAL LOCATION} | i64 |
-| main.rs:1361:29:1361:31 | rhs |  | main.rs:1278:5:1283:5 | Vec2 |
-| main.rs:1361:29:1361:33 | rhs.y |  | {EXTERNAL LOCATION} | i64 |
-| main.rs:1367:23:1367:31 | SelfParam |  | file://:0:0:0:0 | & |
-| main.rs:1367:23:1367:31 | SelfParam | &T | main.rs:1278:5:1283:5 | Vec2 |
-| main.rs:1367:34:1367:36 | rhs |  | main.rs:1278:5:1283:5 | Vec2 |
-| main.rs:1368:13:1368:16 | self |  | file://:0:0:0:0 | & |
-| main.rs:1368:13:1368:16 | self | &T | main.rs:1278:5:1283:5 | Vec2 |
-| main.rs:1368:13:1368:18 | self.x |  | {EXTERNAL LOCATION} | i64 |
-| main.rs:1368:13:1368:27 | ... %= ... |  | file://:0:0:0:0 | () |
-| main.rs:1368:23:1368:25 | rhs |  | main.rs:1278:5:1283:5 | Vec2 |
-| main.rs:1368:23:1368:27 | rhs.x |  | {EXTERNAL LOCATION} | i64 |
-| main.rs:1369:13:1369:16 | self |  | file://:0:0:0:0 | & |
-| main.rs:1369:13:1369:16 | self | &T | main.rs:1278:5:1283:5 | Vec2 |
-| main.rs:1369:13:1369:18 | self.y |  | {EXTERNAL LOCATION} | i64 |
-| main.rs:1369:13:1369:27 | ... %= ... |  | file://:0:0:0:0 | () |
-| main.rs:1369:23:1369:25 | rhs |  | main.rs:1278:5:1283:5 | Vec2 |
-| main.rs:1369:23:1369:27 | rhs.y |  | {EXTERNAL LOCATION} | i64 |
-| main.rs:1375:19:1375:22 | SelfParam |  | main.rs:1278:5:1283:5 | Vec2 |
-| main.rs:1375:25:1375:27 | rhs |  | main.rs:1278:5:1283:5 | Vec2 |
-| main.rs:1375:44:1380:9 | { ... } |  | main.rs:1278:5:1283:5 | Vec2 |
-| main.rs:1376:13:1379:13 | Vec2 {...} |  | main.rs:1278:5:1283:5 | Vec2 |
-| main.rs:1377:20:1377:23 | self |  | main.rs:1278:5:1283:5 | Vec2 |
-| main.rs:1377:20:1377:25 | self.x |  | {EXTERNAL LOCATION} | i64 |
-| main.rs:1377:20:1377:33 | ... & ... |  | {EXTERNAL LOCATION} | i64 |
-| main.rs:1377:29:1377:31 | rhs |  | main.rs:1278:5:1283:5 | Vec2 |
-| main.rs:1377:29:1377:33 | rhs.x |  | {EXTERNAL LOCATION} | i64 |
-| main.rs:1378:20:1378:23 | self |  | main.rs:1278:5:1283:5 | Vec2 |
-| main.rs:1378:20:1378:25 | self.y |  | {EXTERNAL LOCATION} | i64 |
-| main.rs:1378:20:1378:33 | ... & ... |  | {EXTERNAL LOCATION} | i64 |
-| main.rs:1378:29:1378:31 | rhs |  | main.rs:1278:5:1283:5 | Vec2 |
-| main.rs:1378:29:1378:33 | rhs.y |  | {EXTERNAL LOCATION} | i64 |
-| main.rs:1384:26:1384:34 | SelfParam |  | file://:0:0:0:0 | & |
-| main.rs:1384:26:1384:34 | SelfParam | &T | main.rs:1278:5:1283:5 | Vec2 |
-| main.rs:1384:37:1384:39 | rhs |  | main.rs:1278:5:1283:5 | Vec2 |
-| main.rs:1385:13:1385:16 | self |  | file://:0:0:0:0 | & |
-| main.rs:1385:13:1385:16 | self | &T | main.rs:1278:5:1283:5 | Vec2 |
-| main.rs:1385:13:1385:18 | self.x |  | {EXTERNAL LOCATION} | i64 |
-| main.rs:1385:13:1385:27 | ... &= ... |  | file://:0:0:0:0 | () |
-| main.rs:1385:23:1385:25 | rhs |  | main.rs:1278:5:1283:5 | Vec2 |
-| main.rs:1385:23:1385:27 | rhs.x |  | {EXTERNAL LOCATION} | i64 |
-| main.rs:1386:13:1386:16 | self |  | file://:0:0:0:0 | & |
-| main.rs:1386:13:1386:16 | self | &T | main.rs:1278:5:1283:5 | Vec2 |
-| main.rs:1386:13:1386:18 | self.y |  | {EXTERNAL LOCATION} | i64 |
-| main.rs:1386:13:1386:27 | ... &= ... |  | file://:0:0:0:0 | () |
-| main.rs:1386:23:1386:25 | rhs |  | main.rs:1278:5:1283:5 | Vec2 |
-| main.rs:1386:23:1386:27 | rhs.y |  | {EXTERNAL LOCATION} | i64 |
-| main.rs:1392:18:1392:21 | SelfParam |  | main.rs:1278:5:1283:5 | Vec2 |
-| main.rs:1392:24:1392:26 | rhs |  | main.rs:1278:5:1283:5 | Vec2 |
-| main.rs:1392:43:1397:9 | { ... } |  | main.rs:1278:5:1283:5 | Vec2 |
-| main.rs:1393:13:1396:13 | Vec2 {...} |  | main.rs:1278:5:1283:5 | Vec2 |
-| main.rs:1394:20:1394:23 | self |  | main.rs:1278:5:1283:5 | Vec2 |
-| main.rs:1394:20:1394:25 | self.x |  | {EXTERNAL LOCATION} | i64 |
-| main.rs:1394:20:1394:33 | ... \| ... |  | {EXTERNAL LOCATION} | i64 |
-| main.rs:1394:29:1394:31 | rhs |  | main.rs:1278:5:1283:5 | Vec2 |
-| main.rs:1394:29:1394:33 | rhs.x |  | {EXTERNAL LOCATION} | i64 |
-| main.rs:1395:20:1395:23 | self |  | main.rs:1278:5:1283:5 | Vec2 |
-| main.rs:1395:20:1395:25 | self.y |  | {EXTERNAL LOCATION} | i64 |
-| main.rs:1395:20:1395:33 | ... \| ... |  | {EXTERNAL LOCATION} | i64 |
-| main.rs:1395:29:1395:31 | rhs |  | main.rs:1278:5:1283:5 | Vec2 |
-| main.rs:1395:29:1395:33 | rhs.y |  | {EXTERNAL LOCATION} | i64 |
-| main.rs:1401:25:1401:33 | SelfParam |  | file://:0:0:0:0 | & |
-| main.rs:1401:25:1401:33 | SelfParam | &T | main.rs:1278:5:1283:5 | Vec2 |
-| main.rs:1401:36:1401:38 | rhs |  | main.rs:1278:5:1283:5 | Vec2 |
-| main.rs:1402:13:1402:16 | self |  | file://:0:0:0:0 | & |
-| main.rs:1402:13:1402:16 | self | &T | main.rs:1278:5:1283:5 | Vec2 |
-| main.rs:1402:13:1402:18 | self.x |  | {EXTERNAL LOCATION} | i64 |
-| main.rs:1402:13:1402:27 | ... \|= ... |  | file://:0:0:0:0 | () |
-| main.rs:1402:23:1402:25 | rhs |  | main.rs:1278:5:1283:5 | Vec2 |
-| main.rs:1402:23:1402:27 | rhs.x |  | {EXTERNAL LOCATION} | i64 |
-| main.rs:1403:13:1403:16 | self |  | file://:0:0:0:0 | & |
-| main.rs:1403:13:1403:16 | self | &T | main.rs:1278:5:1283:5 | Vec2 |
-| main.rs:1403:13:1403:18 | self.y |  | {EXTERNAL LOCATION} | i64 |
-| main.rs:1403:13:1403:27 | ... \|= ... |  | file://:0:0:0:0 | () |
-| main.rs:1403:23:1403:25 | rhs |  | main.rs:1278:5:1283:5 | Vec2 |
-| main.rs:1403:23:1403:27 | rhs.y |  | {EXTERNAL LOCATION} | i64 |
-| main.rs:1409:19:1409:22 | SelfParam |  | main.rs:1278:5:1283:5 | Vec2 |
-| main.rs:1409:25:1409:27 | rhs |  | main.rs:1278:5:1283:5 | Vec2 |
-| main.rs:1409:44:1414:9 | { ... } |  | main.rs:1278:5:1283:5 | Vec2 |
-| main.rs:1410:13:1413:13 | Vec2 {...} |  | main.rs:1278:5:1283:5 | Vec2 |
-| main.rs:1411:20:1411:23 | self |  | main.rs:1278:5:1283:5 | Vec2 |
-| main.rs:1411:20:1411:25 | self.x |  | {EXTERNAL LOCATION} | i64 |
-| main.rs:1411:20:1411:33 | ... ^ ... |  | {EXTERNAL LOCATION} | i64 |
-| main.rs:1411:29:1411:31 | rhs |  | main.rs:1278:5:1283:5 | Vec2 |
-| main.rs:1411:29:1411:33 | rhs.x |  | {EXTERNAL LOCATION} | i64 |
-| main.rs:1412:20:1412:23 | self |  | main.rs:1278:5:1283:5 | Vec2 |
-| main.rs:1412:20:1412:25 | self.y |  | {EXTERNAL LOCATION} | i64 |
-| main.rs:1412:20:1412:33 | ... ^ ... |  | {EXTERNAL LOCATION} | i64 |
-| main.rs:1412:29:1412:31 | rhs |  | main.rs:1278:5:1283:5 | Vec2 |
-| main.rs:1412:29:1412:33 | rhs.y |  | {EXTERNAL LOCATION} | i64 |
-| main.rs:1418:26:1418:34 | SelfParam |  | file://:0:0:0:0 | & |
-| main.rs:1418:26:1418:34 | SelfParam | &T | main.rs:1278:5:1283:5 | Vec2 |
-| main.rs:1418:37:1418:39 | rhs |  | main.rs:1278:5:1283:5 | Vec2 |
-| main.rs:1419:13:1419:16 | self |  | file://:0:0:0:0 | & |
-| main.rs:1419:13:1419:16 | self | &T | main.rs:1278:5:1283:5 | Vec2 |
-| main.rs:1419:13:1419:18 | self.x |  | {EXTERNAL LOCATION} | i64 |
-| main.rs:1419:13:1419:27 | ... ^= ... |  | file://:0:0:0:0 | () |
-| main.rs:1419:23:1419:25 | rhs |  | main.rs:1278:5:1283:5 | Vec2 |
-| main.rs:1419:23:1419:27 | rhs.x |  | {EXTERNAL LOCATION} | i64 |
-| main.rs:1420:13:1420:16 | self |  | file://:0:0:0:0 | & |
-| main.rs:1420:13:1420:16 | self | &T | main.rs:1278:5:1283:5 | Vec2 |
-| main.rs:1420:13:1420:18 | self.y |  | {EXTERNAL LOCATION} | i64 |
-| main.rs:1420:13:1420:27 | ... ^= ... |  | file://:0:0:0:0 | () |
-| main.rs:1420:23:1420:25 | rhs |  | main.rs:1278:5:1283:5 | Vec2 |
-| main.rs:1420:23:1420:27 | rhs.y |  | {EXTERNAL LOCATION} | i64 |
-| main.rs:1426:16:1426:19 | SelfParam |  | main.rs:1278:5:1283:5 | Vec2 |
-| main.rs:1426:22:1426:24 | rhs |  | {EXTERNAL LOCATION} | u32 |
-| main.rs:1426:40:1431:9 | { ... } |  | main.rs:1278:5:1283:5 | Vec2 |
-| main.rs:1427:13:1430:13 | Vec2 {...} |  | main.rs:1278:5:1283:5 | Vec2 |
-| main.rs:1428:20:1428:23 | self |  | main.rs:1278:5:1283:5 | Vec2 |
-| main.rs:1428:20:1428:25 | self.x |  | {EXTERNAL LOCATION} | i64 |
-| main.rs:1428:20:1428:32 | ... << ... |  | {EXTERNAL LOCATION} | i64 |
-| main.rs:1428:30:1428:32 | rhs |  | {EXTERNAL LOCATION} | u32 |
-| main.rs:1429:20:1429:23 | self |  | main.rs:1278:5:1283:5 | Vec2 |
-| main.rs:1429:20:1429:25 | self.y |  | {EXTERNAL LOCATION} | i64 |
-| main.rs:1429:20:1429:32 | ... << ... |  | {EXTERNAL LOCATION} | i64 |
-| main.rs:1429:30:1429:32 | rhs |  | {EXTERNAL LOCATION} | u32 |
-| main.rs:1435:23:1435:31 | SelfParam |  | file://:0:0:0:0 | & |
-| main.rs:1435:23:1435:31 | SelfParam | &T | main.rs:1278:5:1283:5 | Vec2 |
-| main.rs:1435:34:1435:36 | rhs |  | {EXTERNAL LOCATION} | u32 |
-| main.rs:1436:13:1436:16 | self |  | file://:0:0:0:0 | & |
-| main.rs:1436:13:1436:16 | self | &T | main.rs:1278:5:1283:5 | Vec2 |
-| main.rs:1436:13:1436:18 | self.x |  | {EXTERNAL LOCATION} | i64 |
-| main.rs:1436:13:1436:26 | ... <<= ... |  | file://:0:0:0:0 | () |
-| main.rs:1436:24:1436:26 | rhs |  | {EXTERNAL LOCATION} | u32 |
-| main.rs:1437:13:1437:16 | self |  | file://:0:0:0:0 | & |
-| main.rs:1437:13:1437:16 | self | &T | main.rs:1278:5:1283:5 | Vec2 |
-| main.rs:1437:13:1437:18 | self.y |  | {EXTERNAL LOCATION} | i64 |
-| main.rs:1437:13:1437:26 | ... <<= ... |  | file://:0:0:0:0 | () |
-| main.rs:1437:24:1437:26 | rhs |  | {EXTERNAL LOCATION} | u32 |
-| main.rs:1443:16:1443:19 | SelfParam |  | main.rs:1278:5:1283:5 | Vec2 |
-| main.rs:1443:22:1443:24 | rhs |  | {EXTERNAL LOCATION} | u32 |
-| main.rs:1443:40:1448:9 | { ... } |  | main.rs:1278:5:1283:5 | Vec2 |
-| main.rs:1444:13:1447:13 | Vec2 {...} |  | main.rs:1278:5:1283:5 | Vec2 |
-| main.rs:1445:20:1445:23 | self |  | main.rs:1278:5:1283:5 | Vec2 |
-| main.rs:1445:20:1445:25 | self.x |  | {EXTERNAL LOCATION} | i64 |
-| main.rs:1445:20:1445:32 | ... >> ... |  | {EXTERNAL LOCATION} | i64 |
-| main.rs:1445:30:1445:32 | rhs |  | {EXTERNAL LOCATION} | u32 |
-| main.rs:1446:20:1446:23 | self |  | main.rs:1278:5:1283:5 | Vec2 |
-| main.rs:1446:20:1446:25 | self.y |  | {EXTERNAL LOCATION} | i64 |
-| main.rs:1446:20:1446:32 | ... >> ... |  | {EXTERNAL LOCATION} | i64 |
-| main.rs:1446:30:1446:32 | rhs |  | {EXTERNAL LOCATION} | u32 |
-| main.rs:1452:23:1452:31 | SelfParam |  | file://:0:0:0:0 | & |
-| main.rs:1452:23:1452:31 | SelfParam | &T | main.rs:1278:5:1283:5 | Vec2 |
-| main.rs:1452:34:1452:36 | rhs |  | {EXTERNAL LOCATION} | u32 |
-| main.rs:1453:13:1453:16 | self |  | file://:0:0:0:0 | & |
-| main.rs:1453:13:1453:16 | self | &T | main.rs:1278:5:1283:5 | Vec2 |
-| main.rs:1453:13:1453:18 | self.x |  | {EXTERNAL LOCATION} | i64 |
-| main.rs:1453:13:1453:26 | ... >>= ... |  | file://:0:0:0:0 | () |
-| main.rs:1453:24:1453:26 | rhs |  | {EXTERNAL LOCATION} | u32 |
-| main.rs:1454:13:1454:16 | self |  | file://:0:0:0:0 | & |
-| main.rs:1454:13:1454:16 | self | &T | main.rs:1278:5:1283:5 | Vec2 |
-| main.rs:1454:13:1454:18 | self.y |  | {EXTERNAL LOCATION} | i64 |
-| main.rs:1454:13:1454:26 | ... >>= ... |  | file://:0:0:0:0 | () |
-| main.rs:1454:24:1454:26 | rhs |  | {EXTERNAL LOCATION} | u32 |
-| main.rs:1460:16:1460:19 | SelfParam |  | main.rs:1278:5:1283:5 | Vec2 |
-| main.rs:1460:30:1465:9 | { ... } |  | main.rs:1278:5:1283:5 | Vec2 |
-| main.rs:1461:13:1464:13 | Vec2 {...} |  | main.rs:1278:5:1283:5 | Vec2 |
-| main.rs:1462:20:1462:26 | - ... |  | {EXTERNAL LOCATION} | i64 |
-| main.rs:1462:21:1462:24 | self |  | main.rs:1278:5:1283:5 | Vec2 |
-| main.rs:1462:21:1462:26 | self.x |  | {EXTERNAL LOCATION} | i64 |
-| main.rs:1463:20:1463:26 | - ... |  | {EXTERNAL LOCATION} | i64 |
-| main.rs:1463:21:1463:24 | self |  | main.rs:1278:5:1283:5 | Vec2 |
-| main.rs:1463:21:1463:26 | self.y |  | {EXTERNAL LOCATION} | i64 |
-| main.rs:1470:16:1470:19 | SelfParam |  | main.rs:1278:5:1283:5 | Vec2 |
-| main.rs:1470:30:1475:9 | { ... } |  | main.rs:1278:5:1283:5 | Vec2 |
-| main.rs:1471:13:1474:13 | Vec2 {...} |  | main.rs:1278:5:1283:5 | Vec2 |
-| main.rs:1472:20:1472:26 | ! ... |  | {EXTERNAL LOCATION} | i64 |
-| main.rs:1472:21:1472:24 | self |  | main.rs:1278:5:1283:5 | Vec2 |
-| main.rs:1472:21:1472:26 | self.x |  | {EXTERNAL LOCATION} | i64 |
-| main.rs:1473:20:1473:26 | ! ... |  | {EXTERNAL LOCATION} | i64 |
-| main.rs:1473:21:1473:24 | self |  | main.rs:1278:5:1283:5 | Vec2 |
-| main.rs:1473:21:1473:26 | self.y |  | {EXTERNAL LOCATION} | i64 |
-| main.rs:1479:15:1479:19 | SelfParam |  | file://:0:0:0:0 | & |
-| main.rs:1479:15:1479:19 | SelfParam | &T | main.rs:1278:5:1283:5 | Vec2 |
-| main.rs:1479:22:1479:26 | other |  | file://:0:0:0:0 | & |
-| main.rs:1479:22:1479:26 | other | &T | main.rs:1278:5:1283:5 | Vec2 |
-| main.rs:1479:44:1481:9 | { ... } |  | {EXTERNAL LOCATION} | bool |
-| main.rs:1480:13:1480:16 | self |  | file://:0:0:0:0 | & |
-| main.rs:1480:13:1480:16 | self | &T | main.rs:1278:5:1283:5 | Vec2 |
-| main.rs:1480:13:1480:18 | self.x |  | {EXTERNAL LOCATION} | i64 |
-| main.rs:1480:13:1480:29 | ... == ... |  | {EXTERNAL LOCATION} | bool |
-| main.rs:1480:13:1480:50 | ... && ... |  | {EXTERNAL LOCATION} | bool |
-| main.rs:1480:23:1480:27 | other |  | file://:0:0:0:0 | & |
-| main.rs:1480:23:1480:27 | other | &T | main.rs:1278:5:1283:5 | Vec2 |
-| main.rs:1480:23:1480:29 | other.x |  | {EXTERNAL LOCATION} | i64 |
-| main.rs:1480:34:1480:37 | self |  | file://:0:0:0:0 | & |
-| main.rs:1480:34:1480:37 | self | &T | main.rs:1278:5:1283:5 | Vec2 |
-| main.rs:1480:34:1480:39 | self.y |  | {EXTERNAL LOCATION} | i64 |
-| main.rs:1480:34:1480:50 | ... == ... |  | {EXTERNAL LOCATION} | bool |
-| main.rs:1480:44:1480:48 | other |  | file://:0:0:0:0 | & |
-| main.rs:1480:44:1480:48 | other | &T | main.rs:1278:5:1283:5 | Vec2 |
-| main.rs:1480:44:1480:50 | other.y |  | {EXTERNAL LOCATION} | i64 |
-| main.rs:1483:15:1483:19 | SelfParam |  | file://:0:0:0:0 | & |
-| main.rs:1483:15:1483:19 | SelfParam | &T | main.rs:1278:5:1283:5 | Vec2 |
-| main.rs:1483:22:1483:26 | other |  | file://:0:0:0:0 | & |
-| main.rs:1483:22:1483:26 | other | &T | main.rs:1278:5:1283:5 | Vec2 |
-| main.rs:1483:44:1485:9 | { ... } |  | {EXTERNAL LOCATION} | bool |
-| main.rs:1484:13:1484:16 | self |  | file://:0:0:0:0 | & |
-| main.rs:1484:13:1484:16 | self | &T | main.rs:1278:5:1283:5 | Vec2 |
-| main.rs:1484:13:1484:18 | self.x |  | {EXTERNAL LOCATION} | i64 |
-| main.rs:1484:13:1484:29 | ... != ... |  | {EXTERNAL LOCATION} | bool |
-| main.rs:1484:13:1484:50 | ... \|\| ... |  | {EXTERNAL LOCATION} | bool |
-| main.rs:1484:23:1484:27 | other |  | file://:0:0:0:0 | & |
-| main.rs:1484:23:1484:27 | other | &T | main.rs:1278:5:1283:5 | Vec2 |
-| main.rs:1484:23:1484:29 | other.x |  | {EXTERNAL LOCATION} | i64 |
-| main.rs:1484:34:1484:37 | self |  | file://:0:0:0:0 | & |
-| main.rs:1484:34:1484:37 | self | &T | main.rs:1278:5:1283:5 | Vec2 |
-| main.rs:1484:34:1484:39 | self.y |  | {EXTERNAL LOCATION} | i64 |
-| main.rs:1484:34:1484:50 | ... != ... |  | {EXTERNAL LOCATION} | bool |
-| main.rs:1484:44:1484:48 | other |  | file://:0:0:0:0 | & |
-| main.rs:1484:44:1484:48 | other | &T | main.rs:1278:5:1283:5 | Vec2 |
-| main.rs:1484:44:1484:50 | other.y |  | {EXTERNAL LOCATION} | i64 |
-| main.rs:1489:24:1489:28 | SelfParam |  | file://:0:0:0:0 | & |
-| main.rs:1489:24:1489:28 | SelfParam | &T | main.rs:1278:5:1283:5 | Vec2 |
-| main.rs:1489:31:1489:35 | other |  | file://:0:0:0:0 | & |
-| main.rs:1489:31:1489:35 | other | &T | main.rs:1278:5:1283:5 | Vec2 |
-| main.rs:1489:75:1491:9 | { ... } |  | {EXTERNAL LOCATION} | Option |
-| main.rs:1489:75:1491:9 | { ... } | T | {EXTERNAL LOCATION} | Ordering |
-| main.rs:1490:13:1490:29 | (...) |  | {EXTERNAL LOCATION} | i64 |
-| main.rs:1490:13:1490:63 | ... .partial_cmp(...) |  | {EXTERNAL LOCATION} | Option |
-| main.rs:1490:13:1490:63 | ... .partial_cmp(...) | T | {EXTERNAL LOCATION} | Ordering |
-| main.rs:1490:14:1490:17 | self |  | file://:0:0:0:0 | & |
-| main.rs:1490:14:1490:17 | self | &T | main.rs:1278:5:1283:5 | Vec2 |
-| main.rs:1490:14:1490:19 | self.x |  | {EXTERNAL LOCATION} | i64 |
-| main.rs:1490:14:1490:28 | ... + ... |  | {EXTERNAL LOCATION} | i64 |
-| main.rs:1490:23:1490:26 | self |  | file://:0:0:0:0 | & |
-| main.rs:1490:23:1490:26 | self | &T | main.rs:1278:5:1283:5 | Vec2 |
-| main.rs:1490:23:1490:28 | self.y |  | {EXTERNAL LOCATION} | i64 |
-| main.rs:1490:43:1490:62 | &... |  | file://:0:0:0:0 | & |
-| main.rs:1490:43:1490:62 | &... | &T | {EXTERNAL LOCATION} | i64 |
-| main.rs:1490:44:1490:62 | (...) |  | {EXTERNAL LOCATION} | i64 |
-| main.rs:1490:45:1490:49 | other |  | file://:0:0:0:0 | & |
-| main.rs:1490:45:1490:49 | other | &T | main.rs:1278:5:1283:5 | Vec2 |
-| main.rs:1490:45:1490:51 | other.x |  | {EXTERNAL LOCATION} | i64 |
-| main.rs:1490:45:1490:61 | ... + ... |  | {EXTERNAL LOCATION} | i64 |
-| main.rs:1490:55:1490:59 | other |  | file://:0:0:0:0 | & |
-| main.rs:1490:55:1490:59 | other | &T | main.rs:1278:5:1283:5 | Vec2 |
-| main.rs:1490:55:1490:61 | other.y |  | {EXTERNAL LOCATION} | i64 |
-| main.rs:1493:15:1493:19 | SelfParam |  | file://:0:0:0:0 | & |
-| main.rs:1493:15:1493:19 | SelfParam | &T | main.rs:1278:5:1283:5 | Vec2 |
-| main.rs:1493:22:1493:26 | other |  | file://:0:0:0:0 | & |
-| main.rs:1493:22:1493:26 | other | &T | main.rs:1278:5:1283:5 | Vec2 |
-| main.rs:1493:44:1495:9 | { ... } |  | {EXTERNAL LOCATION} | bool |
-| main.rs:1494:13:1494:16 | self |  | file://:0:0:0:0 | & |
-| main.rs:1494:13:1494:16 | self | &T | main.rs:1278:5:1283:5 | Vec2 |
-| main.rs:1494:13:1494:18 | self.x |  | {EXTERNAL LOCATION} | i64 |
-| main.rs:1494:13:1494:28 | ... < ... |  | {EXTERNAL LOCATION} | bool |
-| main.rs:1494:13:1494:48 | ... && ... |  | {EXTERNAL LOCATION} | bool |
-| main.rs:1494:22:1494:26 | other |  | file://:0:0:0:0 | & |
-| main.rs:1494:22:1494:26 | other | &T | main.rs:1278:5:1283:5 | Vec2 |
-| main.rs:1494:22:1494:28 | other.x |  | {EXTERNAL LOCATION} | i64 |
-| main.rs:1494:33:1494:36 | self |  | file://:0:0:0:0 | & |
-| main.rs:1494:33:1494:36 | self | &T | main.rs:1278:5:1283:5 | Vec2 |
-| main.rs:1494:33:1494:38 | self.y |  | {EXTERNAL LOCATION} | i64 |
-| main.rs:1494:33:1494:48 | ... < ... |  | {EXTERNAL LOCATION} | bool |
-| main.rs:1494:42:1494:46 | other |  | file://:0:0:0:0 | & |
-| main.rs:1494:42:1494:46 | other | &T | main.rs:1278:5:1283:5 | Vec2 |
-| main.rs:1494:42:1494:48 | other.y |  | {EXTERNAL LOCATION} | i64 |
-| main.rs:1497:15:1497:19 | SelfParam |  | file://:0:0:0:0 | & |
-| main.rs:1497:15:1497:19 | SelfParam | &T | main.rs:1278:5:1283:5 | Vec2 |
-| main.rs:1497:22:1497:26 | other |  | file://:0:0:0:0 | & |
-| main.rs:1497:22:1497:26 | other | &T | main.rs:1278:5:1283:5 | Vec2 |
-| main.rs:1497:44:1499:9 | { ... } |  | {EXTERNAL LOCATION} | bool |
-| main.rs:1498:13:1498:16 | self |  | file://:0:0:0:0 | & |
-| main.rs:1498:13:1498:16 | self | &T | main.rs:1278:5:1283:5 | Vec2 |
-| main.rs:1498:13:1498:18 | self.x |  | {EXTERNAL LOCATION} | i64 |
-| main.rs:1498:13:1498:29 | ... <= ... |  | {EXTERNAL LOCATION} | bool |
-| main.rs:1498:13:1498:50 | ... && ... |  | {EXTERNAL LOCATION} | bool |
-| main.rs:1498:23:1498:27 | other |  | file://:0:0:0:0 | & |
-| main.rs:1498:23:1498:27 | other | &T | main.rs:1278:5:1283:5 | Vec2 |
-| main.rs:1498:23:1498:29 | other.x |  | {EXTERNAL LOCATION} | i64 |
-| main.rs:1498:34:1498:37 | self |  | file://:0:0:0:0 | & |
-| main.rs:1498:34:1498:37 | self | &T | main.rs:1278:5:1283:5 | Vec2 |
-| main.rs:1498:34:1498:39 | self.y |  | {EXTERNAL LOCATION} | i64 |
-| main.rs:1498:34:1498:50 | ... <= ... |  | {EXTERNAL LOCATION} | bool |
-| main.rs:1498:44:1498:48 | other |  | file://:0:0:0:0 | & |
-| main.rs:1498:44:1498:48 | other | &T | main.rs:1278:5:1283:5 | Vec2 |
-| main.rs:1498:44:1498:50 | other.y |  | {EXTERNAL LOCATION} | i64 |
-| main.rs:1501:15:1501:19 | SelfParam |  | file://:0:0:0:0 | & |
-| main.rs:1501:15:1501:19 | SelfParam | &T | main.rs:1278:5:1283:5 | Vec2 |
-| main.rs:1501:22:1501:26 | other |  | file://:0:0:0:0 | & |
-| main.rs:1501:22:1501:26 | other | &T | main.rs:1278:5:1283:5 | Vec2 |
-| main.rs:1501:44:1503:9 | { ... } |  | {EXTERNAL LOCATION} | bool |
-| main.rs:1502:13:1502:16 | self |  | file://:0:0:0:0 | & |
-| main.rs:1502:13:1502:16 | self | &T | main.rs:1278:5:1283:5 | Vec2 |
-| main.rs:1502:13:1502:18 | self.x |  | {EXTERNAL LOCATION} | i64 |
-| main.rs:1502:13:1502:28 | ... > ... |  | {EXTERNAL LOCATION} | bool |
-| main.rs:1502:13:1502:48 | ... && ... |  | {EXTERNAL LOCATION} | bool |
+| main.rs:1318:13:1318:16 | self | &T | main.rs:1297:5:1302:5 | Vec2 |
+| main.rs:1318:13:1318:18 | self.x |  | {EXTERNAL LOCATION} | i64 |
+| main.rs:1318:13:1318:27 | ... += ... |  | file://:0:0:0:0 | () |
+| main.rs:1318:23:1318:25 | rhs |  | main.rs:1297:5:1302:5 | Vec2 |
+| main.rs:1318:23:1318:27 | rhs.x |  | {EXTERNAL LOCATION} | i64 |
+| main.rs:1319:13:1319:16 | self |  | file://:0:0:0:0 | & |
+| main.rs:1319:13:1319:16 | self | &T | main.rs:1297:5:1302:5 | Vec2 |
+| main.rs:1319:13:1319:18 | self.y |  | {EXTERNAL LOCATION} | i64 |
+| main.rs:1319:13:1319:27 | ... += ... |  | file://:0:0:0:0 | () |
+| main.rs:1319:23:1319:25 | rhs |  | main.rs:1297:5:1302:5 | Vec2 |
+| main.rs:1319:23:1319:27 | rhs.y |  | {EXTERNAL LOCATION} | i64 |
+| main.rs:1325:16:1325:19 | SelfParam |  | main.rs:1297:5:1302:5 | Vec2 |
+| main.rs:1325:22:1325:24 | rhs |  | main.rs:1297:5:1302:5 | Vec2 |
+| main.rs:1325:41:1330:9 | { ... } |  | main.rs:1297:5:1302:5 | Vec2 |
+| main.rs:1326:13:1329:13 | Vec2 {...} |  | main.rs:1297:5:1302:5 | Vec2 |
+| main.rs:1327:20:1327:23 | self |  | main.rs:1297:5:1302:5 | Vec2 |
+| main.rs:1327:20:1327:25 | self.x |  | {EXTERNAL LOCATION} | i64 |
+| main.rs:1327:20:1327:33 | ... - ... |  | {EXTERNAL LOCATION} | i64 |
+| main.rs:1327:29:1327:31 | rhs |  | main.rs:1297:5:1302:5 | Vec2 |
+| main.rs:1327:29:1327:33 | rhs.x |  | {EXTERNAL LOCATION} | i64 |
+| main.rs:1328:20:1328:23 | self |  | main.rs:1297:5:1302:5 | Vec2 |
+| main.rs:1328:20:1328:25 | self.y |  | {EXTERNAL LOCATION} | i64 |
+| main.rs:1328:20:1328:33 | ... - ... |  | {EXTERNAL LOCATION} | i64 |
+| main.rs:1328:29:1328:31 | rhs |  | main.rs:1297:5:1302:5 | Vec2 |
+| main.rs:1328:29:1328:33 | rhs.y |  | {EXTERNAL LOCATION} | i64 |
+| main.rs:1335:23:1335:31 | SelfParam |  | file://:0:0:0:0 | & |
+| main.rs:1335:23:1335:31 | SelfParam | &T | main.rs:1297:5:1302:5 | Vec2 |
+| main.rs:1335:34:1335:36 | rhs |  | main.rs:1297:5:1302:5 | Vec2 |
+| main.rs:1336:13:1336:16 | self |  | file://:0:0:0:0 | & |
+| main.rs:1336:13:1336:16 | self | &T | main.rs:1297:5:1302:5 | Vec2 |
+| main.rs:1336:13:1336:18 | self.x |  | {EXTERNAL LOCATION} | i64 |
+| main.rs:1336:13:1336:27 | ... -= ... |  | file://:0:0:0:0 | () |
+| main.rs:1336:23:1336:25 | rhs |  | main.rs:1297:5:1302:5 | Vec2 |
+| main.rs:1336:23:1336:27 | rhs.x |  | {EXTERNAL LOCATION} | i64 |
+| main.rs:1337:13:1337:16 | self |  | file://:0:0:0:0 | & |
+| main.rs:1337:13:1337:16 | self | &T | main.rs:1297:5:1302:5 | Vec2 |
+| main.rs:1337:13:1337:18 | self.y |  | {EXTERNAL LOCATION} | i64 |
+| main.rs:1337:13:1337:27 | ... -= ... |  | file://:0:0:0:0 | () |
+| main.rs:1337:23:1337:25 | rhs |  | main.rs:1297:5:1302:5 | Vec2 |
+| main.rs:1337:23:1337:27 | rhs.y |  | {EXTERNAL LOCATION} | i64 |
+| main.rs:1343:16:1343:19 | SelfParam |  | main.rs:1297:5:1302:5 | Vec2 |
+| main.rs:1343:22:1343:24 | rhs |  | main.rs:1297:5:1302:5 | Vec2 |
+| main.rs:1343:41:1348:9 | { ... } |  | main.rs:1297:5:1302:5 | Vec2 |
+| main.rs:1344:13:1347:13 | Vec2 {...} |  | main.rs:1297:5:1302:5 | Vec2 |
+| main.rs:1345:20:1345:23 | self |  | main.rs:1297:5:1302:5 | Vec2 |
+| main.rs:1345:20:1345:25 | self.x |  | {EXTERNAL LOCATION} | i64 |
+| main.rs:1345:20:1345:33 | ... * ... |  | {EXTERNAL LOCATION} | i64 |
+| main.rs:1345:29:1345:31 | rhs |  | main.rs:1297:5:1302:5 | Vec2 |
+| main.rs:1345:29:1345:33 | rhs.x |  | {EXTERNAL LOCATION} | i64 |
+| main.rs:1346:20:1346:23 | self |  | main.rs:1297:5:1302:5 | Vec2 |
+| main.rs:1346:20:1346:25 | self.y |  | {EXTERNAL LOCATION} | i64 |
+| main.rs:1346:20:1346:33 | ... * ... |  | {EXTERNAL LOCATION} | i64 |
+| main.rs:1346:29:1346:31 | rhs |  | main.rs:1297:5:1302:5 | Vec2 |
+| main.rs:1346:29:1346:33 | rhs.y |  | {EXTERNAL LOCATION} | i64 |
+| main.rs:1352:23:1352:31 | SelfParam |  | file://:0:0:0:0 | & |
+| main.rs:1352:23:1352:31 | SelfParam | &T | main.rs:1297:5:1302:5 | Vec2 |
+| main.rs:1352:34:1352:36 | rhs |  | main.rs:1297:5:1302:5 | Vec2 |
+| main.rs:1353:13:1353:16 | self |  | file://:0:0:0:0 | & |
+| main.rs:1353:13:1353:16 | self | &T | main.rs:1297:5:1302:5 | Vec2 |
+| main.rs:1353:13:1353:18 | self.x |  | {EXTERNAL LOCATION} | i64 |
+| main.rs:1353:13:1353:27 | ... *= ... |  | file://:0:0:0:0 | () |
+| main.rs:1353:23:1353:25 | rhs |  | main.rs:1297:5:1302:5 | Vec2 |
+| main.rs:1353:23:1353:27 | rhs.x |  | {EXTERNAL LOCATION} | i64 |
+| main.rs:1354:13:1354:16 | self |  | file://:0:0:0:0 | & |
+| main.rs:1354:13:1354:16 | self | &T | main.rs:1297:5:1302:5 | Vec2 |
+| main.rs:1354:13:1354:18 | self.y |  | {EXTERNAL LOCATION} | i64 |
+| main.rs:1354:13:1354:27 | ... *= ... |  | file://:0:0:0:0 | () |
+| main.rs:1354:23:1354:25 | rhs |  | main.rs:1297:5:1302:5 | Vec2 |
+| main.rs:1354:23:1354:27 | rhs.y |  | {EXTERNAL LOCATION} | i64 |
+| main.rs:1360:16:1360:19 | SelfParam |  | main.rs:1297:5:1302:5 | Vec2 |
+| main.rs:1360:22:1360:24 | rhs |  | main.rs:1297:5:1302:5 | Vec2 |
+| main.rs:1360:41:1365:9 | { ... } |  | main.rs:1297:5:1302:5 | Vec2 |
+| main.rs:1361:13:1364:13 | Vec2 {...} |  | main.rs:1297:5:1302:5 | Vec2 |
+| main.rs:1362:20:1362:23 | self |  | main.rs:1297:5:1302:5 | Vec2 |
+| main.rs:1362:20:1362:25 | self.x |  | {EXTERNAL LOCATION} | i64 |
+| main.rs:1362:20:1362:33 | ... / ... |  | {EXTERNAL LOCATION} | i64 |
+| main.rs:1362:29:1362:31 | rhs |  | main.rs:1297:5:1302:5 | Vec2 |
+| main.rs:1362:29:1362:33 | rhs.x |  | {EXTERNAL LOCATION} | i64 |
+| main.rs:1363:20:1363:23 | self |  | main.rs:1297:5:1302:5 | Vec2 |
+| main.rs:1363:20:1363:25 | self.y |  | {EXTERNAL LOCATION} | i64 |
+| main.rs:1363:20:1363:33 | ... / ... |  | {EXTERNAL LOCATION} | i64 |
+| main.rs:1363:29:1363:31 | rhs |  | main.rs:1297:5:1302:5 | Vec2 |
+| main.rs:1363:29:1363:33 | rhs.y |  | {EXTERNAL LOCATION} | i64 |
+| main.rs:1369:23:1369:31 | SelfParam |  | file://:0:0:0:0 | & |
+| main.rs:1369:23:1369:31 | SelfParam | &T | main.rs:1297:5:1302:5 | Vec2 |
+| main.rs:1369:34:1369:36 | rhs |  | main.rs:1297:5:1302:5 | Vec2 |
+| main.rs:1370:13:1370:16 | self |  | file://:0:0:0:0 | & |
+| main.rs:1370:13:1370:16 | self | &T | main.rs:1297:5:1302:5 | Vec2 |
+| main.rs:1370:13:1370:18 | self.x |  | {EXTERNAL LOCATION} | i64 |
+| main.rs:1370:13:1370:27 | ... /= ... |  | file://:0:0:0:0 | () |
+| main.rs:1370:23:1370:25 | rhs |  | main.rs:1297:5:1302:5 | Vec2 |
+| main.rs:1370:23:1370:27 | rhs.x |  | {EXTERNAL LOCATION} | i64 |
+| main.rs:1371:13:1371:16 | self |  | file://:0:0:0:0 | & |
+| main.rs:1371:13:1371:16 | self | &T | main.rs:1297:5:1302:5 | Vec2 |
+| main.rs:1371:13:1371:18 | self.y |  | {EXTERNAL LOCATION} | i64 |
+| main.rs:1371:13:1371:27 | ... /= ... |  | file://:0:0:0:0 | () |
+| main.rs:1371:23:1371:25 | rhs |  | main.rs:1297:5:1302:5 | Vec2 |
+| main.rs:1371:23:1371:27 | rhs.y |  | {EXTERNAL LOCATION} | i64 |
+| main.rs:1377:16:1377:19 | SelfParam |  | main.rs:1297:5:1302:5 | Vec2 |
+| main.rs:1377:22:1377:24 | rhs |  | main.rs:1297:5:1302:5 | Vec2 |
+| main.rs:1377:41:1382:9 | { ... } |  | main.rs:1297:5:1302:5 | Vec2 |
+| main.rs:1378:13:1381:13 | Vec2 {...} |  | main.rs:1297:5:1302:5 | Vec2 |
+| main.rs:1379:20:1379:23 | self |  | main.rs:1297:5:1302:5 | Vec2 |
+| main.rs:1379:20:1379:25 | self.x |  | {EXTERNAL LOCATION} | i64 |
+| main.rs:1379:20:1379:33 | ... % ... |  | {EXTERNAL LOCATION} | i64 |
+| main.rs:1379:29:1379:31 | rhs |  | main.rs:1297:5:1302:5 | Vec2 |
+| main.rs:1379:29:1379:33 | rhs.x |  | {EXTERNAL LOCATION} | i64 |
+| main.rs:1380:20:1380:23 | self |  | main.rs:1297:5:1302:5 | Vec2 |
+| main.rs:1380:20:1380:25 | self.y |  | {EXTERNAL LOCATION} | i64 |
+| main.rs:1380:20:1380:33 | ... % ... |  | {EXTERNAL LOCATION} | i64 |
+| main.rs:1380:29:1380:31 | rhs |  | main.rs:1297:5:1302:5 | Vec2 |
+| main.rs:1380:29:1380:33 | rhs.y |  | {EXTERNAL LOCATION} | i64 |
+| main.rs:1386:23:1386:31 | SelfParam |  | file://:0:0:0:0 | & |
+| main.rs:1386:23:1386:31 | SelfParam | &T | main.rs:1297:5:1302:5 | Vec2 |
+| main.rs:1386:34:1386:36 | rhs |  | main.rs:1297:5:1302:5 | Vec2 |
+| main.rs:1387:13:1387:16 | self |  | file://:0:0:0:0 | & |
+| main.rs:1387:13:1387:16 | self | &T | main.rs:1297:5:1302:5 | Vec2 |
+| main.rs:1387:13:1387:18 | self.x |  | {EXTERNAL LOCATION} | i64 |
+| main.rs:1387:13:1387:27 | ... %= ... |  | file://:0:0:0:0 | () |
+| main.rs:1387:23:1387:25 | rhs |  | main.rs:1297:5:1302:5 | Vec2 |
+| main.rs:1387:23:1387:27 | rhs.x |  | {EXTERNAL LOCATION} | i64 |
+| main.rs:1388:13:1388:16 | self |  | file://:0:0:0:0 | & |
+| main.rs:1388:13:1388:16 | self | &T | main.rs:1297:5:1302:5 | Vec2 |
+| main.rs:1388:13:1388:18 | self.y |  | {EXTERNAL LOCATION} | i64 |
+| main.rs:1388:13:1388:27 | ... %= ... |  | file://:0:0:0:0 | () |
+| main.rs:1388:23:1388:25 | rhs |  | main.rs:1297:5:1302:5 | Vec2 |
+| main.rs:1388:23:1388:27 | rhs.y |  | {EXTERNAL LOCATION} | i64 |
+| main.rs:1394:19:1394:22 | SelfParam |  | main.rs:1297:5:1302:5 | Vec2 |
+| main.rs:1394:25:1394:27 | rhs |  | main.rs:1297:5:1302:5 | Vec2 |
+| main.rs:1394:44:1399:9 | { ... } |  | main.rs:1297:5:1302:5 | Vec2 |
+| main.rs:1395:13:1398:13 | Vec2 {...} |  | main.rs:1297:5:1302:5 | Vec2 |
+| main.rs:1396:20:1396:23 | self |  | main.rs:1297:5:1302:5 | Vec2 |
+| main.rs:1396:20:1396:25 | self.x |  | {EXTERNAL LOCATION} | i64 |
+| main.rs:1396:20:1396:33 | ... & ... |  | {EXTERNAL LOCATION} | i64 |
+| main.rs:1396:29:1396:31 | rhs |  | main.rs:1297:5:1302:5 | Vec2 |
+| main.rs:1396:29:1396:33 | rhs.x |  | {EXTERNAL LOCATION} | i64 |
+| main.rs:1397:20:1397:23 | self |  | main.rs:1297:5:1302:5 | Vec2 |
+| main.rs:1397:20:1397:25 | self.y |  | {EXTERNAL LOCATION} | i64 |
+| main.rs:1397:20:1397:33 | ... & ... |  | {EXTERNAL LOCATION} | i64 |
+| main.rs:1397:29:1397:31 | rhs |  | main.rs:1297:5:1302:5 | Vec2 |
+| main.rs:1397:29:1397:33 | rhs.y |  | {EXTERNAL LOCATION} | i64 |
+| main.rs:1403:26:1403:34 | SelfParam |  | file://:0:0:0:0 | & |
+| main.rs:1403:26:1403:34 | SelfParam | &T | main.rs:1297:5:1302:5 | Vec2 |
+| main.rs:1403:37:1403:39 | rhs |  | main.rs:1297:5:1302:5 | Vec2 |
+| main.rs:1404:13:1404:16 | self |  | file://:0:0:0:0 | & |
+| main.rs:1404:13:1404:16 | self | &T | main.rs:1297:5:1302:5 | Vec2 |
+| main.rs:1404:13:1404:18 | self.x |  | {EXTERNAL LOCATION} | i64 |
+| main.rs:1404:13:1404:27 | ... &= ... |  | file://:0:0:0:0 | () |
+| main.rs:1404:23:1404:25 | rhs |  | main.rs:1297:5:1302:5 | Vec2 |
+| main.rs:1404:23:1404:27 | rhs.x |  | {EXTERNAL LOCATION} | i64 |
+| main.rs:1405:13:1405:16 | self |  | file://:0:0:0:0 | & |
+| main.rs:1405:13:1405:16 | self | &T | main.rs:1297:5:1302:5 | Vec2 |
+| main.rs:1405:13:1405:18 | self.y |  | {EXTERNAL LOCATION} | i64 |
+| main.rs:1405:13:1405:27 | ... &= ... |  | file://:0:0:0:0 | () |
+| main.rs:1405:23:1405:25 | rhs |  | main.rs:1297:5:1302:5 | Vec2 |
+| main.rs:1405:23:1405:27 | rhs.y |  | {EXTERNAL LOCATION} | i64 |
+| main.rs:1411:18:1411:21 | SelfParam |  | main.rs:1297:5:1302:5 | Vec2 |
+| main.rs:1411:24:1411:26 | rhs |  | main.rs:1297:5:1302:5 | Vec2 |
+| main.rs:1411:43:1416:9 | { ... } |  | main.rs:1297:5:1302:5 | Vec2 |
+| main.rs:1412:13:1415:13 | Vec2 {...} |  | main.rs:1297:5:1302:5 | Vec2 |
+| main.rs:1413:20:1413:23 | self |  | main.rs:1297:5:1302:5 | Vec2 |
+| main.rs:1413:20:1413:25 | self.x |  | {EXTERNAL LOCATION} | i64 |
+| main.rs:1413:20:1413:33 | ... \| ... |  | {EXTERNAL LOCATION} | i64 |
+| main.rs:1413:29:1413:31 | rhs |  | main.rs:1297:5:1302:5 | Vec2 |
+| main.rs:1413:29:1413:33 | rhs.x |  | {EXTERNAL LOCATION} | i64 |
+| main.rs:1414:20:1414:23 | self |  | main.rs:1297:5:1302:5 | Vec2 |
+| main.rs:1414:20:1414:25 | self.y |  | {EXTERNAL LOCATION} | i64 |
+| main.rs:1414:20:1414:33 | ... \| ... |  | {EXTERNAL LOCATION} | i64 |
+| main.rs:1414:29:1414:31 | rhs |  | main.rs:1297:5:1302:5 | Vec2 |
+| main.rs:1414:29:1414:33 | rhs.y |  | {EXTERNAL LOCATION} | i64 |
+| main.rs:1420:25:1420:33 | SelfParam |  | file://:0:0:0:0 | & |
+| main.rs:1420:25:1420:33 | SelfParam | &T | main.rs:1297:5:1302:5 | Vec2 |
+| main.rs:1420:36:1420:38 | rhs |  | main.rs:1297:5:1302:5 | Vec2 |
+| main.rs:1421:13:1421:16 | self |  | file://:0:0:0:0 | & |
+| main.rs:1421:13:1421:16 | self | &T | main.rs:1297:5:1302:5 | Vec2 |
+| main.rs:1421:13:1421:18 | self.x |  | {EXTERNAL LOCATION} | i64 |
+| main.rs:1421:13:1421:27 | ... \|= ... |  | file://:0:0:0:0 | () |
+| main.rs:1421:23:1421:25 | rhs |  | main.rs:1297:5:1302:5 | Vec2 |
+| main.rs:1421:23:1421:27 | rhs.x |  | {EXTERNAL LOCATION} | i64 |
+| main.rs:1422:13:1422:16 | self |  | file://:0:0:0:0 | & |
+| main.rs:1422:13:1422:16 | self | &T | main.rs:1297:5:1302:5 | Vec2 |
+| main.rs:1422:13:1422:18 | self.y |  | {EXTERNAL LOCATION} | i64 |
+| main.rs:1422:13:1422:27 | ... \|= ... |  | file://:0:0:0:0 | () |
+| main.rs:1422:23:1422:25 | rhs |  | main.rs:1297:5:1302:5 | Vec2 |
+| main.rs:1422:23:1422:27 | rhs.y |  | {EXTERNAL LOCATION} | i64 |
+| main.rs:1428:19:1428:22 | SelfParam |  | main.rs:1297:5:1302:5 | Vec2 |
+| main.rs:1428:25:1428:27 | rhs |  | main.rs:1297:5:1302:5 | Vec2 |
+| main.rs:1428:44:1433:9 | { ... } |  | main.rs:1297:5:1302:5 | Vec2 |
+| main.rs:1429:13:1432:13 | Vec2 {...} |  | main.rs:1297:5:1302:5 | Vec2 |
+| main.rs:1430:20:1430:23 | self |  | main.rs:1297:5:1302:5 | Vec2 |
+| main.rs:1430:20:1430:25 | self.x |  | {EXTERNAL LOCATION} | i64 |
+| main.rs:1430:20:1430:33 | ... ^ ... |  | {EXTERNAL LOCATION} | i64 |
+| main.rs:1430:29:1430:31 | rhs |  | main.rs:1297:5:1302:5 | Vec2 |
+| main.rs:1430:29:1430:33 | rhs.x |  | {EXTERNAL LOCATION} | i64 |
+| main.rs:1431:20:1431:23 | self |  | main.rs:1297:5:1302:5 | Vec2 |
+| main.rs:1431:20:1431:25 | self.y |  | {EXTERNAL LOCATION} | i64 |
+| main.rs:1431:20:1431:33 | ... ^ ... |  | {EXTERNAL LOCATION} | i64 |
+| main.rs:1431:29:1431:31 | rhs |  | main.rs:1297:5:1302:5 | Vec2 |
+| main.rs:1431:29:1431:33 | rhs.y |  | {EXTERNAL LOCATION} | i64 |
+| main.rs:1437:26:1437:34 | SelfParam |  | file://:0:0:0:0 | & |
+| main.rs:1437:26:1437:34 | SelfParam | &T | main.rs:1297:5:1302:5 | Vec2 |
+| main.rs:1437:37:1437:39 | rhs |  | main.rs:1297:5:1302:5 | Vec2 |
+| main.rs:1438:13:1438:16 | self |  | file://:0:0:0:0 | & |
+| main.rs:1438:13:1438:16 | self | &T | main.rs:1297:5:1302:5 | Vec2 |
+| main.rs:1438:13:1438:18 | self.x |  | {EXTERNAL LOCATION} | i64 |
+| main.rs:1438:13:1438:27 | ... ^= ... |  | file://:0:0:0:0 | () |
+| main.rs:1438:23:1438:25 | rhs |  | main.rs:1297:5:1302:5 | Vec2 |
+| main.rs:1438:23:1438:27 | rhs.x |  | {EXTERNAL LOCATION} | i64 |
+| main.rs:1439:13:1439:16 | self |  | file://:0:0:0:0 | & |
+| main.rs:1439:13:1439:16 | self | &T | main.rs:1297:5:1302:5 | Vec2 |
+| main.rs:1439:13:1439:18 | self.y |  | {EXTERNAL LOCATION} | i64 |
+| main.rs:1439:13:1439:27 | ... ^= ... |  | file://:0:0:0:0 | () |
+| main.rs:1439:23:1439:25 | rhs |  | main.rs:1297:5:1302:5 | Vec2 |
+| main.rs:1439:23:1439:27 | rhs.y |  | {EXTERNAL LOCATION} | i64 |
+| main.rs:1445:16:1445:19 | SelfParam |  | main.rs:1297:5:1302:5 | Vec2 |
+| main.rs:1445:22:1445:24 | rhs |  | {EXTERNAL LOCATION} | u32 |
+| main.rs:1445:40:1450:9 | { ... } |  | main.rs:1297:5:1302:5 | Vec2 |
+| main.rs:1446:13:1449:13 | Vec2 {...} |  | main.rs:1297:5:1302:5 | Vec2 |
+| main.rs:1447:20:1447:23 | self |  | main.rs:1297:5:1302:5 | Vec2 |
+| main.rs:1447:20:1447:25 | self.x |  | {EXTERNAL LOCATION} | i64 |
+| main.rs:1447:20:1447:32 | ... << ... |  | {EXTERNAL LOCATION} | i64 |
+| main.rs:1447:30:1447:32 | rhs |  | {EXTERNAL LOCATION} | u32 |
+| main.rs:1448:20:1448:23 | self |  | main.rs:1297:5:1302:5 | Vec2 |
+| main.rs:1448:20:1448:25 | self.y |  | {EXTERNAL LOCATION} | i64 |
+| main.rs:1448:20:1448:32 | ... << ... |  | {EXTERNAL LOCATION} | i64 |
+| main.rs:1448:30:1448:32 | rhs |  | {EXTERNAL LOCATION} | u32 |
+| main.rs:1454:23:1454:31 | SelfParam |  | file://:0:0:0:0 | & |
+| main.rs:1454:23:1454:31 | SelfParam | &T | main.rs:1297:5:1302:5 | Vec2 |
+| main.rs:1454:34:1454:36 | rhs |  | {EXTERNAL LOCATION} | u32 |
+| main.rs:1455:13:1455:16 | self |  | file://:0:0:0:0 | & |
+| main.rs:1455:13:1455:16 | self | &T | main.rs:1297:5:1302:5 | Vec2 |
+| main.rs:1455:13:1455:18 | self.x |  | {EXTERNAL LOCATION} | i64 |
+| main.rs:1455:13:1455:26 | ... <<= ... |  | file://:0:0:0:0 | () |
+| main.rs:1455:24:1455:26 | rhs |  | {EXTERNAL LOCATION} | u32 |
+| main.rs:1456:13:1456:16 | self |  | file://:0:0:0:0 | & |
+| main.rs:1456:13:1456:16 | self | &T | main.rs:1297:5:1302:5 | Vec2 |
+| main.rs:1456:13:1456:18 | self.y |  | {EXTERNAL LOCATION} | i64 |
+| main.rs:1456:13:1456:26 | ... <<= ... |  | file://:0:0:0:0 | () |
+| main.rs:1456:24:1456:26 | rhs |  | {EXTERNAL LOCATION} | u32 |
+| main.rs:1462:16:1462:19 | SelfParam |  | main.rs:1297:5:1302:5 | Vec2 |
+| main.rs:1462:22:1462:24 | rhs |  | {EXTERNAL LOCATION} | u32 |
+| main.rs:1462:40:1467:9 | { ... } |  | main.rs:1297:5:1302:5 | Vec2 |
+| main.rs:1463:13:1466:13 | Vec2 {...} |  | main.rs:1297:5:1302:5 | Vec2 |
+| main.rs:1464:20:1464:23 | self |  | main.rs:1297:5:1302:5 | Vec2 |
+| main.rs:1464:20:1464:25 | self.x |  | {EXTERNAL LOCATION} | i64 |
+| main.rs:1464:20:1464:32 | ... >> ... |  | {EXTERNAL LOCATION} | i64 |
+| main.rs:1464:30:1464:32 | rhs |  | {EXTERNAL LOCATION} | u32 |
+| main.rs:1465:20:1465:23 | self |  | main.rs:1297:5:1302:5 | Vec2 |
+| main.rs:1465:20:1465:25 | self.y |  | {EXTERNAL LOCATION} | i64 |
+| main.rs:1465:20:1465:32 | ... >> ... |  | {EXTERNAL LOCATION} | i64 |
+| main.rs:1465:30:1465:32 | rhs |  | {EXTERNAL LOCATION} | u32 |
+| main.rs:1471:23:1471:31 | SelfParam |  | file://:0:0:0:0 | & |
+| main.rs:1471:23:1471:31 | SelfParam | &T | main.rs:1297:5:1302:5 | Vec2 |
+| main.rs:1471:34:1471:36 | rhs |  | {EXTERNAL LOCATION} | u32 |
+| main.rs:1472:13:1472:16 | self |  | file://:0:0:0:0 | & |
+| main.rs:1472:13:1472:16 | self | &T | main.rs:1297:5:1302:5 | Vec2 |
+| main.rs:1472:13:1472:18 | self.x |  | {EXTERNAL LOCATION} | i64 |
+| main.rs:1472:13:1472:26 | ... >>= ... |  | file://:0:0:0:0 | () |
+| main.rs:1472:24:1472:26 | rhs |  | {EXTERNAL LOCATION} | u32 |
+| main.rs:1473:13:1473:16 | self |  | file://:0:0:0:0 | & |
+| main.rs:1473:13:1473:16 | self | &T | main.rs:1297:5:1302:5 | Vec2 |
+| main.rs:1473:13:1473:18 | self.y |  | {EXTERNAL LOCATION} | i64 |
+| main.rs:1473:13:1473:26 | ... >>= ... |  | file://:0:0:0:0 | () |
+| main.rs:1473:24:1473:26 | rhs |  | {EXTERNAL LOCATION} | u32 |
+| main.rs:1479:16:1479:19 | SelfParam |  | main.rs:1297:5:1302:5 | Vec2 |
+| main.rs:1479:30:1484:9 | { ... } |  | main.rs:1297:5:1302:5 | Vec2 |
+| main.rs:1480:13:1483:13 | Vec2 {...} |  | main.rs:1297:5:1302:5 | Vec2 |
+| main.rs:1481:20:1481:26 | - ... |  | {EXTERNAL LOCATION} | i64 |
+| main.rs:1481:21:1481:24 | self |  | main.rs:1297:5:1302:5 | Vec2 |
+| main.rs:1481:21:1481:26 | self.x |  | {EXTERNAL LOCATION} | i64 |
+| main.rs:1482:20:1482:26 | - ... |  | {EXTERNAL LOCATION} | i64 |
+| main.rs:1482:21:1482:24 | self |  | main.rs:1297:5:1302:5 | Vec2 |
+| main.rs:1482:21:1482:26 | self.y |  | {EXTERNAL LOCATION} | i64 |
+| main.rs:1489:16:1489:19 | SelfParam |  | main.rs:1297:5:1302:5 | Vec2 |
+| main.rs:1489:30:1494:9 | { ... } |  | main.rs:1297:5:1302:5 | Vec2 |
+| main.rs:1490:13:1493:13 | Vec2 {...} |  | main.rs:1297:5:1302:5 | Vec2 |
+| main.rs:1491:20:1491:26 | ! ... |  | {EXTERNAL LOCATION} | i64 |
+| main.rs:1491:21:1491:24 | self |  | main.rs:1297:5:1302:5 | Vec2 |
+| main.rs:1491:21:1491:26 | self.x |  | {EXTERNAL LOCATION} | i64 |
+| main.rs:1492:20:1492:26 | ! ... |  | {EXTERNAL LOCATION} | i64 |
+| main.rs:1492:21:1492:24 | self |  | main.rs:1297:5:1302:5 | Vec2 |
+| main.rs:1492:21:1492:26 | self.y |  | {EXTERNAL LOCATION} | i64 |
+| main.rs:1498:15:1498:19 | SelfParam |  | file://:0:0:0:0 | & |
+| main.rs:1498:15:1498:19 | SelfParam | &T | main.rs:1297:5:1302:5 | Vec2 |
+| main.rs:1498:22:1498:26 | other |  | file://:0:0:0:0 | & |
+| main.rs:1498:22:1498:26 | other | &T | main.rs:1297:5:1302:5 | Vec2 |
+| main.rs:1498:44:1500:9 | { ... } |  | {EXTERNAL LOCATION} | bool |
+| main.rs:1499:13:1499:16 | self |  | file://:0:0:0:0 | & |
+| main.rs:1499:13:1499:16 | self | &T | main.rs:1297:5:1302:5 | Vec2 |
+| main.rs:1499:13:1499:18 | self.x |  | {EXTERNAL LOCATION} | i64 |
+| main.rs:1499:13:1499:29 | ... == ... |  | {EXTERNAL LOCATION} | bool |
+| main.rs:1499:13:1499:50 | ... && ... |  | {EXTERNAL LOCATION} | bool |
+| main.rs:1499:23:1499:27 | other |  | file://:0:0:0:0 | & |
+| main.rs:1499:23:1499:27 | other | &T | main.rs:1297:5:1302:5 | Vec2 |
+| main.rs:1499:23:1499:29 | other.x |  | {EXTERNAL LOCATION} | i64 |
+| main.rs:1499:34:1499:37 | self |  | file://:0:0:0:0 | & |
+| main.rs:1499:34:1499:37 | self | &T | main.rs:1297:5:1302:5 | Vec2 |
+| main.rs:1499:34:1499:39 | self.y |  | {EXTERNAL LOCATION} | i64 |
+| main.rs:1499:34:1499:50 | ... == ... |  | {EXTERNAL LOCATION} | bool |
+| main.rs:1499:44:1499:48 | other |  | file://:0:0:0:0 | & |
+| main.rs:1499:44:1499:48 | other | &T | main.rs:1297:5:1302:5 | Vec2 |
+| main.rs:1499:44:1499:50 | other.y |  | {EXTERNAL LOCATION} | i64 |
+| main.rs:1502:15:1502:19 | SelfParam |  | file://:0:0:0:0 | & |
+| main.rs:1502:15:1502:19 | SelfParam | &T | main.rs:1297:5:1302:5 | Vec2 |
 | main.rs:1502:22:1502:26 | other |  | file://:0:0:0:0 | & |
-| main.rs:1502:22:1502:26 | other | &T | main.rs:1278:5:1283:5 | Vec2 |
-| main.rs:1502:22:1502:28 | other.x |  | {EXTERNAL LOCATION} | i64 |
-| main.rs:1502:33:1502:36 | self |  | file://:0:0:0:0 | & |
-| main.rs:1502:33:1502:36 | self | &T | main.rs:1278:5:1283:5 | Vec2 |
-| main.rs:1502:33:1502:38 | self.y |  | {EXTERNAL LOCATION} | i64 |
-| main.rs:1502:33:1502:48 | ... > ... |  | {EXTERNAL LOCATION} | bool |
-| main.rs:1502:42:1502:46 | other |  | file://:0:0:0:0 | & |
-| main.rs:1502:42:1502:46 | other | &T | main.rs:1278:5:1283:5 | Vec2 |
-| main.rs:1502:42:1502:48 | other.y |  | {EXTERNAL LOCATION} | i64 |
-| main.rs:1505:15:1505:19 | SelfParam |  | file://:0:0:0:0 | & |
-| main.rs:1505:15:1505:19 | SelfParam | &T | main.rs:1278:5:1283:5 | Vec2 |
-| main.rs:1505:22:1505:26 | other |  | file://:0:0:0:0 | & |
-| main.rs:1505:22:1505:26 | other | &T | main.rs:1278:5:1283:5 | Vec2 |
-| main.rs:1505:44:1507:9 | { ... } |  | {EXTERNAL LOCATION} | bool |
-| main.rs:1506:13:1506:16 | self |  | file://:0:0:0:0 | & |
-| main.rs:1506:13:1506:16 | self | &T | main.rs:1278:5:1283:5 | Vec2 |
-| main.rs:1506:13:1506:18 | self.x |  | {EXTERNAL LOCATION} | i64 |
-| main.rs:1506:13:1506:29 | ... >= ... |  | {EXTERNAL LOCATION} | bool |
-| main.rs:1506:13:1506:50 | ... && ... |  | {EXTERNAL LOCATION} | bool |
-| main.rs:1506:23:1506:27 | other |  | file://:0:0:0:0 | & |
-| main.rs:1506:23:1506:27 | other | &T | main.rs:1278:5:1283:5 | Vec2 |
-| main.rs:1506:23:1506:29 | other.x |  | {EXTERNAL LOCATION} | i64 |
-| main.rs:1506:34:1506:37 | self |  | file://:0:0:0:0 | & |
-| main.rs:1506:34:1506:37 | self | &T | main.rs:1278:5:1283:5 | Vec2 |
-| main.rs:1506:34:1506:39 | self.y |  | {EXTERNAL LOCATION} | i64 |
-| main.rs:1506:34:1506:50 | ... >= ... |  | {EXTERNAL LOCATION} | bool |
-| main.rs:1506:44:1506:48 | other |  | file://:0:0:0:0 | & |
-| main.rs:1506:44:1506:48 | other | &T | main.rs:1278:5:1283:5 | Vec2 |
-| main.rs:1506:44:1506:50 | other.y |  | {EXTERNAL LOCATION} | i64 |
-| main.rs:1513:13:1513:18 | i64_eq |  | {EXTERNAL LOCATION} | bool |
-| main.rs:1513:22:1513:35 | (...) |  | {EXTERNAL LOCATION} | bool |
-| main.rs:1513:23:1513:26 | 1i64 |  | {EXTERNAL LOCATION} | i64 |
-| main.rs:1513:23:1513:34 | ... == ... |  | {EXTERNAL LOCATION} | bool |
-| main.rs:1513:31:1513:34 | 2i64 |  | {EXTERNAL LOCATION} | i64 |
-| main.rs:1514:13:1514:18 | i64_ne |  | {EXTERNAL LOCATION} | bool |
-| main.rs:1514:22:1514:35 | (...) |  | {EXTERNAL LOCATION} | bool |
-| main.rs:1514:23:1514:26 | 3i64 |  | {EXTERNAL LOCATION} | i64 |
-| main.rs:1514:23:1514:34 | ... != ... |  | {EXTERNAL LOCATION} | bool |
-| main.rs:1514:31:1514:34 | 4i64 |  | {EXTERNAL LOCATION} | i64 |
-| main.rs:1515:13:1515:18 | i64_lt |  | {EXTERNAL LOCATION} | bool |
-| main.rs:1515:22:1515:34 | (...) |  | {EXTERNAL LOCATION} | bool |
-| main.rs:1515:23:1515:26 | 5i64 |  | {EXTERNAL LOCATION} | i64 |
-| main.rs:1515:23:1515:33 | ... < ... |  | {EXTERNAL LOCATION} | bool |
-| main.rs:1515:30:1515:33 | 6i64 |  | {EXTERNAL LOCATION} | i64 |
-| main.rs:1516:13:1516:18 | i64_le |  | {EXTERNAL LOCATION} | bool |
-| main.rs:1516:22:1516:35 | (...) |  | {EXTERNAL LOCATION} | bool |
-| main.rs:1516:23:1516:26 | 7i64 |  | {EXTERNAL LOCATION} | i64 |
-| main.rs:1516:23:1516:34 | ... <= ... |  | {EXTERNAL LOCATION} | bool |
-| main.rs:1516:31:1516:34 | 8i64 |  | {EXTERNAL LOCATION} | i64 |
-| main.rs:1517:13:1517:18 | i64_gt |  | {EXTERNAL LOCATION} | bool |
-| main.rs:1517:22:1517:35 | (...) |  | {EXTERNAL LOCATION} | bool |
-| main.rs:1517:23:1517:26 | 9i64 |  | {EXTERNAL LOCATION} | i64 |
-| main.rs:1517:23:1517:34 | ... > ... |  | {EXTERNAL LOCATION} | bool |
-| main.rs:1517:30:1517:34 | 10i64 |  | {EXTERNAL LOCATION} | i64 |
-| main.rs:1518:13:1518:18 | i64_ge |  | {EXTERNAL LOCATION} | bool |
-| main.rs:1518:22:1518:37 | (...) |  | {EXTERNAL LOCATION} | bool |
-| main.rs:1518:23:1518:27 | 11i64 |  | {EXTERNAL LOCATION} | i64 |
-| main.rs:1518:23:1518:36 | ... >= ... |  | {EXTERNAL LOCATION} | bool |
-| main.rs:1518:32:1518:36 | 12i64 |  | {EXTERNAL LOCATION} | i64 |
-| main.rs:1521:13:1521:19 | i64_add |  | {EXTERNAL LOCATION} | i64 |
-| main.rs:1521:23:1521:27 | 13i64 |  | {EXTERNAL LOCATION} | i64 |
-| main.rs:1521:23:1521:35 | ... + ... |  | {EXTERNAL LOCATION} | i64 |
-| main.rs:1521:31:1521:35 | 14i64 |  | {EXTERNAL LOCATION} | i64 |
-| main.rs:1522:13:1522:19 | i64_sub |  | {EXTERNAL LOCATION} | i64 |
-| main.rs:1522:23:1522:27 | 15i64 |  | {EXTERNAL LOCATION} | i64 |
-| main.rs:1522:23:1522:35 | ... - ... |  | {EXTERNAL LOCATION} | i64 |
-| main.rs:1522:31:1522:35 | 16i64 |  | {EXTERNAL LOCATION} | i64 |
-| main.rs:1523:13:1523:19 | i64_mul |  | {EXTERNAL LOCATION} | i64 |
-| main.rs:1523:23:1523:27 | 17i64 |  | {EXTERNAL LOCATION} | i64 |
-| main.rs:1523:23:1523:35 | ... * ... |  | {EXTERNAL LOCATION} | i64 |
-| main.rs:1523:31:1523:35 | 18i64 |  | {EXTERNAL LOCATION} | i64 |
-| main.rs:1524:13:1524:19 | i64_div |  | {EXTERNAL LOCATION} | i64 |
-| main.rs:1524:23:1524:27 | 19i64 |  | {EXTERNAL LOCATION} | i64 |
-| main.rs:1524:23:1524:35 | ... / ... |  | {EXTERNAL LOCATION} | i64 |
-| main.rs:1524:31:1524:35 | 20i64 |  | {EXTERNAL LOCATION} | i64 |
-| main.rs:1525:13:1525:19 | i64_rem |  | {EXTERNAL LOCATION} | i64 |
-| main.rs:1525:23:1525:27 | 21i64 |  | {EXTERNAL LOCATION} | i64 |
-| main.rs:1525:23:1525:35 | ... % ... |  | {EXTERNAL LOCATION} | i64 |
-| main.rs:1525:31:1525:35 | 22i64 |  | {EXTERNAL LOCATION} | i64 |
-| main.rs:1528:13:1528:30 | mut i64_add_assign |  | {EXTERNAL LOCATION} | i64 |
-| main.rs:1528:34:1528:38 | 23i64 |  | {EXTERNAL LOCATION} | i64 |
-| main.rs:1529:9:1529:22 | i64_add_assign |  | {EXTERNAL LOCATION} | i64 |
-| main.rs:1529:9:1529:31 | ... += ... |  | file://:0:0:0:0 | () |
-| main.rs:1529:27:1529:31 | 24i64 |  | {EXTERNAL LOCATION} | i64 |
-| main.rs:1531:13:1531:30 | mut i64_sub_assign |  | {EXTERNAL LOCATION} | i64 |
-| main.rs:1531:34:1531:38 | 25i64 |  | {EXTERNAL LOCATION} | i64 |
-| main.rs:1532:9:1532:22 | i64_sub_assign |  | {EXTERNAL LOCATION} | i64 |
-| main.rs:1532:9:1532:31 | ... -= ... |  | file://:0:0:0:0 | () |
-| main.rs:1532:27:1532:31 | 26i64 |  | {EXTERNAL LOCATION} | i64 |
-| main.rs:1534:13:1534:30 | mut i64_mul_assign |  | {EXTERNAL LOCATION} | i64 |
-| main.rs:1534:34:1534:38 | 27i64 |  | {EXTERNAL LOCATION} | i64 |
-| main.rs:1535:9:1535:22 | i64_mul_assign |  | {EXTERNAL LOCATION} | i64 |
-| main.rs:1535:9:1535:31 | ... *= ... |  | file://:0:0:0:0 | () |
-| main.rs:1535:27:1535:31 | 28i64 |  | {EXTERNAL LOCATION} | i64 |
-| main.rs:1537:13:1537:30 | mut i64_div_assign |  | {EXTERNAL LOCATION} | i64 |
-| main.rs:1537:34:1537:38 | 29i64 |  | {EXTERNAL LOCATION} | i64 |
-| main.rs:1538:9:1538:22 | i64_div_assign |  | {EXTERNAL LOCATION} | i64 |
-| main.rs:1538:9:1538:31 | ... /= ... |  | file://:0:0:0:0 | () |
-| main.rs:1538:27:1538:31 | 30i64 |  | {EXTERNAL LOCATION} | i64 |
-| main.rs:1540:13:1540:30 | mut i64_rem_assign |  | {EXTERNAL LOCATION} | i64 |
-| main.rs:1540:34:1540:38 | 31i64 |  | {EXTERNAL LOCATION} | i64 |
-| main.rs:1541:9:1541:22 | i64_rem_assign |  | {EXTERNAL LOCATION} | i64 |
-| main.rs:1541:9:1541:31 | ... %= ... |  | file://:0:0:0:0 | () |
-| main.rs:1541:27:1541:31 | 32i64 |  | {EXTERNAL LOCATION} | i64 |
-| main.rs:1544:13:1544:22 | i64_bitand |  | {EXTERNAL LOCATION} | i64 |
-| main.rs:1544:26:1544:30 | 33i64 |  | {EXTERNAL LOCATION} | i64 |
-| main.rs:1544:26:1544:38 | ... & ... |  | {EXTERNAL LOCATION} | i64 |
-| main.rs:1544:34:1544:38 | 34i64 |  | {EXTERNAL LOCATION} | i64 |
-| main.rs:1545:13:1545:21 | i64_bitor |  | {EXTERNAL LOCATION} | i64 |
-| main.rs:1545:25:1545:29 | 35i64 |  | {EXTERNAL LOCATION} | i64 |
-| main.rs:1545:25:1545:37 | ... \| ... |  | {EXTERNAL LOCATION} | i64 |
-| main.rs:1545:33:1545:37 | 36i64 |  | {EXTERNAL LOCATION} | i64 |
-| main.rs:1546:13:1546:22 | i64_bitxor |  | {EXTERNAL LOCATION} | i64 |
-| main.rs:1546:26:1546:30 | 37i64 |  | {EXTERNAL LOCATION} | i64 |
-| main.rs:1546:26:1546:38 | ... ^ ... |  | {EXTERNAL LOCATION} | i64 |
-| main.rs:1546:34:1546:38 | 38i64 |  | {EXTERNAL LOCATION} | i64 |
-| main.rs:1547:13:1547:19 | i64_shl |  | {EXTERNAL LOCATION} | i64 |
-| main.rs:1547:23:1547:27 | 39i64 |  | {EXTERNAL LOCATION} | i64 |
-| main.rs:1547:23:1547:36 | ... << ... |  | {EXTERNAL LOCATION} | i64 |
-| main.rs:1547:32:1547:36 | 40i64 |  | {EXTERNAL LOCATION} | i64 |
-| main.rs:1548:13:1548:19 | i64_shr |  | {EXTERNAL LOCATION} | i64 |
-| main.rs:1548:23:1548:27 | 41i64 |  | {EXTERNAL LOCATION} | i64 |
-| main.rs:1548:23:1548:36 | ... >> ... |  | {EXTERNAL LOCATION} | i64 |
-| main.rs:1548:32:1548:36 | 42i64 |  | {EXTERNAL LOCATION} | i64 |
-| main.rs:1551:13:1551:33 | mut i64_bitand_assign |  | {EXTERNAL LOCATION} | i64 |
-| main.rs:1551:37:1551:41 | 43i64 |  | {EXTERNAL LOCATION} | i64 |
-| main.rs:1552:9:1552:25 | i64_bitand_assign |  | {EXTERNAL LOCATION} | i64 |
-| main.rs:1552:9:1552:34 | ... &= ... |  | file://:0:0:0:0 | () |
-| main.rs:1552:30:1552:34 | 44i64 |  | {EXTERNAL LOCATION} | i64 |
-| main.rs:1554:13:1554:32 | mut i64_bitor_assign |  | {EXTERNAL LOCATION} | i64 |
-| main.rs:1554:36:1554:40 | 45i64 |  | {EXTERNAL LOCATION} | i64 |
-| main.rs:1555:9:1555:24 | i64_bitor_assign |  | {EXTERNAL LOCATION} | i64 |
-| main.rs:1555:9:1555:33 | ... \|= ... |  | file://:0:0:0:0 | () |
-| main.rs:1555:29:1555:33 | 46i64 |  | {EXTERNAL LOCATION} | i64 |
-| main.rs:1557:13:1557:33 | mut i64_bitxor_assign |  | {EXTERNAL LOCATION} | i64 |
-| main.rs:1557:37:1557:41 | 47i64 |  | {EXTERNAL LOCATION} | i64 |
-| main.rs:1558:9:1558:25 | i64_bitxor_assign |  | {EXTERNAL LOCATION} | i64 |
-| main.rs:1558:9:1558:34 | ... ^= ... |  | file://:0:0:0:0 | () |
-| main.rs:1558:30:1558:34 | 48i64 |  | {EXTERNAL LOCATION} | i64 |
-| main.rs:1560:13:1560:30 | mut i64_shl_assign |  | {EXTERNAL LOCATION} | i64 |
-| main.rs:1560:34:1560:38 | 49i64 |  | {EXTERNAL LOCATION} | i64 |
-| main.rs:1561:9:1561:22 | i64_shl_assign |  | {EXTERNAL LOCATION} | i64 |
-| main.rs:1561:9:1561:32 | ... <<= ... |  | file://:0:0:0:0 | () |
-| main.rs:1561:28:1561:32 | 50i64 |  | {EXTERNAL LOCATION} | i64 |
-| main.rs:1563:13:1563:30 | mut i64_shr_assign |  | {EXTERNAL LOCATION} | i64 |
-| main.rs:1563:34:1563:38 | 51i64 |  | {EXTERNAL LOCATION} | i64 |
-| main.rs:1564:9:1564:22 | i64_shr_assign |  | {EXTERNAL LOCATION} | i64 |
-| main.rs:1564:9:1564:32 | ... >>= ... |  | file://:0:0:0:0 | () |
-| main.rs:1564:28:1564:32 | 52i64 |  | {EXTERNAL LOCATION} | i64 |
-| main.rs:1566:13:1566:19 | i64_neg |  | {EXTERNAL LOCATION} | i64 |
-| main.rs:1566:23:1566:28 | - ... |  | {EXTERNAL LOCATION} | i64 |
-| main.rs:1566:24:1566:28 | 53i64 |  | {EXTERNAL LOCATION} | i64 |
-| main.rs:1567:13:1567:19 | i64_not |  | {EXTERNAL LOCATION} | i64 |
-| main.rs:1567:23:1567:28 | ! ... |  | {EXTERNAL LOCATION} | i64 |
-| main.rs:1567:24:1567:28 | 54i64 |  | {EXTERNAL LOCATION} | i64 |
-| main.rs:1570:13:1570:14 | v1 |  | main.rs:1278:5:1283:5 | Vec2 |
-| main.rs:1570:18:1570:36 | Vec2 {...} |  | main.rs:1278:5:1283:5 | Vec2 |
-| main.rs:1570:28:1570:28 | 1 |  | {EXTERNAL LOCATION} | i32 |
-| main.rs:1570:28:1570:28 | 1 |  | {EXTERNAL LOCATION} | i64 |
-| main.rs:1570:34:1570:34 | 2 |  | {EXTERNAL LOCATION} | i32 |
-| main.rs:1570:34:1570:34 | 2 |  | {EXTERNAL LOCATION} | i64 |
-| main.rs:1571:13:1571:14 | v2 |  | file://:0:0:0:0 | & |
-| main.rs:1571:13:1571:14 | v2 |  | main.rs:1278:5:1283:5 | Vec2 |
-| main.rs:1571:13:1571:14 | v2 | &T | main.rs:1278:5:1283:5 | Vec2 |
-| main.rs:1571:18:1571:36 | Vec2 {...} |  | file://:0:0:0:0 | & |
-| main.rs:1571:18:1571:36 | Vec2 {...} |  | main.rs:1278:5:1283:5 | Vec2 |
-| main.rs:1571:18:1571:36 | Vec2 {...} | &T | main.rs:1278:5:1283:5 | Vec2 |
-| main.rs:1571:28:1571:28 | 3 |  | {EXTERNAL LOCATION} | i32 |
-| main.rs:1571:28:1571:28 | 3 |  | {EXTERNAL LOCATION} | i64 |
-| main.rs:1571:34:1571:34 | 4 |  | {EXTERNAL LOCATION} | i32 |
-| main.rs:1571:34:1571:34 | 4 |  | {EXTERNAL LOCATION} | i64 |
-| main.rs:1574:13:1574:19 | vec2_eq |  | {EXTERNAL LOCATION} | bool |
-| main.rs:1574:23:1574:24 | v1 |  | main.rs:1278:5:1283:5 | Vec2 |
-| main.rs:1574:23:1574:30 | ... == ... |  | {EXTERNAL LOCATION} | bool |
-| main.rs:1574:29:1574:30 | v2 |  | file://:0:0:0:0 | & |
-| main.rs:1574:29:1574:30 | v2 |  | main.rs:1278:5:1283:5 | Vec2 |
-| main.rs:1574:29:1574:30 | v2 | &T | main.rs:1278:5:1283:5 | Vec2 |
-| main.rs:1575:13:1575:19 | vec2_ne |  | {EXTERNAL LOCATION} | bool |
-| main.rs:1575:23:1575:24 | v1 |  | main.rs:1278:5:1283:5 | Vec2 |
-| main.rs:1575:23:1575:30 | ... != ... |  | {EXTERNAL LOCATION} | bool |
-| main.rs:1575:29:1575:30 | v2 |  | file://:0:0:0:0 | & |
-| main.rs:1575:29:1575:30 | v2 |  | main.rs:1278:5:1283:5 | Vec2 |
-| main.rs:1575:29:1575:30 | v2 | &T | main.rs:1278:5:1283:5 | Vec2 |
-| main.rs:1576:13:1576:19 | vec2_lt |  | {EXTERNAL LOCATION} | bool |
-| main.rs:1576:23:1576:24 | v1 |  | main.rs:1278:5:1283:5 | Vec2 |
-| main.rs:1576:23:1576:29 | ... < ... |  | {EXTERNAL LOCATION} | bool |
-| main.rs:1576:28:1576:29 | v2 |  | file://:0:0:0:0 | & |
-| main.rs:1576:28:1576:29 | v2 |  | main.rs:1278:5:1283:5 | Vec2 |
-| main.rs:1576:28:1576:29 | v2 | &T | main.rs:1278:5:1283:5 | Vec2 |
-| main.rs:1577:13:1577:19 | vec2_le |  | {EXTERNAL LOCATION} | bool |
-| main.rs:1577:23:1577:24 | v1 |  | main.rs:1278:5:1283:5 | Vec2 |
-| main.rs:1577:23:1577:30 | ... <= ... |  | {EXTERNAL LOCATION} | bool |
-| main.rs:1577:29:1577:30 | v2 |  | file://:0:0:0:0 | & |
-| main.rs:1577:29:1577:30 | v2 |  | main.rs:1278:5:1283:5 | Vec2 |
-| main.rs:1577:29:1577:30 | v2 | &T | main.rs:1278:5:1283:5 | Vec2 |
-| main.rs:1578:13:1578:19 | vec2_gt |  | {EXTERNAL LOCATION} | bool |
-| main.rs:1578:23:1578:24 | v1 |  | main.rs:1278:5:1283:5 | Vec2 |
-| main.rs:1578:23:1578:29 | ... > ... |  | {EXTERNAL LOCATION} | bool |
-| main.rs:1578:28:1578:29 | v2 |  | file://:0:0:0:0 | & |
-| main.rs:1578:28:1578:29 | v2 |  | main.rs:1278:5:1283:5 | Vec2 |
-| main.rs:1578:28:1578:29 | v2 | &T | main.rs:1278:5:1283:5 | Vec2 |
-| main.rs:1579:13:1579:19 | vec2_ge |  | {EXTERNAL LOCATION} | bool |
-| main.rs:1579:23:1579:24 | v1 |  | main.rs:1278:5:1283:5 | Vec2 |
-| main.rs:1579:23:1579:30 | ... >= ... |  | {EXTERNAL LOCATION} | bool |
-| main.rs:1579:29:1579:30 | v2 |  | file://:0:0:0:0 | & |
-| main.rs:1579:29:1579:30 | v2 |  | main.rs:1278:5:1283:5 | Vec2 |
-| main.rs:1579:29:1579:30 | v2 | &T | main.rs:1278:5:1283:5 | Vec2 |
-| main.rs:1582:13:1582:20 | vec2_add |  | main.rs:1278:5:1283:5 | Vec2 |
-| main.rs:1582:24:1582:25 | v1 |  | main.rs:1278:5:1283:5 | Vec2 |
-| main.rs:1582:24:1582:30 | ... + ... |  | main.rs:1278:5:1283:5 | Vec2 |
-| main.rs:1582:29:1582:30 | v2 |  | file://:0:0:0:0 | & |
-| main.rs:1582:29:1582:30 | v2 |  | main.rs:1278:5:1283:5 | Vec2 |
-| main.rs:1582:29:1582:30 | v2 | &T | main.rs:1278:5:1283:5 | Vec2 |
-| main.rs:1583:13:1583:20 | vec2_sub |  | main.rs:1278:5:1283:5 | Vec2 |
-| main.rs:1583:24:1583:25 | v1 |  | main.rs:1278:5:1283:5 | Vec2 |
-| main.rs:1583:24:1583:30 | ... - ... |  | main.rs:1278:5:1283:5 | Vec2 |
-| main.rs:1583:29:1583:30 | v2 |  | file://:0:0:0:0 | & |
-| main.rs:1583:29:1583:30 | v2 |  | main.rs:1278:5:1283:5 | Vec2 |
-| main.rs:1583:29:1583:30 | v2 | &T | main.rs:1278:5:1283:5 | Vec2 |
-| main.rs:1584:13:1584:20 | vec2_mul |  | main.rs:1278:5:1283:5 | Vec2 |
-| main.rs:1584:24:1584:25 | v1 |  | main.rs:1278:5:1283:5 | Vec2 |
-| main.rs:1584:24:1584:30 | ... * ... |  | main.rs:1278:5:1283:5 | Vec2 |
-| main.rs:1584:29:1584:30 | v2 |  | file://:0:0:0:0 | & |
-| main.rs:1584:29:1584:30 | v2 |  | main.rs:1278:5:1283:5 | Vec2 |
-| main.rs:1584:29:1584:30 | v2 | &T | main.rs:1278:5:1283:5 | Vec2 |
-| main.rs:1585:13:1585:20 | vec2_div |  | main.rs:1278:5:1283:5 | Vec2 |
-| main.rs:1585:24:1585:25 | v1 |  | main.rs:1278:5:1283:5 | Vec2 |
-| main.rs:1585:24:1585:30 | ... / ... |  | main.rs:1278:5:1283:5 | Vec2 |
-| main.rs:1585:29:1585:30 | v2 |  | file://:0:0:0:0 | & |
-| main.rs:1585:29:1585:30 | v2 |  | main.rs:1278:5:1283:5 | Vec2 |
-| main.rs:1585:29:1585:30 | v2 | &T | main.rs:1278:5:1283:5 | Vec2 |
-| main.rs:1586:13:1586:20 | vec2_rem |  | main.rs:1278:5:1283:5 | Vec2 |
-| main.rs:1586:24:1586:25 | v1 |  | main.rs:1278:5:1283:5 | Vec2 |
-| main.rs:1586:24:1586:30 | ... % ... |  | main.rs:1278:5:1283:5 | Vec2 |
-| main.rs:1586:29:1586:30 | v2 |  | file://:0:0:0:0 | & |
-| main.rs:1586:29:1586:30 | v2 |  | main.rs:1278:5:1283:5 | Vec2 |
-| main.rs:1586:29:1586:30 | v2 | &T | main.rs:1278:5:1283:5 | Vec2 |
-| main.rs:1589:13:1589:31 | mut vec2_add_assign |  | main.rs:1278:5:1283:5 | Vec2 |
-| main.rs:1589:35:1589:36 | v1 |  | main.rs:1278:5:1283:5 | Vec2 |
-| main.rs:1590:9:1590:23 | vec2_add_assign |  | main.rs:1278:5:1283:5 | Vec2 |
-| main.rs:1590:9:1590:29 | ... += ... |  | file://:0:0:0:0 | () |
-| main.rs:1590:28:1590:29 | v2 |  | file://:0:0:0:0 | & |
-| main.rs:1590:28:1590:29 | v2 |  | main.rs:1278:5:1283:5 | Vec2 |
-| main.rs:1590:28:1590:29 | v2 | &T | main.rs:1278:5:1283:5 | Vec2 |
-| main.rs:1592:13:1592:31 | mut vec2_sub_assign |  | main.rs:1278:5:1283:5 | Vec2 |
-| main.rs:1592:35:1592:36 | v1 |  | main.rs:1278:5:1283:5 | Vec2 |
-| main.rs:1593:9:1593:23 | vec2_sub_assign |  | main.rs:1278:5:1283:5 | Vec2 |
-| main.rs:1593:9:1593:29 | ... -= ... |  | file://:0:0:0:0 | () |
-| main.rs:1593:28:1593:29 | v2 |  | file://:0:0:0:0 | & |
-| main.rs:1593:28:1593:29 | v2 |  | main.rs:1278:5:1283:5 | Vec2 |
-| main.rs:1593:28:1593:29 | v2 | &T | main.rs:1278:5:1283:5 | Vec2 |
-| main.rs:1595:13:1595:31 | mut vec2_mul_assign |  | main.rs:1278:5:1283:5 | Vec2 |
-| main.rs:1595:35:1595:36 | v1 |  | main.rs:1278:5:1283:5 | Vec2 |
-| main.rs:1596:9:1596:23 | vec2_mul_assign |  | main.rs:1278:5:1283:5 | Vec2 |
-| main.rs:1596:9:1596:29 | ... *= ... |  | file://:0:0:0:0 | () |
-| main.rs:1596:28:1596:29 | v2 |  | file://:0:0:0:0 | & |
-| main.rs:1596:28:1596:29 | v2 |  | main.rs:1278:5:1283:5 | Vec2 |
-| main.rs:1596:28:1596:29 | v2 | &T | main.rs:1278:5:1283:5 | Vec2 |
-| main.rs:1598:13:1598:31 | mut vec2_div_assign |  | main.rs:1278:5:1283:5 | Vec2 |
-| main.rs:1598:35:1598:36 | v1 |  | main.rs:1278:5:1283:5 | Vec2 |
-| main.rs:1599:9:1599:23 | vec2_div_assign |  | main.rs:1278:5:1283:5 | Vec2 |
-| main.rs:1599:9:1599:29 | ... /= ... |  | file://:0:0:0:0 | () |
-| main.rs:1599:28:1599:29 | v2 |  | file://:0:0:0:0 | & |
-| main.rs:1599:28:1599:29 | v2 |  | main.rs:1278:5:1283:5 | Vec2 |
-| main.rs:1599:28:1599:29 | v2 | &T | main.rs:1278:5:1283:5 | Vec2 |
-| main.rs:1601:13:1601:31 | mut vec2_rem_assign |  | main.rs:1278:5:1283:5 | Vec2 |
-| main.rs:1601:35:1601:36 | v1 |  | main.rs:1278:5:1283:5 | Vec2 |
-| main.rs:1602:9:1602:23 | vec2_rem_assign |  | main.rs:1278:5:1283:5 | Vec2 |
-| main.rs:1602:9:1602:29 | ... %= ... |  | file://:0:0:0:0 | () |
-| main.rs:1602:28:1602:29 | v2 |  | file://:0:0:0:0 | & |
-| main.rs:1602:28:1602:29 | v2 |  | main.rs:1278:5:1283:5 | Vec2 |
-| main.rs:1602:28:1602:29 | v2 | &T | main.rs:1278:5:1283:5 | Vec2 |
-| main.rs:1605:13:1605:23 | vec2_bitand |  | main.rs:1278:5:1283:5 | Vec2 |
-| main.rs:1605:27:1605:28 | v1 |  | main.rs:1278:5:1283:5 | Vec2 |
-| main.rs:1605:27:1605:33 | ... & ... |  | main.rs:1278:5:1283:5 | Vec2 |
-| main.rs:1605:32:1605:33 | v2 |  | file://:0:0:0:0 | & |
-| main.rs:1605:32:1605:33 | v2 |  | main.rs:1278:5:1283:5 | Vec2 |
-| main.rs:1605:32:1605:33 | v2 | &T | main.rs:1278:5:1283:5 | Vec2 |
-| main.rs:1606:13:1606:22 | vec2_bitor |  | main.rs:1278:5:1283:5 | Vec2 |
-| main.rs:1606:26:1606:27 | v1 |  | main.rs:1278:5:1283:5 | Vec2 |
-| main.rs:1606:26:1606:32 | ... \| ... |  | main.rs:1278:5:1283:5 | Vec2 |
-| main.rs:1606:31:1606:32 | v2 |  | file://:0:0:0:0 | & |
-| main.rs:1606:31:1606:32 | v2 |  | main.rs:1278:5:1283:5 | Vec2 |
-| main.rs:1606:31:1606:32 | v2 | &T | main.rs:1278:5:1283:5 | Vec2 |
-| main.rs:1607:13:1607:23 | vec2_bitxor |  | main.rs:1278:5:1283:5 | Vec2 |
-| main.rs:1607:27:1607:28 | v1 |  | main.rs:1278:5:1283:5 | Vec2 |
-| main.rs:1607:27:1607:33 | ... ^ ... |  | main.rs:1278:5:1283:5 | Vec2 |
-| main.rs:1607:32:1607:33 | v2 |  | file://:0:0:0:0 | & |
-| main.rs:1607:32:1607:33 | v2 |  | main.rs:1278:5:1283:5 | Vec2 |
-| main.rs:1607:32:1607:33 | v2 | &T | main.rs:1278:5:1283:5 | Vec2 |
-| main.rs:1608:13:1608:20 | vec2_shl |  | main.rs:1278:5:1283:5 | Vec2 |
-| main.rs:1608:24:1608:25 | v1 |  | main.rs:1278:5:1283:5 | Vec2 |
-| main.rs:1608:24:1608:33 | ... << ... |  | main.rs:1278:5:1283:5 | Vec2 |
-| main.rs:1608:30:1608:33 | 1u32 |  | {EXTERNAL LOCATION} | u32 |
-| main.rs:1609:13:1609:20 | vec2_shr |  | main.rs:1278:5:1283:5 | Vec2 |
-| main.rs:1609:24:1609:25 | v1 |  | main.rs:1278:5:1283:5 | Vec2 |
-| main.rs:1609:24:1609:33 | ... >> ... |  | main.rs:1278:5:1283:5 | Vec2 |
-| main.rs:1609:30:1609:33 | 1u32 |  | {EXTERNAL LOCATION} | u32 |
-| main.rs:1612:13:1612:34 | mut vec2_bitand_assign |  | main.rs:1278:5:1283:5 | Vec2 |
-| main.rs:1612:38:1612:39 | v1 |  | main.rs:1278:5:1283:5 | Vec2 |
-| main.rs:1613:9:1613:26 | vec2_bitand_assign |  | main.rs:1278:5:1283:5 | Vec2 |
-| main.rs:1613:9:1613:32 | ... &= ... |  | file://:0:0:0:0 | () |
-| main.rs:1613:31:1613:32 | v2 |  | file://:0:0:0:0 | & |
-| main.rs:1613:31:1613:32 | v2 |  | main.rs:1278:5:1283:5 | Vec2 |
-| main.rs:1613:31:1613:32 | v2 | &T | main.rs:1278:5:1283:5 | Vec2 |
-| main.rs:1615:13:1615:33 | mut vec2_bitor_assign |  | main.rs:1278:5:1283:5 | Vec2 |
-| main.rs:1615:37:1615:38 | v1 |  | main.rs:1278:5:1283:5 | Vec2 |
-| main.rs:1616:9:1616:25 | vec2_bitor_assign |  | main.rs:1278:5:1283:5 | Vec2 |
-| main.rs:1616:9:1616:31 | ... \|= ... |  | file://:0:0:0:0 | () |
-| main.rs:1616:30:1616:31 | v2 |  | file://:0:0:0:0 | & |
-| main.rs:1616:30:1616:31 | v2 |  | main.rs:1278:5:1283:5 | Vec2 |
-| main.rs:1616:30:1616:31 | v2 | &T | main.rs:1278:5:1283:5 | Vec2 |
-| main.rs:1618:13:1618:34 | mut vec2_bitxor_assign |  | main.rs:1278:5:1283:5 | Vec2 |
-| main.rs:1618:38:1618:39 | v1 |  | main.rs:1278:5:1283:5 | Vec2 |
-| main.rs:1619:9:1619:26 | vec2_bitxor_assign |  | main.rs:1278:5:1283:5 | Vec2 |
-| main.rs:1619:9:1619:32 | ... ^= ... |  | file://:0:0:0:0 | () |
-| main.rs:1619:31:1619:32 | v2 |  | file://:0:0:0:0 | & |
-| main.rs:1619:31:1619:32 | v2 |  | main.rs:1278:5:1283:5 | Vec2 |
-| main.rs:1619:31:1619:32 | v2 | &T | main.rs:1278:5:1283:5 | Vec2 |
-| main.rs:1621:13:1621:31 | mut vec2_shl_assign |  | main.rs:1278:5:1283:5 | Vec2 |
-| main.rs:1621:35:1621:36 | v1 |  | main.rs:1278:5:1283:5 | Vec2 |
-| main.rs:1622:9:1622:23 | vec2_shl_assign |  | main.rs:1278:5:1283:5 | Vec2 |
-| main.rs:1622:9:1622:32 | ... <<= ... |  | file://:0:0:0:0 | () |
-| main.rs:1622:29:1622:32 | 1u32 |  | {EXTERNAL LOCATION} | u32 |
-| main.rs:1624:13:1624:31 | mut vec2_shr_assign |  | main.rs:1278:5:1283:5 | Vec2 |
-| main.rs:1624:35:1624:36 | v1 |  | main.rs:1278:5:1283:5 | Vec2 |
-| main.rs:1625:9:1625:23 | vec2_shr_assign |  | main.rs:1278:5:1283:5 | Vec2 |
-| main.rs:1625:9:1625:32 | ... >>= ... |  | file://:0:0:0:0 | () |
-| main.rs:1625:29:1625:32 | 1u32 |  | {EXTERNAL LOCATION} | u32 |
-| main.rs:1628:13:1628:20 | vec2_neg |  | main.rs:1278:5:1283:5 | Vec2 |
-| main.rs:1628:24:1628:26 | - ... |  | main.rs:1278:5:1283:5 | Vec2 |
-| main.rs:1628:25:1628:26 | v1 |  | main.rs:1278:5:1283:5 | Vec2 |
-| main.rs:1629:13:1629:20 | vec2_not |  | main.rs:1278:5:1283:5 | Vec2 |
-| main.rs:1629:24:1629:26 | ! ... |  | main.rs:1278:5:1283:5 | Vec2 |
-| main.rs:1629:25:1629:26 | v1 |  | main.rs:1278:5:1283:5 | Vec2 |
-| main.rs:1635:5:1635:20 | ...::f(...) |  | main.rs:67:5:67:21 | Foo |
-| main.rs:1636:5:1636:60 | ...::g(...) |  | main.rs:67:5:67:21 | Foo |
-| main.rs:1636:20:1636:38 | ...::Foo {...} |  | main.rs:67:5:67:21 | Foo |
-| main.rs:1636:41:1636:59 | ...::Foo {...} |  | main.rs:67:5:67:21 | Foo |
+| main.rs:1502:22:1502:26 | other | &T | main.rs:1297:5:1302:5 | Vec2 |
+| main.rs:1502:44:1504:9 | { ... } |  | {EXTERNAL LOCATION} | bool |
+| main.rs:1503:13:1503:16 | self |  | file://:0:0:0:0 | & |
+| main.rs:1503:13:1503:16 | self | &T | main.rs:1297:5:1302:5 | Vec2 |
+| main.rs:1503:13:1503:18 | self.x |  | {EXTERNAL LOCATION} | i64 |
+| main.rs:1503:13:1503:29 | ... != ... |  | {EXTERNAL LOCATION} | bool |
+| main.rs:1503:13:1503:50 | ... \|\| ... |  | {EXTERNAL LOCATION} | bool |
+| main.rs:1503:23:1503:27 | other |  | file://:0:0:0:0 | & |
+| main.rs:1503:23:1503:27 | other | &T | main.rs:1297:5:1302:5 | Vec2 |
+| main.rs:1503:23:1503:29 | other.x |  | {EXTERNAL LOCATION} | i64 |
+| main.rs:1503:34:1503:37 | self |  | file://:0:0:0:0 | & |
+| main.rs:1503:34:1503:37 | self | &T | main.rs:1297:5:1302:5 | Vec2 |
+| main.rs:1503:34:1503:39 | self.y |  | {EXTERNAL LOCATION} | i64 |
+| main.rs:1503:34:1503:50 | ... != ... |  | {EXTERNAL LOCATION} | bool |
+| main.rs:1503:44:1503:48 | other |  | file://:0:0:0:0 | & |
+| main.rs:1503:44:1503:48 | other | &T | main.rs:1297:5:1302:5 | Vec2 |
+| main.rs:1503:44:1503:50 | other.y |  | {EXTERNAL LOCATION} | i64 |
+| main.rs:1508:24:1508:28 | SelfParam |  | file://:0:0:0:0 | & |
+| main.rs:1508:24:1508:28 | SelfParam | &T | main.rs:1297:5:1302:5 | Vec2 |
+| main.rs:1508:31:1508:35 | other |  | file://:0:0:0:0 | & |
+| main.rs:1508:31:1508:35 | other | &T | main.rs:1297:5:1302:5 | Vec2 |
+| main.rs:1508:75:1510:9 | { ... } |  | {EXTERNAL LOCATION} | Option |
+| main.rs:1508:75:1510:9 | { ... } | T | {EXTERNAL LOCATION} | Ordering |
+| main.rs:1509:13:1509:29 | (...) |  | {EXTERNAL LOCATION} | i64 |
+| main.rs:1509:13:1509:63 | ... .partial_cmp(...) |  | {EXTERNAL LOCATION} | Option |
+| main.rs:1509:13:1509:63 | ... .partial_cmp(...) | T | {EXTERNAL LOCATION} | Ordering |
+| main.rs:1509:14:1509:17 | self |  | file://:0:0:0:0 | & |
+| main.rs:1509:14:1509:17 | self | &T | main.rs:1297:5:1302:5 | Vec2 |
+| main.rs:1509:14:1509:19 | self.x |  | {EXTERNAL LOCATION} | i64 |
+| main.rs:1509:14:1509:28 | ... + ... |  | {EXTERNAL LOCATION} | i64 |
+| main.rs:1509:23:1509:26 | self |  | file://:0:0:0:0 | & |
+| main.rs:1509:23:1509:26 | self | &T | main.rs:1297:5:1302:5 | Vec2 |
+| main.rs:1509:23:1509:28 | self.y |  | {EXTERNAL LOCATION} | i64 |
+| main.rs:1509:43:1509:62 | &... |  | file://:0:0:0:0 | & |
+| main.rs:1509:43:1509:62 | &... | &T | {EXTERNAL LOCATION} | i64 |
+| main.rs:1509:44:1509:62 | (...) |  | {EXTERNAL LOCATION} | i64 |
+| main.rs:1509:45:1509:49 | other |  | file://:0:0:0:0 | & |
+| main.rs:1509:45:1509:49 | other | &T | main.rs:1297:5:1302:5 | Vec2 |
+| main.rs:1509:45:1509:51 | other.x |  | {EXTERNAL LOCATION} | i64 |
+| main.rs:1509:45:1509:61 | ... + ... |  | {EXTERNAL LOCATION} | i64 |
+| main.rs:1509:55:1509:59 | other |  | file://:0:0:0:0 | & |
+| main.rs:1509:55:1509:59 | other | &T | main.rs:1297:5:1302:5 | Vec2 |
+| main.rs:1509:55:1509:61 | other.y |  | {EXTERNAL LOCATION} | i64 |
+| main.rs:1512:15:1512:19 | SelfParam |  | file://:0:0:0:0 | & |
+| main.rs:1512:15:1512:19 | SelfParam | &T | main.rs:1297:5:1302:5 | Vec2 |
+| main.rs:1512:22:1512:26 | other |  | file://:0:0:0:0 | & |
+| main.rs:1512:22:1512:26 | other | &T | main.rs:1297:5:1302:5 | Vec2 |
+| main.rs:1512:44:1514:9 | { ... } |  | {EXTERNAL LOCATION} | bool |
+| main.rs:1513:13:1513:16 | self |  | file://:0:0:0:0 | & |
+| main.rs:1513:13:1513:16 | self | &T | main.rs:1297:5:1302:5 | Vec2 |
+| main.rs:1513:13:1513:18 | self.x |  | {EXTERNAL LOCATION} | i64 |
+| main.rs:1513:13:1513:28 | ... < ... |  | {EXTERNAL LOCATION} | bool |
+| main.rs:1513:13:1513:48 | ... && ... |  | {EXTERNAL LOCATION} | bool |
+| main.rs:1513:22:1513:26 | other |  | file://:0:0:0:0 | & |
+| main.rs:1513:22:1513:26 | other | &T | main.rs:1297:5:1302:5 | Vec2 |
+| main.rs:1513:22:1513:28 | other.x |  | {EXTERNAL LOCATION} | i64 |
+| main.rs:1513:33:1513:36 | self |  | file://:0:0:0:0 | & |
+| main.rs:1513:33:1513:36 | self | &T | main.rs:1297:5:1302:5 | Vec2 |
+| main.rs:1513:33:1513:38 | self.y |  | {EXTERNAL LOCATION} | i64 |
+| main.rs:1513:33:1513:48 | ... < ... |  | {EXTERNAL LOCATION} | bool |
+| main.rs:1513:42:1513:46 | other |  | file://:0:0:0:0 | & |
+| main.rs:1513:42:1513:46 | other | &T | main.rs:1297:5:1302:5 | Vec2 |
+| main.rs:1513:42:1513:48 | other.y |  | {EXTERNAL LOCATION} | i64 |
+| main.rs:1516:15:1516:19 | SelfParam |  | file://:0:0:0:0 | & |
+| main.rs:1516:15:1516:19 | SelfParam | &T | main.rs:1297:5:1302:5 | Vec2 |
+| main.rs:1516:22:1516:26 | other |  | file://:0:0:0:0 | & |
+| main.rs:1516:22:1516:26 | other | &T | main.rs:1297:5:1302:5 | Vec2 |
+| main.rs:1516:44:1518:9 | { ... } |  | {EXTERNAL LOCATION} | bool |
+| main.rs:1517:13:1517:16 | self |  | file://:0:0:0:0 | & |
+| main.rs:1517:13:1517:16 | self | &T | main.rs:1297:5:1302:5 | Vec2 |
+| main.rs:1517:13:1517:18 | self.x |  | {EXTERNAL LOCATION} | i64 |
+| main.rs:1517:13:1517:29 | ... <= ... |  | {EXTERNAL LOCATION} | bool |
+| main.rs:1517:13:1517:50 | ... && ... |  | {EXTERNAL LOCATION} | bool |
+| main.rs:1517:23:1517:27 | other |  | file://:0:0:0:0 | & |
+| main.rs:1517:23:1517:27 | other | &T | main.rs:1297:5:1302:5 | Vec2 |
+| main.rs:1517:23:1517:29 | other.x |  | {EXTERNAL LOCATION} | i64 |
+| main.rs:1517:34:1517:37 | self |  | file://:0:0:0:0 | & |
+| main.rs:1517:34:1517:37 | self | &T | main.rs:1297:5:1302:5 | Vec2 |
+| main.rs:1517:34:1517:39 | self.y |  | {EXTERNAL LOCATION} | i64 |
+| main.rs:1517:34:1517:50 | ... <= ... |  | {EXTERNAL LOCATION} | bool |
+| main.rs:1517:44:1517:48 | other |  | file://:0:0:0:0 | & |
+| main.rs:1517:44:1517:48 | other | &T | main.rs:1297:5:1302:5 | Vec2 |
+| main.rs:1517:44:1517:50 | other.y |  | {EXTERNAL LOCATION} | i64 |
+| main.rs:1520:15:1520:19 | SelfParam |  | file://:0:0:0:0 | & |
+| main.rs:1520:15:1520:19 | SelfParam | &T | main.rs:1297:5:1302:5 | Vec2 |
+| main.rs:1520:22:1520:26 | other |  | file://:0:0:0:0 | & |
+| main.rs:1520:22:1520:26 | other | &T | main.rs:1297:5:1302:5 | Vec2 |
+| main.rs:1520:44:1522:9 | { ... } |  | {EXTERNAL LOCATION} | bool |
+| main.rs:1521:13:1521:16 | self |  | file://:0:0:0:0 | & |
+| main.rs:1521:13:1521:16 | self | &T | main.rs:1297:5:1302:5 | Vec2 |
+| main.rs:1521:13:1521:18 | self.x |  | {EXTERNAL LOCATION} | i64 |
+| main.rs:1521:13:1521:28 | ... > ... |  | {EXTERNAL LOCATION} | bool |
+| main.rs:1521:13:1521:48 | ... && ... |  | {EXTERNAL LOCATION} | bool |
+| main.rs:1521:22:1521:26 | other |  | file://:0:0:0:0 | & |
+| main.rs:1521:22:1521:26 | other | &T | main.rs:1297:5:1302:5 | Vec2 |
+| main.rs:1521:22:1521:28 | other.x |  | {EXTERNAL LOCATION} | i64 |
+| main.rs:1521:33:1521:36 | self |  | file://:0:0:0:0 | & |
+| main.rs:1521:33:1521:36 | self | &T | main.rs:1297:5:1302:5 | Vec2 |
+| main.rs:1521:33:1521:38 | self.y |  | {EXTERNAL LOCATION} | i64 |
+| main.rs:1521:33:1521:48 | ... > ... |  | {EXTERNAL LOCATION} | bool |
+| main.rs:1521:42:1521:46 | other |  | file://:0:0:0:0 | & |
+| main.rs:1521:42:1521:46 | other | &T | main.rs:1297:5:1302:5 | Vec2 |
+| main.rs:1521:42:1521:48 | other.y |  | {EXTERNAL LOCATION} | i64 |
+| main.rs:1524:15:1524:19 | SelfParam |  | file://:0:0:0:0 | & |
+| main.rs:1524:15:1524:19 | SelfParam | &T | main.rs:1297:5:1302:5 | Vec2 |
+| main.rs:1524:22:1524:26 | other |  | file://:0:0:0:0 | & |
+| main.rs:1524:22:1524:26 | other | &T | main.rs:1297:5:1302:5 | Vec2 |
+| main.rs:1524:44:1526:9 | { ... } |  | {EXTERNAL LOCATION} | bool |
+| main.rs:1525:13:1525:16 | self |  | file://:0:0:0:0 | & |
+| main.rs:1525:13:1525:16 | self | &T | main.rs:1297:5:1302:5 | Vec2 |
+| main.rs:1525:13:1525:18 | self.x |  | {EXTERNAL LOCATION} | i64 |
+| main.rs:1525:13:1525:29 | ... >= ... |  | {EXTERNAL LOCATION} | bool |
+| main.rs:1525:13:1525:50 | ... && ... |  | {EXTERNAL LOCATION} | bool |
+| main.rs:1525:23:1525:27 | other |  | file://:0:0:0:0 | & |
+| main.rs:1525:23:1525:27 | other | &T | main.rs:1297:5:1302:5 | Vec2 |
+| main.rs:1525:23:1525:29 | other.x |  | {EXTERNAL LOCATION} | i64 |
+| main.rs:1525:34:1525:37 | self |  | file://:0:0:0:0 | & |
+| main.rs:1525:34:1525:37 | self | &T | main.rs:1297:5:1302:5 | Vec2 |
+| main.rs:1525:34:1525:39 | self.y |  | {EXTERNAL LOCATION} | i64 |
+| main.rs:1525:34:1525:50 | ... >= ... |  | {EXTERNAL LOCATION} | bool |
+| main.rs:1525:44:1525:48 | other |  | file://:0:0:0:0 | & |
+| main.rs:1525:44:1525:48 | other | &T | main.rs:1297:5:1302:5 | Vec2 |
+| main.rs:1525:44:1525:50 | other.y |  | {EXTERNAL LOCATION} | i64 |
+| main.rs:1532:13:1532:18 | i64_eq |  | {EXTERNAL LOCATION} | bool |
+| main.rs:1532:22:1532:35 | (...) |  | {EXTERNAL LOCATION} | bool |
+| main.rs:1532:23:1532:26 | 1i64 |  | {EXTERNAL LOCATION} | i64 |
+| main.rs:1532:23:1532:34 | ... == ... |  | {EXTERNAL LOCATION} | bool |
+| main.rs:1532:31:1532:34 | 2i64 |  | {EXTERNAL LOCATION} | i64 |
+| main.rs:1533:13:1533:18 | i64_ne |  | {EXTERNAL LOCATION} | bool |
+| main.rs:1533:22:1533:35 | (...) |  | {EXTERNAL LOCATION} | bool |
+| main.rs:1533:23:1533:26 | 3i64 |  | {EXTERNAL LOCATION} | i64 |
+| main.rs:1533:23:1533:34 | ... != ... |  | {EXTERNAL LOCATION} | bool |
+| main.rs:1533:31:1533:34 | 4i64 |  | {EXTERNAL LOCATION} | i64 |
+| main.rs:1534:13:1534:18 | i64_lt |  | {EXTERNAL LOCATION} | bool |
+| main.rs:1534:22:1534:34 | (...) |  | {EXTERNAL LOCATION} | bool |
+| main.rs:1534:23:1534:26 | 5i64 |  | {EXTERNAL LOCATION} | i64 |
+| main.rs:1534:23:1534:33 | ... < ... |  | {EXTERNAL LOCATION} | bool |
+| main.rs:1534:30:1534:33 | 6i64 |  | {EXTERNAL LOCATION} | i64 |
+| main.rs:1535:13:1535:18 | i64_le |  | {EXTERNAL LOCATION} | bool |
+| main.rs:1535:22:1535:35 | (...) |  | {EXTERNAL LOCATION} | bool |
+| main.rs:1535:23:1535:26 | 7i64 |  | {EXTERNAL LOCATION} | i64 |
+| main.rs:1535:23:1535:34 | ... <= ... |  | {EXTERNAL LOCATION} | bool |
+| main.rs:1535:31:1535:34 | 8i64 |  | {EXTERNAL LOCATION} | i64 |
+| main.rs:1536:13:1536:18 | i64_gt |  | {EXTERNAL LOCATION} | bool |
+| main.rs:1536:22:1536:35 | (...) |  | {EXTERNAL LOCATION} | bool |
+| main.rs:1536:23:1536:26 | 9i64 |  | {EXTERNAL LOCATION} | i64 |
+| main.rs:1536:23:1536:34 | ... > ... |  | {EXTERNAL LOCATION} | bool |
+| main.rs:1536:30:1536:34 | 10i64 |  | {EXTERNAL LOCATION} | i64 |
+| main.rs:1537:13:1537:18 | i64_ge |  | {EXTERNAL LOCATION} | bool |
+| main.rs:1537:22:1537:37 | (...) |  | {EXTERNAL LOCATION} | bool |
+| main.rs:1537:23:1537:27 | 11i64 |  | {EXTERNAL LOCATION} | i64 |
+| main.rs:1537:23:1537:36 | ... >= ... |  | {EXTERNAL LOCATION} | bool |
+| main.rs:1537:32:1537:36 | 12i64 |  | {EXTERNAL LOCATION} | i64 |
+| main.rs:1540:13:1540:19 | i64_add |  | {EXTERNAL LOCATION} | i64 |
+| main.rs:1540:23:1540:27 | 13i64 |  | {EXTERNAL LOCATION} | i64 |
+| main.rs:1540:23:1540:35 | ... + ... |  | {EXTERNAL LOCATION} | i64 |
+| main.rs:1540:31:1540:35 | 14i64 |  | {EXTERNAL LOCATION} | i64 |
+| main.rs:1541:13:1541:19 | i64_sub |  | {EXTERNAL LOCATION} | i64 |
+| main.rs:1541:23:1541:27 | 15i64 |  | {EXTERNAL LOCATION} | i64 |
+| main.rs:1541:23:1541:35 | ... - ... |  | {EXTERNAL LOCATION} | i64 |
+| main.rs:1541:31:1541:35 | 16i64 |  | {EXTERNAL LOCATION} | i64 |
+| main.rs:1542:13:1542:19 | i64_mul |  | {EXTERNAL LOCATION} | i64 |
+| main.rs:1542:23:1542:27 | 17i64 |  | {EXTERNAL LOCATION} | i64 |
+| main.rs:1542:23:1542:35 | ... * ... |  | {EXTERNAL LOCATION} | i64 |
+| main.rs:1542:31:1542:35 | 18i64 |  | {EXTERNAL LOCATION} | i64 |
+| main.rs:1543:13:1543:19 | i64_div |  | {EXTERNAL LOCATION} | i64 |
+| main.rs:1543:23:1543:27 | 19i64 |  | {EXTERNAL LOCATION} | i64 |
+| main.rs:1543:23:1543:35 | ... / ... |  | {EXTERNAL LOCATION} | i64 |
+| main.rs:1543:31:1543:35 | 20i64 |  | {EXTERNAL LOCATION} | i64 |
+| main.rs:1544:13:1544:19 | i64_rem |  | {EXTERNAL LOCATION} | i64 |
+| main.rs:1544:23:1544:27 | 21i64 |  | {EXTERNAL LOCATION} | i64 |
+| main.rs:1544:23:1544:35 | ... % ... |  | {EXTERNAL LOCATION} | i64 |
+| main.rs:1544:31:1544:35 | 22i64 |  | {EXTERNAL LOCATION} | i64 |
+| main.rs:1547:13:1547:30 | mut i64_add_assign |  | {EXTERNAL LOCATION} | i64 |
+| main.rs:1547:34:1547:38 | 23i64 |  | {EXTERNAL LOCATION} | i64 |
+| main.rs:1548:9:1548:22 | i64_add_assign |  | {EXTERNAL LOCATION} | i64 |
+| main.rs:1548:9:1548:31 | ... += ... |  | file://:0:0:0:0 | () |
+| main.rs:1548:27:1548:31 | 24i64 |  | {EXTERNAL LOCATION} | i64 |
+| main.rs:1550:13:1550:30 | mut i64_sub_assign |  | {EXTERNAL LOCATION} | i64 |
+| main.rs:1550:34:1550:38 | 25i64 |  | {EXTERNAL LOCATION} | i64 |
+| main.rs:1551:9:1551:22 | i64_sub_assign |  | {EXTERNAL LOCATION} | i64 |
+| main.rs:1551:9:1551:31 | ... -= ... |  | file://:0:0:0:0 | () |
+| main.rs:1551:27:1551:31 | 26i64 |  | {EXTERNAL LOCATION} | i64 |
+| main.rs:1553:13:1553:30 | mut i64_mul_assign |  | {EXTERNAL LOCATION} | i64 |
+| main.rs:1553:34:1553:38 | 27i64 |  | {EXTERNAL LOCATION} | i64 |
+| main.rs:1554:9:1554:22 | i64_mul_assign |  | {EXTERNAL LOCATION} | i64 |
+| main.rs:1554:9:1554:31 | ... *= ... |  | file://:0:0:0:0 | () |
+| main.rs:1554:27:1554:31 | 28i64 |  | {EXTERNAL LOCATION} | i64 |
+| main.rs:1556:13:1556:30 | mut i64_div_assign |  | {EXTERNAL LOCATION} | i64 |
+| main.rs:1556:34:1556:38 | 29i64 |  | {EXTERNAL LOCATION} | i64 |
+| main.rs:1557:9:1557:22 | i64_div_assign |  | {EXTERNAL LOCATION} | i64 |
+| main.rs:1557:9:1557:31 | ... /= ... |  | file://:0:0:0:0 | () |
+| main.rs:1557:27:1557:31 | 30i64 |  | {EXTERNAL LOCATION} | i64 |
+| main.rs:1559:13:1559:30 | mut i64_rem_assign |  | {EXTERNAL LOCATION} | i64 |
+| main.rs:1559:34:1559:38 | 31i64 |  | {EXTERNAL LOCATION} | i64 |
+| main.rs:1560:9:1560:22 | i64_rem_assign |  | {EXTERNAL LOCATION} | i64 |
+| main.rs:1560:9:1560:31 | ... %= ... |  | file://:0:0:0:0 | () |
+| main.rs:1560:27:1560:31 | 32i64 |  | {EXTERNAL LOCATION} | i64 |
+| main.rs:1563:13:1563:22 | i64_bitand |  | {EXTERNAL LOCATION} | i64 |
+| main.rs:1563:26:1563:30 | 33i64 |  | {EXTERNAL LOCATION} | i64 |
+| main.rs:1563:26:1563:38 | ... & ... |  | {EXTERNAL LOCATION} | i64 |
+| main.rs:1563:34:1563:38 | 34i64 |  | {EXTERNAL LOCATION} | i64 |
+| main.rs:1564:13:1564:21 | i64_bitor |  | {EXTERNAL LOCATION} | i64 |
+| main.rs:1564:25:1564:29 | 35i64 |  | {EXTERNAL LOCATION} | i64 |
+| main.rs:1564:25:1564:37 | ... \| ... |  | {EXTERNAL LOCATION} | i64 |
+| main.rs:1564:33:1564:37 | 36i64 |  | {EXTERNAL LOCATION} | i64 |
+| main.rs:1565:13:1565:22 | i64_bitxor |  | {EXTERNAL LOCATION} | i64 |
+| main.rs:1565:26:1565:30 | 37i64 |  | {EXTERNAL LOCATION} | i64 |
+| main.rs:1565:26:1565:38 | ... ^ ... |  | {EXTERNAL LOCATION} | i64 |
+| main.rs:1565:34:1565:38 | 38i64 |  | {EXTERNAL LOCATION} | i64 |
+| main.rs:1566:13:1566:19 | i64_shl |  | {EXTERNAL LOCATION} | i64 |
+| main.rs:1566:23:1566:27 | 39i64 |  | {EXTERNAL LOCATION} | i64 |
+| main.rs:1566:23:1566:36 | ... << ... |  | {EXTERNAL LOCATION} | i64 |
+| main.rs:1566:32:1566:36 | 40i64 |  | {EXTERNAL LOCATION} | i64 |
+| main.rs:1567:13:1567:19 | i64_shr |  | {EXTERNAL LOCATION} | i64 |
+| main.rs:1567:23:1567:27 | 41i64 |  | {EXTERNAL LOCATION} | i64 |
+| main.rs:1567:23:1567:36 | ... >> ... |  | {EXTERNAL LOCATION} | i64 |
+| main.rs:1567:32:1567:36 | 42i64 |  | {EXTERNAL LOCATION} | i64 |
+| main.rs:1570:13:1570:33 | mut i64_bitand_assign |  | {EXTERNAL LOCATION} | i64 |
+| main.rs:1570:37:1570:41 | 43i64 |  | {EXTERNAL LOCATION} | i64 |
+| main.rs:1571:9:1571:25 | i64_bitand_assign |  | {EXTERNAL LOCATION} | i64 |
+| main.rs:1571:9:1571:34 | ... &= ... |  | file://:0:0:0:0 | () |
+| main.rs:1571:30:1571:34 | 44i64 |  | {EXTERNAL LOCATION} | i64 |
+| main.rs:1573:13:1573:32 | mut i64_bitor_assign |  | {EXTERNAL LOCATION} | i64 |
+| main.rs:1573:36:1573:40 | 45i64 |  | {EXTERNAL LOCATION} | i64 |
+| main.rs:1574:9:1574:24 | i64_bitor_assign |  | {EXTERNAL LOCATION} | i64 |
+| main.rs:1574:9:1574:33 | ... \|= ... |  | file://:0:0:0:0 | () |
+| main.rs:1574:29:1574:33 | 46i64 |  | {EXTERNAL LOCATION} | i64 |
+| main.rs:1576:13:1576:33 | mut i64_bitxor_assign |  | {EXTERNAL LOCATION} | i64 |
+| main.rs:1576:37:1576:41 | 47i64 |  | {EXTERNAL LOCATION} | i64 |
+| main.rs:1577:9:1577:25 | i64_bitxor_assign |  | {EXTERNAL LOCATION} | i64 |
+| main.rs:1577:9:1577:34 | ... ^= ... |  | file://:0:0:0:0 | () |
+| main.rs:1577:30:1577:34 | 48i64 |  | {EXTERNAL LOCATION} | i64 |
+| main.rs:1579:13:1579:30 | mut i64_shl_assign |  | {EXTERNAL LOCATION} | i64 |
+| main.rs:1579:34:1579:38 | 49i64 |  | {EXTERNAL LOCATION} | i64 |
+| main.rs:1580:9:1580:22 | i64_shl_assign |  | {EXTERNAL LOCATION} | i64 |
+| main.rs:1580:9:1580:32 | ... <<= ... |  | file://:0:0:0:0 | () |
+| main.rs:1580:28:1580:32 | 50i64 |  | {EXTERNAL LOCATION} | i64 |
+| main.rs:1582:13:1582:30 | mut i64_shr_assign |  | {EXTERNAL LOCATION} | i64 |
+| main.rs:1582:34:1582:38 | 51i64 |  | {EXTERNAL LOCATION} | i64 |
+| main.rs:1583:9:1583:22 | i64_shr_assign |  | {EXTERNAL LOCATION} | i64 |
+| main.rs:1583:9:1583:32 | ... >>= ... |  | file://:0:0:0:0 | () |
+| main.rs:1583:28:1583:32 | 52i64 |  | {EXTERNAL LOCATION} | i64 |
+| main.rs:1585:13:1585:19 | i64_neg |  | {EXTERNAL LOCATION} | i64 |
+| main.rs:1585:23:1585:28 | - ... |  | {EXTERNAL LOCATION} | i64 |
+| main.rs:1585:24:1585:28 | 53i64 |  | {EXTERNAL LOCATION} | i64 |
+| main.rs:1586:13:1586:19 | i64_not |  | {EXTERNAL LOCATION} | i64 |
+| main.rs:1586:23:1586:28 | ! ... |  | {EXTERNAL LOCATION} | i64 |
+| main.rs:1586:24:1586:28 | 54i64 |  | {EXTERNAL LOCATION} | i64 |
+| main.rs:1589:13:1589:14 | v1 |  | main.rs:1297:5:1302:5 | Vec2 |
+| main.rs:1589:18:1589:36 | Vec2 {...} |  | main.rs:1297:5:1302:5 | Vec2 |
+| main.rs:1589:28:1589:28 | 1 |  | {EXTERNAL LOCATION} | i32 |
+| main.rs:1589:28:1589:28 | 1 |  | {EXTERNAL LOCATION} | i64 |
+| main.rs:1589:34:1589:34 | 2 |  | {EXTERNAL LOCATION} | i32 |
+| main.rs:1589:34:1589:34 | 2 |  | {EXTERNAL LOCATION} | i64 |
+| main.rs:1590:13:1590:14 | v2 |  | file://:0:0:0:0 | & |
+| main.rs:1590:13:1590:14 | v2 |  | main.rs:1297:5:1302:5 | Vec2 |
+| main.rs:1590:13:1590:14 | v2 | &T | main.rs:1297:5:1302:5 | Vec2 |
+| main.rs:1590:18:1590:36 | Vec2 {...} |  | file://:0:0:0:0 | & |
+| main.rs:1590:18:1590:36 | Vec2 {...} |  | main.rs:1297:5:1302:5 | Vec2 |
+| main.rs:1590:18:1590:36 | Vec2 {...} | &T | main.rs:1297:5:1302:5 | Vec2 |
+| main.rs:1590:28:1590:28 | 3 |  | {EXTERNAL LOCATION} | i32 |
+| main.rs:1590:28:1590:28 | 3 |  | {EXTERNAL LOCATION} | i64 |
+| main.rs:1590:34:1590:34 | 4 |  | {EXTERNAL LOCATION} | i32 |
+| main.rs:1590:34:1590:34 | 4 |  | {EXTERNAL LOCATION} | i64 |
+| main.rs:1593:13:1593:19 | vec2_eq |  | {EXTERNAL LOCATION} | bool |
+| main.rs:1593:23:1593:24 | v1 |  | main.rs:1297:5:1302:5 | Vec2 |
+| main.rs:1593:23:1593:30 | ... == ... |  | {EXTERNAL LOCATION} | bool |
+| main.rs:1593:29:1593:30 | v2 |  | file://:0:0:0:0 | & |
+| main.rs:1593:29:1593:30 | v2 |  | main.rs:1297:5:1302:5 | Vec2 |
+| main.rs:1593:29:1593:30 | v2 | &T | main.rs:1297:5:1302:5 | Vec2 |
+| main.rs:1594:13:1594:19 | vec2_ne |  | {EXTERNAL LOCATION} | bool |
+| main.rs:1594:23:1594:24 | v1 |  | main.rs:1297:5:1302:5 | Vec2 |
+| main.rs:1594:23:1594:30 | ... != ... |  | {EXTERNAL LOCATION} | bool |
+| main.rs:1594:29:1594:30 | v2 |  | file://:0:0:0:0 | & |
+| main.rs:1594:29:1594:30 | v2 |  | main.rs:1297:5:1302:5 | Vec2 |
+| main.rs:1594:29:1594:30 | v2 | &T | main.rs:1297:5:1302:5 | Vec2 |
+| main.rs:1595:13:1595:19 | vec2_lt |  | {EXTERNAL LOCATION} | bool |
+| main.rs:1595:23:1595:24 | v1 |  | main.rs:1297:5:1302:5 | Vec2 |
+| main.rs:1595:23:1595:29 | ... < ... |  | {EXTERNAL LOCATION} | bool |
+| main.rs:1595:28:1595:29 | v2 |  | file://:0:0:0:0 | & |
+| main.rs:1595:28:1595:29 | v2 |  | main.rs:1297:5:1302:5 | Vec2 |
+| main.rs:1595:28:1595:29 | v2 | &T | main.rs:1297:5:1302:5 | Vec2 |
+| main.rs:1596:13:1596:19 | vec2_le |  | {EXTERNAL LOCATION} | bool |
+| main.rs:1596:23:1596:24 | v1 |  | main.rs:1297:5:1302:5 | Vec2 |
+| main.rs:1596:23:1596:30 | ... <= ... |  | {EXTERNAL LOCATION} | bool |
+| main.rs:1596:29:1596:30 | v2 |  | file://:0:0:0:0 | & |
+| main.rs:1596:29:1596:30 | v2 |  | main.rs:1297:5:1302:5 | Vec2 |
+| main.rs:1596:29:1596:30 | v2 | &T | main.rs:1297:5:1302:5 | Vec2 |
+| main.rs:1597:13:1597:19 | vec2_gt |  | {EXTERNAL LOCATION} | bool |
+| main.rs:1597:23:1597:24 | v1 |  | main.rs:1297:5:1302:5 | Vec2 |
+| main.rs:1597:23:1597:29 | ... > ... |  | {EXTERNAL LOCATION} | bool |
+| main.rs:1597:28:1597:29 | v2 |  | file://:0:0:0:0 | & |
+| main.rs:1597:28:1597:29 | v2 |  | main.rs:1297:5:1302:5 | Vec2 |
+| main.rs:1597:28:1597:29 | v2 | &T | main.rs:1297:5:1302:5 | Vec2 |
+| main.rs:1598:13:1598:19 | vec2_ge |  | {EXTERNAL LOCATION} | bool |
+| main.rs:1598:23:1598:24 | v1 |  | main.rs:1297:5:1302:5 | Vec2 |
+| main.rs:1598:23:1598:30 | ... >= ... |  | {EXTERNAL LOCATION} | bool |
+| main.rs:1598:29:1598:30 | v2 |  | file://:0:0:0:0 | & |
+| main.rs:1598:29:1598:30 | v2 |  | main.rs:1297:5:1302:5 | Vec2 |
+| main.rs:1598:29:1598:30 | v2 | &T | main.rs:1297:5:1302:5 | Vec2 |
+| main.rs:1601:13:1601:20 | vec2_add |  | main.rs:1297:5:1302:5 | Vec2 |
+| main.rs:1601:24:1601:25 | v1 |  | main.rs:1297:5:1302:5 | Vec2 |
+| main.rs:1601:24:1601:30 | ... + ... |  | main.rs:1297:5:1302:5 | Vec2 |
+| main.rs:1601:29:1601:30 | v2 |  | file://:0:0:0:0 | & |
+| main.rs:1601:29:1601:30 | v2 |  | main.rs:1297:5:1302:5 | Vec2 |
+| main.rs:1601:29:1601:30 | v2 | &T | main.rs:1297:5:1302:5 | Vec2 |
+| main.rs:1602:13:1602:20 | vec2_sub |  | main.rs:1297:5:1302:5 | Vec2 |
+| main.rs:1602:24:1602:25 | v1 |  | main.rs:1297:5:1302:5 | Vec2 |
+| main.rs:1602:24:1602:30 | ... - ... |  | main.rs:1297:5:1302:5 | Vec2 |
+| main.rs:1602:29:1602:30 | v2 |  | file://:0:0:0:0 | & |
+| main.rs:1602:29:1602:30 | v2 |  | main.rs:1297:5:1302:5 | Vec2 |
+| main.rs:1602:29:1602:30 | v2 | &T | main.rs:1297:5:1302:5 | Vec2 |
+| main.rs:1603:13:1603:20 | vec2_mul |  | main.rs:1297:5:1302:5 | Vec2 |
+| main.rs:1603:24:1603:25 | v1 |  | main.rs:1297:5:1302:5 | Vec2 |
+| main.rs:1603:24:1603:30 | ... * ... |  | main.rs:1297:5:1302:5 | Vec2 |
+| main.rs:1603:29:1603:30 | v2 |  | file://:0:0:0:0 | & |
+| main.rs:1603:29:1603:30 | v2 |  | main.rs:1297:5:1302:5 | Vec2 |
+| main.rs:1603:29:1603:30 | v2 | &T | main.rs:1297:5:1302:5 | Vec2 |
+| main.rs:1604:13:1604:20 | vec2_div |  | main.rs:1297:5:1302:5 | Vec2 |
+| main.rs:1604:24:1604:25 | v1 |  | main.rs:1297:5:1302:5 | Vec2 |
+| main.rs:1604:24:1604:30 | ... / ... |  | main.rs:1297:5:1302:5 | Vec2 |
+| main.rs:1604:29:1604:30 | v2 |  | file://:0:0:0:0 | & |
+| main.rs:1604:29:1604:30 | v2 |  | main.rs:1297:5:1302:5 | Vec2 |
+| main.rs:1604:29:1604:30 | v2 | &T | main.rs:1297:5:1302:5 | Vec2 |
+| main.rs:1605:13:1605:20 | vec2_rem |  | main.rs:1297:5:1302:5 | Vec2 |
+| main.rs:1605:24:1605:25 | v1 |  | main.rs:1297:5:1302:5 | Vec2 |
+| main.rs:1605:24:1605:30 | ... % ... |  | main.rs:1297:5:1302:5 | Vec2 |
+| main.rs:1605:29:1605:30 | v2 |  | file://:0:0:0:0 | & |
+| main.rs:1605:29:1605:30 | v2 |  | main.rs:1297:5:1302:5 | Vec2 |
+| main.rs:1605:29:1605:30 | v2 | &T | main.rs:1297:5:1302:5 | Vec2 |
+| main.rs:1608:13:1608:31 | mut vec2_add_assign |  | main.rs:1297:5:1302:5 | Vec2 |
+| main.rs:1608:35:1608:36 | v1 |  | main.rs:1297:5:1302:5 | Vec2 |
+| main.rs:1609:9:1609:23 | vec2_add_assign |  | main.rs:1297:5:1302:5 | Vec2 |
+| main.rs:1609:9:1609:29 | ... += ... |  | file://:0:0:0:0 | () |
+| main.rs:1609:28:1609:29 | v2 |  | file://:0:0:0:0 | & |
+| main.rs:1609:28:1609:29 | v2 |  | main.rs:1297:5:1302:5 | Vec2 |
+| main.rs:1609:28:1609:29 | v2 | &T | main.rs:1297:5:1302:5 | Vec2 |
+| main.rs:1611:13:1611:31 | mut vec2_sub_assign |  | main.rs:1297:5:1302:5 | Vec2 |
+| main.rs:1611:35:1611:36 | v1 |  | main.rs:1297:5:1302:5 | Vec2 |
+| main.rs:1612:9:1612:23 | vec2_sub_assign |  | main.rs:1297:5:1302:5 | Vec2 |
+| main.rs:1612:9:1612:29 | ... -= ... |  | file://:0:0:0:0 | () |
+| main.rs:1612:28:1612:29 | v2 |  | file://:0:0:0:0 | & |
+| main.rs:1612:28:1612:29 | v2 |  | main.rs:1297:5:1302:5 | Vec2 |
+| main.rs:1612:28:1612:29 | v2 | &T | main.rs:1297:5:1302:5 | Vec2 |
+| main.rs:1614:13:1614:31 | mut vec2_mul_assign |  | main.rs:1297:5:1302:5 | Vec2 |
+| main.rs:1614:35:1614:36 | v1 |  | main.rs:1297:5:1302:5 | Vec2 |
+| main.rs:1615:9:1615:23 | vec2_mul_assign |  | main.rs:1297:5:1302:5 | Vec2 |
+| main.rs:1615:9:1615:29 | ... *= ... |  | file://:0:0:0:0 | () |
+| main.rs:1615:28:1615:29 | v2 |  | file://:0:0:0:0 | & |
+| main.rs:1615:28:1615:29 | v2 |  | main.rs:1297:5:1302:5 | Vec2 |
+| main.rs:1615:28:1615:29 | v2 | &T | main.rs:1297:5:1302:5 | Vec2 |
+| main.rs:1617:13:1617:31 | mut vec2_div_assign |  | main.rs:1297:5:1302:5 | Vec2 |
+| main.rs:1617:35:1617:36 | v1 |  | main.rs:1297:5:1302:5 | Vec2 |
+| main.rs:1618:9:1618:23 | vec2_div_assign |  | main.rs:1297:5:1302:5 | Vec2 |
+| main.rs:1618:9:1618:29 | ... /= ... |  | file://:0:0:0:0 | () |
+| main.rs:1618:28:1618:29 | v2 |  | file://:0:0:0:0 | & |
+| main.rs:1618:28:1618:29 | v2 |  | main.rs:1297:5:1302:5 | Vec2 |
+| main.rs:1618:28:1618:29 | v2 | &T | main.rs:1297:5:1302:5 | Vec2 |
+| main.rs:1620:13:1620:31 | mut vec2_rem_assign |  | main.rs:1297:5:1302:5 | Vec2 |
+| main.rs:1620:35:1620:36 | v1 |  | main.rs:1297:5:1302:5 | Vec2 |
+| main.rs:1621:9:1621:23 | vec2_rem_assign |  | main.rs:1297:5:1302:5 | Vec2 |
+| main.rs:1621:9:1621:29 | ... %= ... |  | file://:0:0:0:0 | () |
+| main.rs:1621:28:1621:29 | v2 |  | file://:0:0:0:0 | & |
+| main.rs:1621:28:1621:29 | v2 |  | main.rs:1297:5:1302:5 | Vec2 |
+| main.rs:1621:28:1621:29 | v2 | &T | main.rs:1297:5:1302:5 | Vec2 |
+| main.rs:1624:13:1624:23 | vec2_bitand |  | main.rs:1297:5:1302:5 | Vec2 |
+| main.rs:1624:27:1624:28 | v1 |  | main.rs:1297:5:1302:5 | Vec2 |
+| main.rs:1624:27:1624:33 | ... & ... |  | main.rs:1297:5:1302:5 | Vec2 |
+| main.rs:1624:32:1624:33 | v2 |  | file://:0:0:0:0 | & |
+| main.rs:1624:32:1624:33 | v2 |  | main.rs:1297:5:1302:5 | Vec2 |
+| main.rs:1624:32:1624:33 | v2 | &T | main.rs:1297:5:1302:5 | Vec2 |
+| main.rs:1625:13:1625:22 | vec2_bitor |  | main.rs:1297:5:1302:5 | Vec2 |
+| main.rs:1625:26:1625:27 | v1 |  | main.rs:1297:5:1302:5 | Vec2 |
+| main.rs:1625:26:1625:32 | ... \| ... |  | main.rs:1297:5:1302:5 | Vec2 |
+| main.rs:1625:31:1625:32 | v2 |  | file://:0:0:0:0 | & |
+| main.rs:1625:31:1625:32 | v2 |  | main.rs:1297:5:1302:5 | Vec2 |
+| main.rs:1625:31:1625:32 | v2 | &T | main.rs:1297:5:1302:5 | Vec2 |
+| main.rs:1626:13:1626:23 | vec2_bitxor |  | main.rs:1297:5:1302:5 | Vec2 |
+| main.rs:1626:27:1626:28 | v1 |  | main.rs:1297:5:1302:5 | Vec2 |
+| main.rs:1626:27:1626:33 | ... ^ ... |  | main.rs:1297:5:1302:5 | Vec2 |
+| main.rs:1626:32:1626:33 | v2 |  | file://:0:0:0:0 | & |
+| main.rs:1626:32:1626:33 | v2 |  | main.rs:1297:5:1302:5 | Vec2 |
+| main.rs:1626:32:1626:33 | v2 | &T | main.rs:1297:5:1302:5 | Vec2 |
+| main.rs:1627:13:1627:20 | vec2_shl |  | main.rs:1297:5:1302:5 | Vec2 |
+| main.rs:1627:24:1627:25 | v1 |  | main.rs:1297:5:1302:5 | Vec2 |
+| main.rs:1627:24:1627:33 | ... << ... |  | main.rs:1297:5:1302:5 | Vec2 |
+| main.rs:1627:30:1627:33 | 1u32 |  | {EXTERNAL LOCATION} | u32 |
+| main.rs:1628:13:1628:20 | vec2_shr |  | main.rs:1297:5:1302:5 | Vec2 |
+| main.rs:1628:24:1628:25 | v1 |  | main.rs:1297:5:1302:5 | Vec2 |
+| main.rs:1628:24:1628:33 | ... >> ... |  | main.rs:1297:5:1302:5 | Vec2 |
+| main.rs:1628:30:1628:33 | 1u32 |  | {EXTERNAL LOCATION} | u32 |
+| main.rs:1631:13:1631:34 | mut vec2_bitand_assign |  | main.rs:1297:5:1302:5 | Vec2 |
+| main.rs:1631:38:1631:39 | v1 |  | main.rs:1297:5:1302:5 | Vec2 |
+| main.rs:1632:9:1632:26 | vec2_bitand_assign |  | main.rs:1297:5:1302:5 | Vec2 |
+| main.rs:1632:9:1632:32 | ... &= ... |  | file://:0:0:0:0 | () |
+| main.rs:1632:31:1632:32 | v2 |  | file://:0:0:0:0 | & |
+| main.rs:1632:31:1632:32 | v2 |  | main.rs:1297:5:1302:5 | Vec2 |
+| main.rs:1632:31:1632:32 | v2 | &T | main.rs:1297:5:1302:5 | Vec2 |
+| main.rs:1634:13:1634:33 | mut vec2_bitor_assign |  | main.rs:1297:5:1302:5 | Vec2 |
+| main.rs:1634:37:1634:38 | v1 |  | main.rs:1297:5:1302:5 | Vec2 |
+| main.rs:1635:9:1635:25 | vec2_bitor_assign |  | main.rs:1297:5:1302:5 | Vec2 |
+| main.rs:1635:9:1635:31 | ... \|= ... |  | file://:0:0:0:0 | () |
+| main.rs:1635:30:1635:31 | v2 |  | file://:0:0:0:0 | & |
+| main.rs:1635:30:1635:31 | v2 |  | main.rs:1297:5:1302:5 | Vec2 |
+| main.rs:1635:30:1635:31 | v2 | &T | main.rs:1297:5:1302:5 | Vec2 |
+| main.rs:1637:13:1637:34 | mut vec2_bitxor_assign |  | main.rs:1297:5:1302:5 | Vec2 |
+| main.rs:1637:38:1637:39 | v1 |  | main.rs:1297:5:1302:5 | Vec2 |
+| main.rs:1638:9:1638:26 | vec2_bitxor_assign |  | main.rs:1297:5:1302:5 | Vec2 |
+| main.rs:1638:9:1638:32 | ... ^= ... |  | file://:0:0:0:0 | () |
+| main.rs:1638:31:1638:32 | v2 |  | file://:0:0:0:0 | & |
+| main.rs:1638:31:1638:32 | v2 |  | main.rs:1297:5:1302:5 | Vec2 |
+| main.rs:1638:31:1638:32 | v2 | &T | main.rs:1297:5:1302:5 | Vec2 |
+| main.rs:1640:13:1640:31 | mut vec2_shl_assign |  | main.rs:1297:5:1302:5 | Vec2 |
+| main.rs:1640:35:1640:36 | v1 |  | main.rs:1297:5:1302:5 | Vec2 |
+| main.rs:1641:9:1641:23 | vec2_shl_assign |  | main.rs:1297:5:1302:5 | Vec2 |
+| main.rs:1641:9:1641:32 | ... <<= ... |  | file://:0:0:0:0 | () |
+| main.rs:1641:29:1641:32 | 1u32 |  | {EXTERNAL LOCATION} | u32 |
+| main.rs:1643:13:1643:31 | mut vec2_shr_assign |  | main.rs:1297:5:1302:5 | Vec2 |
+| main.rs:1643:35:1643:36 | v1 |  | main.rs:1297:5:1302:5 | Vec2 |
+| main.rs:1644:9:1644:23 | vec2_shr_assign |  | main.rs:1297:5:1302:5 | Vec2 |
+| main.rs:1644:9:1644:32 | ... >>= ... |  | file://:0:0:0:0 | () |
+| main.rs:1644:29:1644:32 | 1u32 |  | {EXTERNAL LOCATION} | u32 |
+| main.rs:1647:13:1647:20 | vec2_neg |  | main.rs:1297:5:1302:5 | Vec2 |
+| main.rs:1647:24:1647:26 | - ... |  | main.rs:1297:5:1302:5 | Vec2 |
+| main.rs:1647:25:1647:26 | v1 |  | main.rs:1297:5:1302:5 | Vec2 |
+| main.rs:1648:13:1648:20 | vec2_not |  | main.rs:1297:5:1302:5 | Vec2 |
+| main.rs:1648:24:1648:26 | ! ... |  | main.rs:1297:5:1302:5 | Vec2 |
+| main.rs:1648:25:1648:26 | v1 |  | main.rs:1297:5:1302:5 | Vec2 |
+| main.rs:1658:18:1658:21 | SelfParam |  | main.rs:1655:5:1655:14 | S1 |
+| main.rs:1661:25:1663:5 | { ... } |  | main.rs:1655:5:1655:14 | S1 |
+| main.rs:1662:9:1662:10 | S1 |  | main.rs:1655:5:1655:14 | S1 |
+| main.rs:1665:41:1669:5 | { ... } |  | {EXTERNAL LOCATION} | trait Future |
+| main.rs:1665:41:1669:5 | { ... } |  | main.rs:1665:16:1665:39 | ImplTraitTypeRepr |
+| main.rs:1665:41:1669:5 | { ... } | Output | main.rs:1655:5:1655:14 | S1 |
+| main.rs:1666:9:1668:9 | { ... } |  | {EXTERNAL LOCATION} | trait Future |
+| main.rs:1666:9:1668:9 | { ... } |  | main.rs:1665:16:1665:39 | ImplTraitTypeRepr |
+| main.rs:1666:9:1668:9 | { ... } | Output | main.rs:1655:5:1655:14 | S1 |
+| main.rs:1667:13:1667:14 | S1 |  | main.rs:1655:5:1655:14 | S1 |
+| main.rs:1676:17:1676:46 | SelfParam |  | {EXTERNAL LOCATION} | Pin |
+| main.rs:1676:17:1676:46 | SelfParam | Ptr | file://:0:0:0:0 | & |
+| main.rs:1676:17:1676:46 | SelfParam | Ptr.&T | main.rs:1671:5:1671:14 | S2 |
+| main.rs:1676:49:1676:51 | _cx |  | file://:0:0:0:0 | & |
+| main.rs:1676:49:1676:51 | _cx | &T | {EXTERNAL LOCATION} | Context |
+| main.rs:1676:116:1678:9 | { ... } |  | {EXTERNAL LOCATION} | Poll |
+| main.rs:1676:116:1678:9 | { ... } | T | main.rs:1655:5:1655:14 | S1 |
+| main.rs:1677:13:1677:38 | ...::Ready(...) |  | {EXTERNAL LOCATION} | Poll |
+| main.rs:1677:13:1677:38 | ...::Ready(...) | T | main.rs:1655:5:1655:14 | S1 |
+| main.rs:1677:36:1677:37 | S1 |  | main.rs:1655:5:1655:14 | S1 |
+| main.rs:1681:41:1683:5 | { ... } |  | main.rs:1671:5:1671:14 | S2 |
+| main.rs:1681:41:1683:5 | { ... } |  | main.rs:1681:16:1681:39 | ImplTraitTypeRepr |
+| main.rs:1682:9:1682:10 | S2 |  | main.rs:1671:5:1671:14 | S2 |
+| main.rs:1682:9:1682:10 | S2 |  | main.rs:1681:16:1681:39 | ImplTraitTypeRepr |
+| main.rs:1686:9:1686:12 | f1(...) |  | {EXTERNAL LOCATION} | trait Future |
+| main.rs:1686:9:1686:12 | f1(...) | Output | main.rs:1655:5:1655:14 | S1 |
+| main.rs:1686:9:1686:18 | await ... |  | main.rs:1655:5:1655:14 | S1 |
+| main.rs:1687:9:1687:12 | f2(...) |  | main.rs:1665:16:1665:39 | ImplTraitTypeRepr |
+| main.rs:1687:9:1687:18 | await ... |  | main.rs:1655:5:1655:14 | S1 |
+| main.rs:1688:9:1688:12 | f3(...) |  | main.rs:1681:16:1681:39 | ImplTraitTypeRepr |
+| main.rs:1688:9:1688:18 | await ... |  | main.rs:1655:5:1655:14 | S1 |
+| main.rs:1689:9:1689:10 | S2 |  | main.rs:1671:5:1671:14 | S2 |
+| main.rs:1689:9:1689:16 | await S2 |  | main.rs:1655:5:1655:14 | S1 |
+| main.rs:1690:13:1690:13 | b |  | {EXTERNAL LOCATION} | trait Future |
+| main.rs:1690:13:1690:13 | b | Output | main.rs:1655:5:1655:14 | S1 |
+| main.rs:1690:17:1692:9 | { ... } |  | {EXTERNAL LOCATION} | trait Future |
+| main.rs:1690:17:1692:9 | { ... } | Output | main.rs:1655:5:1655:14 | S1 |
+| main.rs:1691:13:1691:14 | S1 |  | main.rs:1655:5:1655:14 | S1 |
+| main.rs:1693:9:1693:9 | b |  | {EXTERNAL LOCATION} | trait Future |
+| main.rs:1693:9:1693:9 | b | Output | main.rs:1655:5:1655:14 | S1 |
+| main.rs:1693:9:1693:15 | await b |  | main.rs:1655:5:1655:14 | S1 |
+| main.rs:1703:15:1703:19 | SelfParam |  | file://:0:0:0:0 | & |
+| main.rs:1703:15:1703:19 | SelfParam | &T | main.rs:1702:5:1704:5 | Self [trait Trait1] |
+| main.rs:1707:15:1707:19 | SelfParam |  | file://:0:0:0:0 | & |
+| main.rs:1707:15:1707:19 | SelfParam | &T | main.rs:1706:5:1708:5 | Self [trait Trait2] |
+| main.rs:1711:15:1711:19 | SelfParam |  | file://:0:0:0:0 | & |
+| main.rs:1711:15:1711:19 | SelfParam | &T | main.rs:1699:5:1699:14 | S1 |
+| main.rs:1715:15:1715:19 | SelfParam |  | file://:0:0:0:0 | & |
+| main.rs:1715:15:1715:19 | SelfParam | &T | main.rs:1699:5:1699:14 | S1 |
+| main.rs:1718:37:1720:5 | { ... } |  | main.rs:1699:5:1699:14 | S1 |
+| main.rs:1718:37:1720:5 | { ... } |  | main.rs:1718:16:1718:35 | ImplTraitTypeRepr |
+| main.rs:1719:9:1719:10 | S1 |  | main.rs:1699:5:1699:14 | S1 |
+| main.rs:1719:9:1719:10 | S1 |  | main.rs:1718:16:1718:35 | ImplTraitTypeRepr |
+| main.rs:1723:18:1723:22 | SelfParam |  | file://:0:0:0:0 | & |
+| main.rs:1723:18:1723:22 | SelfParam | &T | main.rs:1722:5:1724:5 | Self [trait MyTrait] |
+| main.rs:1727:18:1727:22 | SelfParam |  | file://:0:0:0:0 | & |
+| main.rs:1727:18:1727:22 | SelfParam | &T | main.rs:1699:5:1699:14 | S1 |
+| main.rs:1727:31:1729:9 | { ... } |  | main.rs:1700:5:1700:14 | S2 |
+| main.rs:1728:13:1728:14 | S2 |  | main.rs:1700:5:1700:14 | S2 |
+| main.rs:1732:45:1734:5 | { ... } |  | main.rs:1699:5:1699:14 | S1 |
+| main.rs:1732:45:1734:5 | { ... } |  | main.rs:1732:28:1732:43 | ImplTraitTypeRepr |
+| main.rs:1733:9:1733:10 | S1 |  | main.rs:1699:5:1699:14 | S1 |
+| main.rs:1733:9:1733:10 | S1 |  | main.rs:1732:28:1732:43 | ImplTraitTypeRepr |
+| main.rs:1736:41:1736:41 | t |  | main.rs:1736:26:1736:38 | B |
+| main.rs:1736:52:1738:5 | { ... } |  | main.rs:1736:23:1736:23 | A |
+| main.rs:1737:9:1737:9 | t |  | main.rs:1736:26:1736:38 | B |
+| main.rs:1737:9:1737:17 | t.get_a() |  | main.rs:1736:23:1736:23 | A |
+| main.rs:1740:26:1740:26 | t |  | main.rs:1740:29:1740:43 | ImplTraitTypeRepr |
+| main.rs:1740:51:1742:5 | { ... } |  | main.rs:1740:23:1740:23 | A |
+| main.rs:1741:9:1741:9 | t |  | main.rs:1740:29:1740:43 | ImplTraitTypeRepr |
+| main.rs:1741:9:1741:17 | t.get_a() |  | main.rs:1740:23:1740:23 | A |
+| main.rs:1745:13:1745:13 | x |  | main.rs:1718:16:1718:35 | ImplTraitTypeRepr |
+| main.rs:1745:17:1745:20 | f1(...) |  | main.rs:1718:16:1718:35 | ImplTraitTypeRepr |
+| main.rs:1746:9:1746:9 | x |  | main.rs:1718:16:1718:35 | ImplTraitTypeRepr |
+| main.rs:1747:9:1747:9 | x |  | main.rs:1718:16:1718:35 | ImplTraitTypeRepr |
+| main.rs:1748:13:1748:13 | a |  | main.rs:1732:28:1732:43 | ImplTraitTypeRepr |
+| main.rs:1748:17:1748:32 | get_a_my_trait(...) |  | main.rs:1732:28:1732:43 | ImplTraitTypeRepr |
+| main.rs:1749:13:1749:13 | b |  | main.rs:1700:5:1700:14 | S2 |
+| main.rs:1749:17:1749:33 | uses_my_trait1(...) |  | main.rs:1700:5:1700:14 | S2 |
+| main.rs:1749:32:1749:32 | a |  | main.rs:1732:28:1732:43 | ImplTraitTypeRepr |
+| main.rs:1750:13:1750:13 | a |  | main.rs:1732:28:1732:43 | ImplTraitTypeRepr |
+| main.rs:1750:17:1750:32 | get_a_my_trait(...) |  | main.rs:1732:28:1732:43 | ImplTraitTypeRepr |
+| main.rs:1751:13:1751:13 | c |  | main.rs:1700:5:1700:14 | S2 |
+| main.rs:1751:17:1751:33 | uses_my_trait2(...) |  | main.rs:1700:5:1700:14 | S2 |
+| main.rs:1751:32:1751:32 | a |  | main.rs:1732:28:1732:43 | ImplTraitTypeRepr |
+| main.rs:1752:13:1752:13 | d |  | main.rs:1700:5:1700:14 | S2 |
+| main.rs:1752:17:1752:34 | uses_my_trait2(...) |  | main.rs:1700:5:1700:14 | S2 |
+| main.rs:1752:32:1752:33 | S1 |  | main.rs:1699:5:1699:14 | S1 |
+| main.rs:1763:16:1763:20 | SelfParam |  | file://:0:0:0:0 | & |
+| main.rs:1763:16:1763:20 | SelfParam | &T | main.rs:1759:5:1760:13 | S |
+| main.rs:1763:31:1765:9 | { ... } |  | main.rs:1759:5:1760:13 | S |
+| main.rs:1764:13:1764:13 | S |  | main.rs:1759:5:1760:13 | S |
+| main.rs:1774:26:1776:9 | { ... } |  | main.rs:1768:5:1771:5 | MyVec |
+| main.rs:1774:26:1776:9 | { ... } | T | main.rs:1773:10:1773:10 | T |
+| main.rs:1775:13:1775:38 | MyVec {...} |  | main.rs:1768:5:1771:5 | MyVec |
+| main.rs:1775:13:1775:38 | MyVec {...} | T | main.rs:1773:10:1773:10 | T |
+| main.rs:1775:27:1775:36 | ...::new(...) |  | {EXTERNAL LOCATION} | Vec |
+| main.rs:1775:27:1775:36 | ...::new(...) | T | main.rs:1773:10:1773:10 | T |
+| main.rs:1778:17:1778:25 | SelfParam |  | file://:0:0:0:0 | & |
+| main.rs:1778:17:1778:25 | SelfParam | &T | main.rs:1768:5:1771:5 | MyVec |
+| main.rs:1778:17:1778:25 | SelfParam | &T.T | main.rs:1773:10:1773:10 | T |
+| main.rs:1778:28:1778:32 | value |  | main.rs:1773:10:1773:10 | T |
+| main.rs:1779:13:1779:16 | self |  | file://:0:0:0:0 | & |
+| main.rs:1779:13:1779:16 | self | &T | main.rs:1768:5:1771:5 | MyVec |
+| main.rs:1779:13:1779:16 | self | &T.T | main.rs:1773:10:1773:10 | T |
+| main.rs:1779:13:1779:21 | self.data |  | {EXTERNAL LOCATION} | Vec |
+| main.rs:1779:13:1779:21 | self.data | T | main.rs:1773:10:1773:10 | T |
+| main.rs:1779:28:1779:32 | value |  | main.rs:1773:10:1773:10 | T |
+| main.rs:1787:18:1787:22 | SelfParam |  | file://:0:0:0:0 | & |
+| main.rs:1787:18:1787:22 | SelfParam | &T | main.rs:1768:5:1771:5 | MyVec |
+| main.rs:1787:18:1787:22 | SelfParam | &T.T | main.rs:1783:10:1783:10 | T |
+| main.rs:1787:25:1787:29 | index |  | {EXTERNAL LOCATION} | usize |
+| main.rs:1787:56:1789:9 | { ... } |  | file://:0:0:0:0 | & |
+| main.rs:1787:56:1789:9 | { ... } | &T | main.rs:1783:10:1783:10 | T |
+| main.rs:1788:13:1788:29 | &... |  | file://:0:0:0:0 | & |
+| main.rs:1788:13:1788:29 | &... | &T | main.rs:1783:10:1783:10 | T |
+| main.rs:1788:14:1788:17 | self |  | file://:0:0:0:0 | & |
+| main.rs:1788:14:1788:17 | self | &T | main.rs:1768:5:1771:5 | MyVec |
+| main.rs:1788:14:1788:17 | self | &T.T | main.rs:1783:10:1783:10 | T |
+| main.rs:1788:14:1788:22 | self.data |  | {EXTERNAL LOCATION} | Vec |
+| main.rs:1788:14:1788:22 | self.data | T | main.rs:1783:10:1783:10 | T |
+| main.rs:1788:14:1788:29 | ...[index] |  | main.rs:1783:10:1783:10 | T |
+| main.rs:1788:24:1788:28 | index |  | {EXTERNAL LOCATION} | usize |
+| main.rs:1792:22:1792:26 | slice |  | file://:0:0:0:0 | & |
+| main.rs:1792:22:1792:26 | slice | &T | file://:0:0:0:0 | [] |
+| main.rs:1792:22:1792:26 | slice | &T.[T] | main.rs:1759:5:1760:13 | S |
+| main.rs:1793:13:1793:13 | x |  | main.rs:1759:5:1760:13 | S |
+| main.rs:1793:17:1793:21 | slice |  | file://:0:0:0:0 | & |
+| main.rs:1793:17:1793:21 | slice | &T | file://:0:0:0:0 | [] |
+| main.rs:1793:17:1793:21 | slice | &T.[T] | main.rs:1759:5:1760:13 | S |
+| main.rs:1793:17:1793:24 | slice[0] |  | main.rs:1759:5:1760:13 | S |
+| main.rs:1793:17:1793:30 | ... .foo() |  | main.rs:1759:5:1760:13 | S |
+| main.rs:1793:23:1793:23 | 0 |  | {EXTERNAL LOCATION} | i32 |
+| main.rs:1797:13:1797:19 | mut vec |  | main.rs:1768:5:1771:5 | MyVec |
+| main.rs:1797:13:1797:19 | mut vec | T | main.rs:1759:5:1760:13 | S |
+| main.rs:1797:23:1797:34 | ...::new(...) |  | main.rs:1768:5:1771:5 | MyVec |
+| main.rs:1797:23:1797:34 | ...::new(...) | T | main.rs:1759:5:1760:13 | S |
+| main.rs:1798:9:1798:11 | vec |  | main.rs:1768:5:1771:5 | MyVec |
+| main.rs:1798:9:1798:11 | vec | T | main.rs:1759:5:1760:13 | S |
+| main.rs:1798:18:1798:18 | S |  | main.rs:1759:5:1760:13 | S |
+| main.rs:1799:9:1799:11 | vec |  | main.rs:1768:5:1771:5 | MyVec |
+| main.rs:1799:9:1799:11 | vec | T | main.rs:1759:5:1760:13 | S |
+| main.rs:1799:13:1799:13 | 0 |  | {EXTERNAL LOCATION} | i32 |
+| main.rs:1801:13:1801:14 | xs |  | file://:0:0:0:0 | [] |
+| main.rs:1801:13:1801:14 | xs |  | file://:0:0:0:0 | [] |
+| main.rs:1801:13:1801:14 | xs | [T;...] | main.rs:1759:5:1760:13 | S |
+| main.rs:1801:13:1801:14 | xs | [T] | main.rs:1759:5:1760:13 | S |
+| main.rs:1801:21:1801:21 | 1 |  | {EXTERNAL LOCATION} | i32 |
+| main.rs:1801:26:1801:28 | [...] |  | file://:0:0:0:0 | [] |
+| main.rs:1801:26:1801:28 | [...] |  | file://:0:0:0:0 | [] |
+| main.rs:1801:26:1801:28 | [...] | [T;...] | main.rs:1759:5:1760:13 | S |
+| main.rs:1801:26:1801:28 | [...] | [T] | main.rs:1759:5:1760:13 | S |
+| main.rs:1801:27:1801:27 | S |  | main.rs:1759:5:1760:13 | S |
+| main.rs:1802:13:1802:13 | x |  | main.rs:1759:5:1760:13 | S |
+| main.rs:1802:17:1802:18 | xs |  | file://:0:0:0:0 | [] |
+| main.rs:1802:17:1802:18 | xs |  | file://:0:0:0:0 | [] |
+| main.rs:1802:17:1802:18 | xs | [T;...] | main.rs:1759:5:1760:13 | S |
+| main.rs:1802:17:1802:18 | xs | [T] | main.rs:1759:5:1760:13 | S |
+| main.rs:1802:17:1802:21 | xs[0] |  | main.rs:1759:5:1760:13 | S |
+| main.rs:1802:17:1802:27 | ... .foo() |  | main.rs:1759:5:1760:13 | S |
+| main.rs:1802:20:1802:20 | 0 |  | {EXTERNAL LOCATION} | i32 |
+| main.rs:1804:23:1804:25 | &xs |  | file://:0:0:0:0 | & |
+| main.rs:1804:23:1804:25 | &xs | &T | file://:0:0:0:0 | [] |
+| main.rs:1804:23:1804:25 | &xs | &T | file://:0:0:0:0 | [] |
+| main.rs:1804:23:1804:25 | &xs | &T.[T;...] | main.rs:1759:5:1760:13 | S |
+| main.rs:1804:23:1804:25 | &xs | &T.[T] | main.rs:1759:5:1760:13 | S |
+| main.rs:1804:24:1804:25 | xs |  | file://:0:0:0:0 | [] |
+| main.rs:1804:24:1804:25 | xs |  | file://:0:0:0:0 | [] |
+| main.rs:1804:24:1804:25 | xs | [T;...] | main.rs:1759:5:1760:13 | S |
+| main.rs:1804:24:1804:25 | xs | [T] | main.rs:1759:5:1760:13 | S |
+| main.rs:1810:5:1810:20 | ...::f(...) |  | main.rs:67:5:67:21 | Foo |
+| main.rs:1811:5:1811:60 | ...::g(...) |  | main.rs:67:5:67:21 | Foo |
+| main.rs:1811:20:1811:38 | ...::Foo {...} |  | main.rs:67:5:67:21 | Foo |
+| main.rs:1811:41:1811:59 | ...::Foo {...} |  | main.rs:67:5:67:21 | Foo |
+| main.rs:1827:5:1827:15 | ...::f(...) |  | {EXTERNAL LOCATION} | trait Future |
 testFailures
diff --git a/rust/ql/test/library-tests/type-inference/type-inference.ql b/rust/ql/test/library-tests/type-inference/type-inference.ql
index e7c11bcaebf..2278cde8a8f 100644
--- a/rust/ql/test/library-tests/type-inference/type-inference.ql
+++ b/rust/ql/test/library-tests/type-inference/type-inference.ql
@@ -55,10 +55,13 @@ module TypeTest implements TestSig {
     exists(AstNode n, TypePath path, Type t |
       t = TypeInference::inferType(n, path) and
       location = n.getLocation() and
-      element = n.toString() and
       if path.isEmpty()
       then value = element + ":" + t
       else value = element + ":" + path.toString() + "." + t.toString()
+    |
+      element = n.toString()
+      or
+      element = n.(IdentPat).getName().getText()
     )
   }
 }
diff --git a/rust/ql/test/library-tests/variables/CONSISTENCY/PathResolutionConsistency.expected b/rust/ql/test/library-tests/variables/CONSISTENCY/PathResolutionConsistency.expected
index e4c5c7393e4..85a794a0410 100644
--- a/rust/ql/test/library-tests/variables/CONSISTENCY/PathResolutionConsistency.expected
+++ b/rust/ql/test/library-tests/variables/CONSISTENCY/PathResolutionConsistency.expected
@@ -7,3 +7,16 @@ multipleMethodCallTargets
 | main.rs:459:9:459:23 | z.add_assign(...) | file://:0:0:0:0 | fn add_assign |
 | main.rs:459:9:459:23 | z.add_assign(...) | file://:0:0:0:0 | fn add_assign |
 | main.rs:459:9:459:23 | z.add_assign(...) | file://:0:0:0:0 | fn add_assign |
+multiplePathResolutions
+| main.rs:85:19:85:30 | ...::from | file://:0:0:0:0 | fn from |
+| main.rs:85:19:85:30 | ...::from | file://:0:0:0:0 | fn from |
+| main.rs:85:19:85:30 | ...::from | file://:0:0:0:0 | fn from |
+| main.rs:85:19:85:30 | ...::from | file://:0:0:0:0 | fn from |
+| main.rs:85:19:85:30 | ...::from | file://:0:0:0:0 | fn from |
+| main.rs:85:19:85:30 | ...::from | file://:0:0:0:0 | fn from |
+| main.rs:102:19:102:30 | ...::from | file://:0:0:0:0 | fn from |
+| main.rs:102:19:102:30 | ...::from | file://:0:0:0:0 | fn from |
+| main.rs:102:19:102:30 | ...::from | file://:0:0:0:0 | fn from |
+| main.rs:102:19:102:30 | ...::from | file://:0:0:0:0 | fn from |
+| main.rs:102:19:102:30 | ...::from | file://:0:0:0:0 | fn from |
+| main.rs:102:19:102:30 | ...::from | file://:0:0:0:0 | fn from |
diff --git a/rust/ql/test/query-tests/diagnostics/CONSISTENCY/PathResolutionConsistency.expected b/rust/ql/test/query-tests/diagnostics/CONSISTENCY/PathResolutionConsistency.expected
new file mode 100644
index 00000000000..8e261e29676
--- /dev/null
+++ b/rust/ql/test/query-tests/diagnostics/CONSISTENCY/PathResolutionConsistency.expected
@@ -0,0 +1,7 @@
+multiplePathResolutions
+| my_struct.rs:25:19:25:30 | ...::from | file://:0:0:0:0 | fn from |
+| my_struct.rs:25:19:25:30 | ...::from | file://:0:0:0:0 | fn from |
+| my_struct.rs:25:19:25:30 | ...::from | file://:0:0:0:0 | fn from |
+| my_struct.rs:25:19:25:30 | ...::from | file://:0:0:0:0 | fn from |
+| my_struct.rs:25:19:25:30 | ...::from | file://:0:0:0:0 | fn from |
+| my_struct.rs:25:19:25:30 | ...::from | file://:0:0:0:0 | fn from |
diff --git a/rust/ql/test/query-tests/diagnostics/SummaryStatsReduced.expected b/rust/ql/test/query-tests/diagnostics/SummaryStatsReduced.expected
index ed21d9772fc..563e370b4ed 100644
--- a/rust/ql/test/query-tests/diagnostics/SummaryStatsReduced.expected
+++ b/rust/ql/test/query-tests/diagnostics/SummaryStatsReduced.expected
@@ -6,7 +6,7 @@
 | Files extracted - without errors % | 57 |
 | Inconsistencies - AST | 0 |
 | Inconsistencies - CFG | 0 |
-| Inconsistencies - Path resolution | 0 |
+| Inconsistencies - Path resolution | 1 |
 | Inconsistencies - SSA | 0 |
 | Inconsistencies - data flow | 0 |
 | Lines of code extracted | 60 |
diff --git a/rust/ql/test/query-tests/security/CWE-022/CONSISTENCY/PathResolutionConsistency.expected b/rust/ql/test/query-tests/security/CWE-022/CONSISTENCY/PathResolutionConsistency.expected
index 88e64c648bc..abeca72b351 100644
--- a/rust/ql/test/query-tests/security/CWE-022/CONSISTENCY/PathResolutionConsistency.expected
+++ b/rust/ql/test/query-tests/security/CWE-022/CONSISTENCY/PathResolutionConsistency.expected
@@ -4,6 +4,8 @@ multiplePathResolutions
 | src/main.rs:8:21:8:33 | ...::from | file://:0:0:0:0 | fn from |
 | src/main.rs:8:21:8:33 | ...::from | file://:0:0:0:0 | fn from |
 | src/main.rs:8:21:8:33 | ...::from | file://:0:0:0:0 | fn from |
+| src/main.rs:8:21:8:33 | ...::from | file://:0:0:0:0 | fn from |
+| src/main.rs:19:21:19:33 | ...::from | file://:0:0:0:0 | fn from |
 | src/main.rs:19:21:19:33 | ...::from | file://:0:0:0:0 | fn from |
 | src/main.rs:19:21:19:33 | ...::from | file://:0:0:0:0 | fn from |
 | src/main.rs:19:21:19:33 | ...::from | file://:0:0:0:0 | fn from |
@@ -14,6 +16,8 @@ multiplePathResolutions
 | src/main.rs:25:23:25:35 | ...::from | file://:0:0:0:0 | fn from |
 | src/main.rs:25:23:25:35 | ...::from | file://:0:0:0:0 | fn from |
 | src/main.rs:25:23:25:35 | ...::from | file://:0:0:0:0 | fn from |
+| src/main.rs:25:23:25:35 | ...::from | file://:0:0:0:0 | fn from |
+| src/main.rs:26:38:26:50 | ...::from | file://:0:0:0:0 | fn from |
 | src/main.rs:26:38:26:50 | ...::from | file://:0:0:0:0 | fn from |
 | src/main.rs:26:38:26:50 | ...::from | file://:0:0:0:0 | fn from |
 | src/main.rs:26:38:26:50 | ...::from | file://:0:0:0:0 | fn from |
@@ -24,6 +28,8 @@ multiplePathResolutions
 | src/main.rs:39:23:39:35 | ...::from | file://:0:0:0:0 | fn from |
 | src/main.rs:39:23:39:35 | ...::from | file://:0:0:0:0 | fn from |
 | src/main.rs:39:23:39:35 | ...::from | file://:0:0:0:0 | fn from |
+| src/main.rs:39:23:39:35 | ...::from | file://:0:0:0:0 | fn from |
+| src/main.rs:40:38:40:50 | ...::from | file://:0:0:0:0 | fn from |
 | src/main.rs:40:38:40:50 | ...::from | file://:0:0:0:0 | fn from |
 | src/main.rs:40:38:40:50 | ...::from | file://:0:0:0:0 | fn from |
 | src/main.rs:40:38:40:50 | ...::from | file://:0:0:0:0 | fn from |
@@ -34,6 +40,8 @@ multiplePathResolutions
 | src/main.rs:52:23:52:35 | ...::from | file://:0:0:0:0 | fn from |
 | src/main.rs:52:23:52:35 | ...::from | file://:0:0:0:0 | fn from |
 | src/main.rs:52:23:52:35 | ...::from | file://:0:0:0:0 | fn from |
+| src/main.rs:52:23:52:35 | ...::from | file://:0:0:0:0 | fn from |
+| src/main.rs:53:38:53:50 | ...::from | file://:0:0:0:0 | fn from |
 | src/main.rs:53:38:53:50 | ...::from | file://:0:0:0:0 | fn from |
 | src/main.rs:53:38:53:50 | ...::from | file://:0:0:0:0 | fn from |
 | src/main.rs:53:38:53:50 | ...::from | file://:0:0:0:0 | fn from |
diff --git a/rust/ql/test/query-tests/security/CWE-089/CONSISTENCY/PathResolutionConsistency.expected b/rust/ql/test/query-tests/security/CWE-089/CONSISTENCY/PathResolutionConsistency.expected
index ea9e17f0c1d..3156d05ef17 100644
--- a/rust/ql/test/query-tests/security/CWE-089/CONSISTENCY/PathResolutionConsistency.expected
+++ b/rust/ql/test/query-tests/security/CWE-089/CONSISTENCY/PathResolutionConsistency.expected
@@ -1,3 +1,274 @@
+multiplePathResolutions
+| sqlx.rs:46:24:46:35 | ...::from | file://:0:0:0:0 | fn from |
+| sqlx.rs:46:24:46:35 | ...::from | file://:0:0:0:0 | fn from |
+| sqlx.rs:46:24:46:35 | ...::from | file://:0:0:0:0 | fn from |
+| sqlx.rs:46:24:46:35 | ...::from | file://:0:0:0:0 | fn from |
+| sqlx.rs:46:24:46:35 | ...::from | file://:0:0:0:0 | fn from |
+| sqlx.rs:46:24:46:35 | ...::from | file://:0:0:0:0 | fn from |
+| sqlx.rs:46:24:46:35 | ...::from | file://:0:0:0:0 | fn from |
+| sqlx.rs:46:24:46:35 | ...::from | file://:0:0:0:0 | fn from |
+| sqlx.rs:46:24:46:35 | ...::from | file://:0:0:0:0 | fn from |
+| sqlx.rs:46:24:46:35 | ...::from | file://:0:0:0:0 | fn from |
+| sqlx.rs:46:24:46:35 | ...::from | file://:0:0:0:0 | fn from |
+| sqlx.rs:46:24:46:35 | ...::from | file://:0:0:0:0 | fn from |
+| sqlx.rs:46:24:46:35 | ...::from | file://:0:0:0:0 | fn from |
+| sqlx.rs:46:24:46:35 | ...::from | file://:0:0:0:0 | fn from |
+| sqlx.rs:46:24:46:35 | ...::from | file://:0:0:0:0 | fn from |
+| sqlx.rs:47:56:47:67 | ...::from | file://:0:0:0:0 | fn from |
+| sqlx.rs:47:56:47:67 | ...::from | file://:0:0:0:0 | fn from |
+| sqlx.rs:47:56:47:67 | ...::from | file://:0:0:0:0 | fn from |
+| sqlx.rs:47:56:47:67 | ...::from | file://:0:0:0:0 | fn from |
+| sqlx.rs:47:56:47:67 | ...::from | file://:0:0:0:0 | fn from |
+| sqlx.rs:47:56:47:67 | ...::from | file://:0:0:0:0 | fn from |
+| sqlx.rs:47:56:47:67 | ...::from | file://:0:0:0:0 | fn from |
+| sqlx.rs:47:56:47:67 | ...::from | file://:0:0:0:0 | fn from |
+| sqlx.rs:47:56:47:67 | ...::from | file://:0:0:0:0 | fn from |
+| sqlx.rs:47:56:47:67 | ...::from | file://:0:0:0:0 | fn from |
+| sqlx.rs:47:56:47:67 | ...::from | file://:0:0:0:0 | fn from |
+| sqlx.rs:47:56:47:67 | ...::from | file://:0:0:0:0 | fn from |
+| sqlx.rs:47:56:47:67 | ...::from | file://:0:0:0:0 | fn from |
+| sqlx.rs:47:56:47:67 | ...::from | file://:0:0:0:0 | fn from |
+| sqlx.rs:47:56:47:67 | ...::from | file://:0:0:0:0 | fn from |
+| sqlx.rs:48:97:48:108 | ...::from | file://:0:0:0:0 | fn from |
+| sqlx.rs:48:97:48:108 | ...::from | file://:0:0:0:0 | fn from |
+| sqlx.rs:48:97:48:108 | ...::from | file://:0:0:0:0 | fn from |
+| sqlx.rs:48:97:48:108 | ...::from | file://:0:0:0:0 | fn from |
+| sqlx.rs:48:97:48:108 | ...::from | file://:0:0:0:0 | fn from |
+| sqlx.rs:48:97:48:108 | ...::from | file://:0:0:0:0 | fn from |
+| sqlx.rs:48:97:48:108 | ...::from | file://:0:0:0:0 | fn from |
+| sqlx.rs:48:97:48:108 | ...::from | file://:0:0:0:0 | fn from |
+| sqlx.rs:48:97:48:108 | ...::from | file://:0:0:0:0 | fn from |
+| sqlx.rs:48:97:48:108 | ...::from | file://:0:0:0:0 | fn from |
+| sqlx.rs:48:97:48:108 | ...::from | file://:0:0:0:0 | fn from |
+| sqlx.rs:48:97:48:108 | ...::from | file://:0:0:0:0 | fn from |
+| sqlx.rs:48:97:48:108 | ...::from | file://:0:0:0:0 | fn from |
+| sqlx.rs:48:97:48:108 | ...::from | file://:0:0:0:0 | fn from |
+| sqlx.rs:48:97:48:108 | ...::from | file://:0:0:0:0 | fn from |
+| sqlx.rs:50:24:50:35 | ...::from | file://:0:0:0:0 | fn from |
+| sqlx.rs:50:24:50:35 | ...::from | file://:0:0:0:0 | fn from |
+| sqlx.rs:50:24:50:35 | ...::from | file://:0:0:0:0 | fn from |
+| sqlx.rs:50:24:50:35 | ...::from | file://:0:0:0:0 | fn from |
+| sqlx.rs:50:24:50:35 | ...::from | file://:0:0:0:0 | fn from |
+| sqlx.rs:50:24:50:35 | ...::from | file://:0:0:0:0 | fn from |
+| sqlx.rs:50:24:50:35 | ...::from | file://:0:0:0:0 | fn from |
+| sqlx.rs:50:24:50:35 | ...::from | file://:0:0:0:0 | fn from |
+| sqlx.rs:50:24:50:35 | ...::from | file://:0:0:0:0 | fn from |
+| sqlx.rs:50:24:50:35 | ...::from | file://:0:0:0:0 | fn from |
+| sqlx.rs:50:24:50:35 | ...::from | file://:0:0:0:0 | fn from |
+| sqlx.rs:50:24:50:35 | ...::from | file://:0:0:0:0 | fn from |
+| sqlx.rs:50:24:50:35 | ...::from | file://:0:0:0:0 | fn from |
+| sqlx.rs:50:24:50:35 | ...::from | file://:0:0:0:0 | fn from |
+| sqlx.rs:50:24:50:35 | ...::from | file://:0:0:0:0 | fn from |
+| sqlx.rs:51:24:51:35 | ...::from | file://:0:0:0:0 | fn from |
+| sqlx.rs:51:24:51:35 | ...::from | file://:0:0:0:0 | fn from |
+| sqlx.rs:51:24:51:35 | ...::from | file://:0:0:0:0 | fn from |
+| sqlx.rs:51:24:51:35 | ...::from | file://:0:0:0:0 | fn from |
+| sqlx.rs:51:24:51:35 | ...::from | file://:0:0:0:0 | fn from |
+| sqlx.rs:51:24:51:35 | ...::from | file://:0:0:0:0 | fn from |
+| sqlx.rs:51:24:51:35 | ...::from | file://:0:0:0:0 | fn from |
+| sqlx.rs:51:24:51:35 | ...::from | file://:0:0:0:0 | fn from |
+| sqlx.rs:51:24:51:35 | ...::from | file://:0:0:0:0 | fn from |
+| sqlx.rs:51:24:51:35 | ...::from | file://:0:0:0:0 | fn from |
+| sqlx.rs:51:24:51:35 | ...::from | file://:0:0:0:0 | fn from |
+| sqlx.rs:51:24:51:35 | ...::from | file://:0:0:0:0 | fn from |
+| sqlx.rs:51:24:51:35 | ...::from | file://:0:0:0:0 | fn from |
+| sqlx.rs:51:24:51:35 | ...::from | file://:0:0:0:0 | fn from |
+| sqlx.rs:51:24:51:35 | ...::from | file://:0:0:0:0 | fn from |
+| sqlx.rs:55:26:55:37 | ...::from | file://:0:0:0:0 | fn from |
+| sqlx.rs:55:26:55:37 | ...::from | file://:0:0:0:0 | fn from |
+| sqlx.rs:55:26:55:37 | ...::from | file://:0:0:0:0 | fn from |
+| sqlx.rs:55:26:55:37 | ...::from | file://:0:0:0:0 | fn from |
+| sqlx.rs:55:26:55:37 | ...::from | file://:0:0:0:0 | fn from |
+| sqlx.rs:55:26:55:37 | ...::from | file://:0:0:0:0 | fn from |
+| sqlx.rs:55:26:55:37 | ...::from | file://:0:0:0:0 | fn from |
+| sqlx.rs:55:26:55:37 | ...::from | file://:0:0:0:0 | fn from |
+| sqlx.rs:55:26:55:37 | ...::from | file://:0:0:0:0 | fn from |
+| sqlx.rs:55:26:55:37 | ...::from | file://:0:0:0:0 | fn from |
+| sqlx.rs:55:26:55:37 | ...::from | file://:0:0:0:0 | fn from |
+| sqlx.rs:55:26:55:37 | ...::from | file://:0:0:0:0 | fn from |
+| sqlx.rs:55:26:55:37 | ...::from | file://:0:0:0:0 | fn from |
+| sqlx.rs:55:26:55:37 | ...::from | file://:0:0:0:0 | fn from |
+| sqlx.rs:55:26:55:37 | ...::from | file://:0:0:0:0 | fn from |
+| sqlx.rs:61:28:61:39 | ...::from | file://:0:0:0:0 | fn from |
+| sqlx.rs:61:28:61:39 | ...::from | file://:0:0:0:0 | fn from |
+| sqlx.rs:61:28:61:39 | ...::from | file://:0:0:0:0 | fn from |
+| sqlx.rs:61:28:61:39 | ...::from | file://:0:0:0:0 | fn from |
+| sqlx.rs:61:28:61:39 | ...::from | file://:0:0:0:0 | fn from |
+| sqlx.rs:61:28:61:39 | ...::from | file://:0:0:0:0 | fn from |
+| sqlx.rs:61:28:61:39 | ...::from | file://:0:0:0:0 | fn from |
+| sqlx.rs:61:28:61:39 | ...::from | file://:0:0:0:0 | fn from |
+| sqlx.rs:61:28:61:39 | ...::from | file://:0:0:0:0 | fn from |
+| sqlx.rs:61:28:61:39 | ...::from | file://:0:0:0:0 | fn from |
+| sqlx.rs:61:28:61:39 | ...::from | file://:0:0:0:0 | fn from |
+| sqlx.rs:61:28:61:39 | ...::from | file://:0:0:0:0 | fn from |
+| sqlx.rs:61:28:61:39 | ...::from | file://:0:0:0:0 | fn from |
+| sqlx.rs:61:28:61:39 | ...::from | file://:0:0:0:0 | fn from |
+| sqlx.rs:61:28:61:39 | ...::from | file://:0:0:0:0 | fn from |
+| sqlx.rs:99:24:99:35 | ...::from | file://:0:0:0:0 | fn from |
+| sqlx.rs:99:24:99:35 | ...::from | file://:0:0:0:0 | fn from |
+| sqlx.rs:99:24:99:35 | ...::from | file://:0:0:0:0 | fn from |
+| sqlx.rs:99:24:99:35 | ...::from | file://:0:0:0:0 | fn from |
+| sqlx.rs:99:24:99:35 | ...::from | file://:0:0:0:0 | fn from |
+| sqlx.rs:99:24:99:35 | ...::from | file://:0:0:0:0 | fn from |
+| sqlx.rs:99:24:99:35 | ...::from | file://:0:0:0:0 | fn from |
+| sqlx.rs:99:24:99:35 | ...::from | file://:0:0:0:0 | fn from |
+| sqlx.rs:99:24:99:35 | ...::from | file://:0:0:0:0 | fn from |
+| sqlx.rs:99:24:99:35 | ...::from | file://:0:0:0:0 | fn from |
+| sqlx.rs:99:24:99:35 | ...::from | file://:0:0:0:0 | fn from |
+| sqlx.rs:99:24:99:35 | ...::from | file://:0:0:0:0 | fn from |
+| sqlx.rs:99:24:99:35 | ...::from | file://:0:0:0:0 | fn from |
+| sqlx.rs:99:24:99:35 | ...::from | file://:0:0:0:0 | fn from |
+| sqlx.rs:99:24:99:35 | ...::from | file://:0:0:0:0 | fn from |
+| sqlx.rs:100:97:100:108 | ...::from | file://:0:0:0:0 | fn from |
+| sqlx.rs:100:97:100:108 | ...::from | file://:0:0:0:0 | fn from |
+| sqlx.rs:100:97:100:108 | ...::from | file://:0:0:0:0 | fn from |
+| sqlx.rs:100:97:100:108 | ...::from | file://:0:0:0:0 | fn from |
+| sqlx.rs:100:97:100:108 | ...::from | file://:0:0:0:0 | fn from |
+| sqlx.rs:100:97:100:108 | ...::from | file://:0:0:0:0 | fn from |
+| sqlx.rs:100:97:100:108 | ...::from | file://:0:0:0:0 | fn from |
+| sqlx.rs:100:97:100:108 | ...::from | file://:0:0:0:0 | fn from |
+| sqlx.rs:100:97:100:108 | ...::from | file://:0:0:0:0 | fn from |
+| sqlx.rs:100:97:100:108 | ...::from | file://:0:0:0:0 | fn from |
+| sqlx.rs:100:97:100:108 | ...::from | file://:0:0:0:0 | fn from |
+| sqlx.rs:100:97:100:108 | ...::from | file://:0:0:0:0 | fn from |
+| sqlx.rs:100:97:100:108 | ...::from | file://:0:0:0:0 | fn from |
+| sqlx.rs:100:97:100:108 | ...::from | file://:0:0:0:0 | fn from |
+| sqlx.rs:100:97:100:108 | ...::from | file://:0:0:0:0 | fn from |
+| sqlx.rs:101:24:101:35 | ...::from | file://:0:0:0:0 | fn from |
+| sqlx.rs:101:24:101:35 | ...::from | file://:0:0:0:0 | fn from |
+| sqlx.rs:101:24:101:35 | ...::from | file://:0:0:0:0 | fn from |
+| sqlx.rs:101:24:101:35 | ...::from | file://:0:0:0:0 | fn from |
+| sqlx.rs:101:24:101:35 | ...::from | file://:0:0:0:0 | fn from |
+| sqlx.rs:101:24:101:35 | ...::from | file://:0:0:0:0 | fn from |
+| sqlx.rs:101:24:101:35 | ...::from | file://:0:0:0:0 | fn from |
+| sqlx.rs:101:24:101:35 | ...::from | file://:0:0:0:0 | fn from |
+| sqlx.rs:101:24:101:35 | ...::from | file://:0:0:0:0 | fn from |
+| sqlx.rs:101:24:101:35 | ...::from | file://:0:0:0:0 | fn from |
+| sqlx.rs:101:24:101:35 | ...::from | file://:0:0:0:0 | fn from |
+| sqlx.rs:101:24:101:35 | ...::from | file://:0:0:0:0 | fn from |
+| sqlx.rs:101:24:101:35 | ...::from | file://:0:0:0:0 | fn from |
+| sqlx.rs:101:24:101:35 | ...::from | file://:0:0:0:0 | fn from |
+| sqlx.rs:101:24:101:35 | ...::from | file://:0:0:0:0 | fn from |
+| sqlx.rs:102:26:102:37 | ...::from | file://:0:0:0:0 | fn from |
+| sqlx.rs:102:26:102:37 | ...::from | file://:0:0:0:0 | fn from |
+| sqlx.rs:102:26:102:37 | ...::from | file://:0:0:0:0 | fn from |
+| sqlx.rs:102:26:102:37 | ...::from | file://:0:0:0:0 | fn from |
+| sqlx.rs:102:26:102:37 | ...::from | file://:0:0:0:0 | fn from |
+| sqlx.rs:102:26:102:37 | ...::from | file://:0:0:0:0 | fn from |
+| sqlx.rs:102:26:102:37 | ...::from | file://:0:0:0:0 | fn from |
+| sqlx.rs:102:26:102:37 | ...::from | file://:0:0:0:0 | fn from |
+| sqlx.rs:102:26:102:37 | ...::from | file://:0:0:0:0 | fn from |
+| sqlx.rs:102:26:102:37 | ...::from | file://:0:0:0:0 | fn from |
+| sqlx.rs:102:26:102:37 | ...::from | file://:0:0:0:0 | fn from |
+| sqlx.rs:102:26:102:37 | ...::from | file://:0:0:0:0 | fn from |
+| sqlx.rs:102:26:102:37 | ...::from | file://:0:0:0:0 | fn from |
+| sqlx.rs:102:26:102:37 | ...::from | file://:0:0:0:0 | fn from |
+| sqlx.rs:102:26:102:37 | ...::from | file://:0:0:0:0 | fn from |
+| sqlx.rs:103:28:103:39 | ...::from | file://:0:0:0:0 | fn from |
+| sqlx.rs:103:28:103:39 | ...::from | file://:0:0:0:0 | fn from |
+| sqlx.rs:103:28:103:39 | ...::from | file://:0:0:0:0 | fn from |
+| sqlx.rs:103:28:103:39 | ...::from | file://:0:0:0:0 | fn from |
+| sqlx.rs:103:28:103:39 | ...::from | file://:0:0:0:0 | fn from |
+| sqlx.rs:103:28:103:39 | ...::from | file://:0:0:0:0 | fn from |
+| sqlx.rs:103:28:103:39 | ...::from | file://:0:0:0:0 | fn from |
+| sqlx.rs:103:28:103:39 | ...::from | file://:0:0:0:0 | fn from |
+| sqlx.rs:103:28:103:39 | ...::from | file://:0:0:0:0 | fn from |
+| sqlx.rs:103:28:103:39 | ...::from | file://:0:0:0:0 | fn from |
+| sqlx.rs:103:28:103:39 | ...::from | file://:0:0:0:0 | fn from |
+| sqlx.rs:103:28:103:39 | ...::from | file://:0:0:0:0 | fn from |
+| sqlx.rs:103:28:103:39 | ...::from | file://:0:0:0:0 | fn from |
+| sqlx.rs:103:28:103:39 | ...::from | file://:0:0:0:0 | fn from |
+| sqlx.rs:103:28:103:39 | ...::from | file://:0:0:0:0 | fn from |
+| sqlx.rs:172:24:172:35 | ...::from | file://:0:0:0:0 | fn from |
+| sqlx.rs:172:24:172:35 | ...::from | file://:0:0:0:0 | fn from |
+| sqlx.rs:172:24:172:35 | ...::from | file://:0:0:0:0 | fn from |
+| sqlx.rs:172:24:172:35 | ...::from | file://:0:0:0:0 | fn from |
+| sqlx.rs:172:24:172:35 | ...::from | file://:0:0:0:0 | fn from |
+| sqlx.rs:172:24:172:35 | ...::from | file://:0:0:0:0 | fn from |
+| sqlx.rs:172:24:172:35 | ...::from | file://:0:0:0:0 | fn from |
+| sqlx.rs:172:24:172:35 | ...::from | file://:0:0:0:0 | fn from |
+| sqlx.rs:172:24:172:35 | ...::from | file://:0:0:0:0 | fn from |
+| sqlx.rs:172:24:172:35 | ...::from | file://:0:0:0:0 | fn from |
+| sqlx.rs:172:24:172:35 | ...::from | file://:0:0:0:0 | fn from |
+| sqlx.rs:172:24:172:35 | ...::from | file://:0:0:0:0 | fn from |
+| sqlx.rs:172:24:172:35 | ...::from | file://:0:0:0:0 | fn from |
+| sqlx.rs:172:24:172:35 | ...::from | file://:0:0:0:0 | fn from |
+| sqlx.rs:172:24:172:35 | ...::from | file://:0:0:0:0 | fn from |
+| sqlx.rs:173:97:173:108 | ...::from | file://:0:0:0:0 | fn from |
+| sqlx.rs:173:97:173:108 | ...::from | file://:0:0:0:0 | fn from |
+| sqlx.rs:173:97:173:108 | ...::from | file://:0:0:0:0 | fn from |
+| sqlx.rs:173:97:173:108 | ...::from | file://:0:0:0:0 | fn from |
+| sqlx.rs:173:97:173:108 | ...::from | file://:0:0:0:0 | fn from |
+| sqlx.rs:173:97:173:108 | ...::from | file://:0:0:0:0 | fn from |
+| sqlx.rs:173:97:173:108 | ...::from | file://:0:0:0:0 | fn from |
+| sqlx.rs:173:97:173:108 | ...::from | file://:0:0:0:0 | fn from |
+| sqlx.rs:173:97:173:108 | ...::from | file://:0:0:0:0 | fn from |
+| sqlx.rs:173:97:173:108 | ...::from | file://:0:0:0:0 | fn from |
+| sqlx.rs:173:97:173:108 | ...::from | file://:0:0:0:0 | fn from |
+| sqlx.rs:173:97:173:108 | ...::from | file://:0:0:0:0 | fn from |
+| sqlx.rs:173:97:173:108 | ...::from | file://:0:0:0:0 | fn from |
+| sqlx.rs:173:97:173:108 | ...::from | file://:0:0:0:0 | fn from |
+| sqlx.rs:173:97:173:108 | ...::from | file://:0:0:0:0 | fn from |
+| sqlx.rs:174:24:174:35 | ...::from | file://:0:0:0:0 | fn from |
+| sqlx.rs:174:24:174:35 | ...::from | file://:0:0:0:0 | fn from |
+| sqlx.rs:174:24:174:35 | ...::from | file://:0:0:0:0 | fn from |
+| sqlx.rs:174:24:174:35 | ...::from | file://:0:0:0:0 | fn from |
+| sqlx.rs:174:24:174:35 | ...::from | file://:0:0:0:0 | fn from |
+| sqlx.rs:174:24:174:35 | ...::from | file://:0:0:0:0 | fn from |
+| sqlx.rs:174:24:174:35 | ...::from | file://:0:0:0:0 | fn from |
+| sqlx.rs:174:24:174:35 | ...::from | file://:0:0:0:0 | fn from |
+| sqlx.rs:174:24:174:35 | ...::from | file://:0:0:0:0 | fn from |
+| sqlx.rs:174:24:174:35 | ...::from | file://:0:0:0:0 | fn from |
+| sqlx.rs:174:24:174:35 | ...::from | file://:0:0:0:0 | fn from |
+| sqlx.rs:174:24:174:35 | ...::from | file://:0:0:0:0 | fn from |
+| sqlx.rs:174:24:174:35 | ...::from | file://:0:0:0:0 | fn from |
+| sqlx.rs:174:24:174:35 | ...::from | file://:0:0:0:0 | fn from |
+| sqlx.rs:174:24:174:35 | ...::from | file://:0:0:0:0 | fn from |
+| sqlx.rs:175:26:175:37 | ...::from | file://:0:0:0:0 | fn from |
+| sqlx.rs:175:26:175:37 | ...::from | file://:0:0:0:0 | fn from |
+| sqlx.rs:175:26:175:37 | ...::from | file://:0:0:0:0 | fn from |
+| sqlx.rs:175:26:175:37 | ...::from | file://:0:0:0:0 | fn from |
+| sqlx.rs:175:26:175:37 | ...::from | file://:0:0:0:0 | fn from |
+| sqlx.rs:175:26:175:37 | ...::from | file://:0:0:0:0 | fn from |
+| sqlx.rs:175:26:175:37 | ...::from | file://:0:0:0:0 | fn from |
+| sqlx.rs:175:26:175:37 | ...::from | file://:0:0:0:0 | fn from |
+| sqlx.rs:175:26:175:37 | ...::from | file://:0:0:0:0 | fn from |
+| sqlx.rs:175:26:175:37 | ...::from | file://:0:0:0:0 | fn from |
+| sqlx.rs:175:26:175:37 | ...::from | file://:0:0:0:0 | fn from |
+| sqlx.rs:175:26:175:37 | ...::from | file://:0:0:0:0 | fn from |
+| sqlx.rs:175:26:175:37 | ...::from | file://:0:0:0:0 | fn from |
+| sqlx.rs:175:26:175:37 | ...::from | file://:0:0:0:0 | fn from |
+| sqlx.rs:175:26:175:37 | ...::from | file://:0:0:0:0 | fn from |
+| sqlx.rs:176:28:176:39 | ...::from | file://:0:0:0:0 | fn from |
+| sqlx.rs:176:28:176:39 | ...::from | file://:0:0:0:0 | fn from |
+| sqlx.rs:176:28:176:39 | ...::from | file://:0:0:0:0 | fn from |
+| sqlx.rs:176:28:176:39 | ...::from | file://:0:0:0:0 | fn from |
+| sqlx.rs:176:28:176:39 | ...::from | file://:0:0:0:0 | fn from |
+| sqlx.rs:176:28:176:39 | ...::from | file://:0:0:0:0 | fn from |
+| sqlx.rs:176:28:176:39 | ...::from | file://:0:0:0:0 | fn from |
+| sqlx.rs:176:28:176:39 | ...::from | file://:0:0:0:0 | fn from |
+| sqlx.rs:176:28:176:39 | ...::from | file://:0:0:0:0 | fn from |
+| sqlx.rs:176:28:176:39 | ...::from | file://:0:0:0:0 | fn from |
+| sqlx.rs:176:28:176:39 | ...::from | file://:0:0:0:0 | fn from |
+| sqlx.rs:176:28:176:39 | ...::from | file://:0:0:0:0 | fn from |
+| sqlx.rs:176:28:176:39 | ...::from | file://:0:0:0:0 | fn from |
+| sqlx.rs:176:28:176:39 | ...::from | file://:0:0:0:0 | fn from |
+| sqlx.rs:176:28:176:39 | ...::from | file://:0:0:0:0 | fn from |
+| sqlx.rs:202:57:202:68 | ...::from | file://:0:0:0:0 | fn from |
+| sqlx.rs:202:57:202:68 | ...::from | file://:0:0:0:0 | fn from |
+| sqlx.rs:202:57:202:68 | ...::from | file://:0:0:0:0 | fn from |
+| sqlx.rs:202:57:202:68 | ...::from | file://:0:0:0:0 | fn from |
+| sqlx.rs:202:57:202:68 | ...::from | file://:0:0:0:0 | fn from |
+| sqlx.rs:202:57:202:68 | ...::from | file://:0:0:0:0 | fn from |
+| sqlx.rs:202:57:202:68 | ...::from | file://:0:0:0:0 | fn from |
+| sqlx.rs:202:57:202:68 | ...::from | file://:0:0:0:0 | fn from |
+| sqlx.rs:202:57:202:68 | ...::from | file://:0:0:0:0 | fn from |
+| sqlx.rs:202:57:202:68 | ...::from | file://:0:0:0:0 | fn from |
+| sqlx.rs:202:57:202:68 | ...::from | file://:0:0:0:0 | fn from |
+| sqlx.rs:202:57:202:68 | ...::from | file://:0:0:0:0 | fn from |
+| sqlx.rs:202:57:202:68 | ...::from | file://:0:0:0:0 | fn from |
+| sqlx.rs:202:57:202:68 | ...::from | file://:0:0:0:0 | fn from |
+| sqlx.rs:202:57:202:68 | ...::from | file://:0:0:0:0 | fn from |
 multipleCanonicalPaths
 | file://:0:0:0:0 | fn encode | file://:0:0:0:0 | Crate(core@0.0.0) | <core::option::Option as der::encode::Encode>::encode |
 | file://:0:0:0:0 | fn encode | file://:0:0:0:0 | Crate(core@0.0.0) | <core::option::Option as sqlx_core::encode::Encode>::encode |
diff --git a/rust/ql/test/query-tests/security/CWE-089/CONSISTENCY/TypeInferenceConsistency.expected b/rust/ql/test/query-tests/security/CWE-089/CONSISTENCY/TypeInferenceConsistency.expected
deleted file mode 100644
index 9bd56449240..00000000000
--- a/rust/ql/test/query-tests/security/CWE-089/CONSISTENCY/TypeInferenceConsistency.expected
+++ /dev/null
@@ -1,3 +0,0 @@
-illFormedTypeMention
-| sqlx.rs:158:13:158:81 | ...::BoxDynError |
-| sqlx.rs:160:17:160:86 | ...::BoxDynError |
diff --git a/rust/ql/test/query-tests/security/CWE-312/CleartextLogging.expected b/rust/ql/test/query-tests/security/CWE-312/CleartextLogging.expected
index 594834bca1f..e6ccfbddcc4 100644
--- a/rust/ql/test/query-tests/security/CWE-312/CleartextLogging.expected
+++ b/rust/ql/test/query-tests/security/CWE-312/CleartextLogging.expected
@@ -1,508 +1,537 @@
 #select
+| test_logging.rs:42:5:42:36 | ...::log | test_logging.rs:42:28:42:35 | password | test_logging.rs:42:5:42:36 | ...::log | This operation writes $@ to a log file. | test_logging.rs:42:28:42:35 | password | password |
 | test_logging.rs:43:5:43:36 | ...::log | test_logging.rs:43:28:43:35 | password | test_logging.rs:43:5:43:36 | ...::log | This operation writes $@ to a log file. | test_logging.rs:43:28:43:35 | password | password |
-| test_logging.rs:44:5:44:36 | ...::log | test_logging.rs:44:28:44:35 | password | test_logging.rs:44:5:44:36 | ...::log | This operation writes $@ to a log file. | test_logging.rs:44:28:44:35 | password | password |
-| test_logging.rs:45:5:45:35 | ...::log | test_logging.rs:45:27:45:34 | password | test_logging.rs:45:5:45:35 | ...::log | This operation writes $@ to a log file. | test_logging.rs:45:27:45:34 | password | password |
-| test_logging.rs:46:5:46:36 | ...::log | test_logging.rs:46:28:46:35 | password | test_logging.rs:46:5:46:36 | ...::log | This operation writes $@ to a log file. | test_logging.rs:46:28:46:35 | password | password |
-| test_logging.rs:47:5:47:35 | ...::log | test_logging.rs:47:27:47:34 | password | test_logging.rs:47:5:47:35 | ...::log | This operation writes $@ to a log file. | test_logging.rs:47:27:47:34 | password | password |
-| test_logging.rs:48:5:48:48 | ...::log | test_logging.rs:48:40:48:47 | password | test_logging.rs:48:5:48:48 | ...::log | This operation writes $@ to a log file. | test_logging.rs:48:40:48:47 | password | password |
-| test_logging.rs:53:5:53:36 | ...::log | test_logging.rs:53:28:53:35 | password | test_logging.rs:53:5:53:36 | ...::log | This operation writes $@ to a log file. | test_logging.rs:53:28:53:35 | password | password |
-| test_logging.rs:55:5:55:49 | ...::log | test_logging.rs:55:41:55:48 | password | test_logging.rs:55:5:55:49 | ...::log | This operation writes $@ to a log file. | test_logging.rs:55:41:55:48 | password | password |
-| test_logging.rs:57:5:57:47 | ...::log | test_logging.rs:57:39:57:46 | password | test_logging.rs:57:5:57:47 | ...::log | This operation writes $@ to a log file. | test_logging.rs:57:39:57:46 | password | password |
-| test_logging.rs:58:5:58:34 | ...::log | test_logging.rs:58:24:58:31 | password | test_logging.rs:58:5:58:34 | ...::log | This operation writes $@ to a log file. | test_logging.rs:58:24:58:31 | password | password |
-| test_logging.rs:59:5:59:36 | ...::log | test_logging.rs:59:24:59:31 | password | test_logging.rs:59:5:59:36 | ...::log | This operation writes $@ to a log file. | test_logging.rs:59:24:59:31 | password | password |
-| test_logging.rs:61:5:61:54 | ...::log | test_logging.rs:61:46:61:53 | password | test_logging.rs:61:5:61:54 | ...::log | This operation writes $@ to a log file. | test_logging.rs:61:46:61:53 | password | password |
-| test_logging.rs:62:5:62:55 | ...::log | test_logging.rs:62:21:62:28 | password | test_logging.rs:62:5:62:55 | ...::log | This operation writes $@ to a log file. | test_logging.rs:62:21:62:28 | password | password |
-| test_logging.rs:66:5:66:48 | ...::log | test_logging.rs:66:40:66:47 | password | test_logging.rs:66:5:66:48 | ...::log | This operation writes $@ to a log file. | test_logging.rs:66:40:66:47 | password | password |
-| test_logging.rs:68:5:68:66 | ...::log | test_logging.rs:68:58:68:65 | password | test_logging.rs:68:5:68:66 | ...::log | This operation writes $@ to a log file. | test_logging.rs:68:58:68:65 | password | password |
-| test_logging.rs:69:5:69:67 | ...::log | test_logging.rs:69:19:69:26 | password | test_logging.rs:69:5:69:67 | ...::log | This operation writes $@ to a log file. | test_logging.rs:69:19:69:26 | password | password |
-| test_logging.rs:73:5:73:47 | ...::log | test_logging.rs:73:39:73:46 | password | test_logging.rs:73:5:73:47 | ...::log | This operation writes $@ to a log file. | test_logging.rs:73:39:73:46 | password | password |
-| test_logging.rs:75:5:75:65 | ...::log | test_logging.rs:75:57:75:64 | password | test_logging.rs:75:5:75:65 | ...::log | This operation writes $@ to a log file. | test_logging.rs:75:57:75:64 | password | password |
-| test_logging.rs:76:5:76:51 | ...::log | test_logging.rs:76:21:76:28 | password | test_logging.rs:76:5:76:51 | ...::log | This operation writes $@ to a log file. | test_logging.rs:76:21:76:28 | password | password |
-| test_logging.rs:77:5:77:47 | ...::log | test_logging.rs:77:39:77:46 | password | test_logging.rs:77:5:77:47 | ...::log | This operation writes $@ to a log file. | test_logging.rs:77:39:77:46 | password | password |
-| test_logging.rs:83:5:83:44 | ...::log | test_logging.rs:83:36:83:43 | password | test_logging.rs:83:5:83:44 | ...::log | This operation writes $@ to a log file. | test_logging.rs:83:36:83:43 | password | password |
-| test_logging.rs:85:5:85:62 | ...::log | test_logging.rs:85:54:85:61 | password | test_logging.rs:85:5:85:62 | ...::log | This operation writes $@ to a log file. | test_logging.rs:85:54:85:61 | password | password |
-| test_logging.rs:86:5:86:48 | ...::log | test_logging.rs:86:21:86:28 | password | test_logging.rs:86:5:86:48 | ...::log | This operation writes $@ to a log file. | test_logging.rs:86:21:86:28 | password | password |
-| test_logging.rs:87:5:87:44 | ...::log | test_logging.rs:87:36:87:43 | password | test_logging.rs:87:5:87:44 | ...::log | This operation writes $@ to a log file. | test_logging.rs:87:36:87:43 | password | password |
-| test_logging.rs:95:5:95:29 | ...::log | test_logging.rs:94:15:94:22 | password | test_logging.rs:95:5:95:29 | ...::log | This operation writes $@ to a log file. | test_logging.rs:94:15:94:22 | password | password |
-| test_logging.rs:98:5:98:19 | ...::log | test_logging.rs:97:42:97:49 | password | test_logging.rs:98:5:98:19 | ...::log | This operation writes $@ to a log file. | test_logging.rs:97:42:97:49 | password | password |
-| test_logging.rs:101:5:101:19 | ...::log | test_logging.rs:100:38:100:45 | password | test_logging.rs:101:5:101:19 | ...::log | This operation writes $@ to a log file. | test_logging.rs:100:38:100:45 | password | password |
-| test_logging.rs:119:5:119:42 | ...::log | test_logging.rs:119:28:119:41 | get_password(...) | test_logging.rs:119:5:119:42 | ...::log | This operation writes $@ to a log file. | test_logging.rs:119:28:119:41 | get_password(...) | get_password(...) |
-| test_logging.rs:132:5:132:32 | ...::log | test_logging.rs:130:25:130:32 | password | test_logging.rs:132:5:132:32 | ...::log | This operation writes $@ to a log file. | test_logging.rs:130:25:130:32 | password | password |
-| test_logging.rs:139:5:139:38 | ...::log | test_logging.rs:139:27:139:37 | s1.password | test_logging.rs:139:5:139:38 | ...::log | This operation writes $@ to a log file. | test_logging.rs:139:27:139:37 | s1.password | s1.password |
-| test_logging.rs:146:5:146:38 | ...::log | test_logging.rs:146:27:146:37 | s2.password | test_logging.rs:146:5:146:38 | ...::log | This operation writes $@ to a log file. | test_logging.rs:146:27:146:37 | s2.password | s2.password |
-| test_logging.rs:171:22:171:31 | log_expect | test_logging.rs:171:70:171:78 | password2 | test_logging.rs:171:22:171:31 | log_expect | This operation writes $@ to a log file. | test_logging.rs:171:70:171:78 | password2 | password2 |
-| test_logging.rs:175:24:175:33 | log_expect | test_logging.rs:175:72:175:80 | password2 | test_logging.rs:175:24:175:33 | log_expect | This operation writes $@ to a log file. | test_logging.rs:175:72:175:80 | password2 | password2 |
-| test_logging.rs:183:25:183:34 | log_unwrap | test_logging.rs:182:51:182:59 | password2 | test_logging.rs:183:25:183:34 | log_unwrap | This operation writes $@ to a log file. | test_logging.rs:182:51:182:59 | password2 | password2 |
-| test_logging.rs:187:5:187:38 | ...::_print | test_logging.rs:187:30:187:37 | password | test_logging.rs:187:5:187:38 | ...::_print | This operation writes $@ to a log file. | test_logging.rs:187:30:187:37 | password | password |
-| test_logging.rs:188:5:188:38 | ...::_print | test_logging.rs:188:30:188:37 | password | test_logging.rs:188:5:188:38 | ...::_print | This operation writes $@ to a log file. | test_logging.rs:188:30:188:37 | password | password |
-| test_logging.rs:189:5:189:39 | ...::_eprint | test_logging.rs:189:31:189:38 | password | test_logging.rs:189:5:189:39 | ...::_eprint | This operation writes $@ to a log file. | test_logging.rs:189:31:189:38 | password | password |
-| test_logging.rs:190:5:190:39 | ...::_eprint | test_logging.rs:190:31:190:38 | password | test_logging.rs:190:5:190:39 | ...::_eprint | This operation writes $@ to a log file. | test_logging.rs:190:31:190:38 | password | password |
-| test_logging.rs:193:16:193:47 | ...::panic_fmt | test_logging.rs:193:39:193:46 | password | test_logging.rs:193:16:193:47 | ...::panic_fmt | This operation writes $@ to a log file. | test_logging.rs:193:39:193:46 | password | password |
-| test_logging.rs:194:16:194:46 | ...::panic_fmt | test_logging.rs:194:38:194:45 | password | test_logging.rs:194:16:194:46 | ...::panic_fmt | This operation writes $@ to a log file. | test_logging.rs:194:38:194:45 | password | password |
-| test_logging.rs:195:16:195:55 | ...::panic_fmt | test_logging.rs:195:47:195:54 | password | test_logging.rs:195:16:195:55 | ...::panic_fmt | This operation writes $@ to a log file. | test_logging.rs:195:47:195:54 | password | password |
-| test_logging.rs:196:16:196:53 | ...::panic_fmt | test_logging.rs:196:45:196:52 | password | test_logging.rs:196:16:196:53 | ...::panic_fmt | This operation writes $@ to a log file. | test_logging.rs:196:45:196:52 | password | password |
-| test_logging.rs:197:16:197:55 | ...::panic_fmt | test_logging.rs:197:47:197:54 | password | test_logging.rs:197:16:197:55 | ...::panic_fmt | This operation writes $@ to a log file. | test_logging.rs:197:47:197:54 | password | password |
-| test_logging.rs:198:16:198:57 | ...::assert_failed | test_logging.rs:198:49:198:56 | password | test_logging.rs:198:16:198:57 | ...::assert_failed | This operation writes $@ to a log file. | test_logging.rs:198:49:198:56 | password | password |
-| test_logging.rs:199:16:199:57 | ...::assert_failed | test_logging.rs:199:49:199:56 | password | test_logging.rs:199:16:199:57 | ...::assert_failed | This operation writes $@ to a log file. | test_logging.rs:199:49:199:56 | password | password |
-| test_logging.rs:200:16:200:61 | ...::panic_fmt | test_logging.rs:200:53:200:60 | password | test_logging.rs:200:16:200:61 | ...::panic_fmt | This operation writes $@ to a log file. | test_logging.rs:200:53:200:60 | password | password |
-| test_logging.rs:201:16:201:63 | ...::assert_failed | test_logging.rs:201:55:201:62 | password | test_logging.rs:201:16:201:63 | ...::assert_failed | This operation writes $@ to a log file. | test_logging.rs:201:55:201:62 | password | password |
-| test_logging.rs:202:17:202:64 | ...::assert_failed | test_logging.rs:202:56:202:63 | password | test_logging.rs:202:17:202:64 | ...::assert_failed | This operation writes $@ to a log file. | test_logging.rs:202:56:202:63 | password | password |
-| test_logging.rs:203:27:203:32 | expect | test_logging.rs:203:58:203:65 | password | test_logging.rs:203:27:203:32 | expect | This operation writes $@ to a log file. | test_logging.rs:203:58:203:65 | password | password |
-| test_logging.rs:209:30:209:34 | write | test_logging.rs:209:62:209:69 | password | test_logging.rs:209:30:209:34 | write | This operation writes $@ to a log file. | test_logging.rs:209:62:209:69 | password | password |
-| test_logging.rs:210:30:210:38 | write_all | test_logging.rs:210:66:210:73 | password | test_logging.rs:210:30:210:38 | write_all | This operation writes $@ to a log file. | test_logging.rs:210:66:210:73 | password | password |
-| test_logging.rs:213:9:213:13 | write | test_logging.rs:213:41:213:48 | password | test_logging.rs:213:9:213:13 | write | This operation writes $@ to a log file. | test_logging.rs:213:41:213:48 | password | password |
-| test_logging.rs:216:9:216:13 | write | test_logging.rs:216:41:216:48 | password | test_logging.rs:216:9:216:13 | write | This operation writes $@ to a log file. | test_logging.rs:216:41:216:48 | password | password |
+| test_logging.rs:44:5:44:35 | ...::log | test_logging.rs:44:27:44:34 | password | test_logging.rs:44:5:44:35 | ...::log | This operation writes $@ to a log file. | test_logging.rs:44:27:44:34 | password | password |
+| test_logging.rs:45:5:45:36 | ...::log | test_logging.rs:45:28:45:35 | password | test_logging.rs:45:5:45:36 | ...::log | This operation writes $@ to a log file. | test_logging.rs:45:28:45:35 | password | password |
+| test_logging.rs:46:5:46:35 | ...::log | test_logging.rs:46:27:46:34 | password | test_logging.rs:46:5:46:35 | ...::log | This operation writes $@ to a log file. | test_logging.rs:46:27:46:34 | password | password |
+| test_logging.rs:47:5:47:48 | ...::log | test_logging.rs:47:40:47:47 | password | test_logging.rs:47:5:47:48 | ...::log | This operation writes $@ to a log file. | test_logging.rs:47:40:47:47 | password | password |
+| test_logging.rs:52:5:52:36 | ...::log | test_logging.rs:52:28:52:35 | password | test_logging.rs:52:5:52:36 | ...::log | This operation writes $@ to a log file. | test_logging.rs:52:28:52:35 | password | password |
+| test_logging.rs:54:5:54:49 | ...::log | test_logging.rs:54:41:54:48 | password | test_logging.rs:54:5:54:49 | ...::log | This operation writes $@ to a log file. | test_logging.rs:54:41:54:48 | password | password |
+| test_logging.rs:56:5:56:47 | ...::log | test_logging.rs:56:39:56:46 | password | test_logging.rs:56:5:56:47 | ...::log | This operation writes $@ to a log file. | test_logging.rs:56:39:56:46 | password | password |
+| test_logging.rs:57:5:57:34 | ...::log | test_logging.rs:57:24:57:31 | password | test_logging.rs:57:5:57:34 | ...::log | This operation writes $@ to a log file. | test_logging.rs:57:24:57:31 | password | password |
+| test_logging.rs:58:5:58:36 | ...::log | test_logging.rs:58:24:58:31 | password | test_logging.rs:58:5:58:36 | ...::log | This operation writes $@ to a log file. | test_logging.rs:58:24:58:31 | password | password |
+| test_logging.rs:60:5:60:54 | ...::log | test_logging.rs:60:46:60:53 | password | test_logging.rs:60:5:60:54 | ...::log | This operation writes $@ to a log file. | test_logging.rs:60:46:60:53 | password | password |
+| test_logging.rs:61:5:61:55 | ...::log | test_logging.rs:61:21:61:28 | password | test_logging.rs:61:5:61:55 | ...::log | This operation writes $@ to a log file. | test_logging.rs:61:21:61:28 | password | password |
+| test_logging.rs:65:5:65:48 | ...::log | test_logging.rs:65:40:65:47 | password | test_logging.rs:65:5:65:48 | ...::log | This operation writes $@ to a log file. | test_logging.rs:65:40:65:47 | password | password |
+| test_logging.rs:67:5:67:66 | ...::log | test_logging.rs:67:58:67:65 | password | test_logging.rs:67:5:67:66 | ...::log | This operation writes $@ to a log file. | test_logging.rs:67:58:67:65 | password | password |
+| test_logging.rs:68:5:68:67 | ...::log | test_logging.rs:68:19:68:26 | password | test_logging.rs:68:5:68:67 | ...::log | This operation writes $@ to a log file. | test_logging.rs:68:19:68:26 | password | password |
+| test_logging.rs:72:5:72:47 | ...::log | test_logging.rs:72:39:72:46 | password | test_logging.rs:72:5:72:47 | ...::log | This operation writes $@ to a log file. | test_logging.rs:72:39:72:46 | password | password |
+| test_logging.rs:74:5:74:65 | ...::log | test_logging.rs:74:57:74:64 | password | test_logging.rs:74:5:74:65 | ...::log | This operation writes $@ to a log file. | test_logging.rs:74:57:74:64 | password | password |
+| test_logging.rs:75:5:75:51 | ...::log | test_logging.rs:75:21:75:28 | password | test_logging.rs:75:5:75:51 | ...::log | This operation writes $@ to a log file. | test_logging.rs:75:21:75:28 | password | password |
+| test_logging.rs:76:5:76:47 | ...::log | test_logging.rs:76:39:76:46 | password | test_logging.rs:76:5:76:47 | ...::log | This operation writes $@ to a log file. | test_logging.rs:76:39:76:46 | password | password |
+| test_logging.rs:82:5:82:44 | ...::log | test_logging.rs:82:36:82:43 | password | test_logging.rs:82:5:82:44 | ...::log | This operation writes $@ to a log file. | test_logging.rs:82:36:82:43 | password | password |
+| test_logging.rs:84:5:84:62 | ...::log | test_logging.rs:84:54:84:61 | password | test_logging.rs:84:5:84:62 | ...::log | This operation writes $@ to a log file. | test_logging.rs:84:54:84:61 | password | password |
+| test_logging.rs:85:5:85:48 | ...::log | test_logging.rs:85:21:85:28 | password | test_logging.rs:85:5:85:48 | ...::log | This operation writes $@ to a log file. | test_logging.rs:85:21:85:28 | password | password |
+| test_logging.rs:86:5:86:44 | ...::log | test_logging.rs:86:36:86:43 | password | test_logging.rs:86:5:86:44 | ...::log | This operation writes $@ to a log file. | test_logging.rs:86:36:86:43 | password | password |
+| test_logging.rs:94:5:94:29 | ...::log | test_logging.rs:93:15:93:22 | password | test_logging.rs:94:5:94:29 | ...::log | This operation writes $@ to a log file. | test_logging.rs:93:15:93:22 | password | password |
+| test_logging.rs:97:5:97:19 | ...::log | test_logging.rs:96:42:96:49 | password | test_logging.rs:97:5:97:19 | ...::log | This operation writes $@ to a log file. | test_logging.rs:96:42:96:49 | password | password |
+| test_logging.rs:100:5:100:19 | ...::log | test_logging.rs:99:38:99:45 | password | test_logging.rs:100:5:100:19 | ...::log | This operation writes $@ to a log file. | test_logging.rs:99:38:99:45 | password | password |
+| test_logging.rs:118:5:118:42 | ...::log | test_logging.rs:118:28:118:41 | get_password(...) | test_logging.rs:118:5:118:42 | ...::log | This operation writes $@ to a log file. | test_logging.rs:118:28:118:41 | get_password(...) | get_password(...) |
+| test_logging.rs:131:5:131:32 | ...::log | test_logging.rs:129:25:129:32 | password | test_logging.rs:131:5:131:32 | ...::log | This operation writes $@ to a log file. | test_logging.rs:129:25:129:32 | password | password |
+| test_logging.rs:141:5:141:38 | ...::log | test_logging.rs:141:27:141:37 | s1.password | test_logging.rs:141:5:141:38 | ...::log | This operation writes $@ to a log file. | test_logging.rs:141:27:141:37 | s1.password | s1.password |
+| test_logging.rs:151:5:151:38 | ...::log | test_logging.rs:151:27:151:37 | s2.password | test_logging.rs:151:5:151:38 | ...::log | This operation writes $@ to a log file. | test_logging.rs:151:27:151:37 | s2.password | s2.password |
+| test_logging.rs:176:22:176:31 | log_expect | test_logging.rs:176:70:176:78 | password2 | test_logging.rs:176:22:176:31 | log_expect | This operation writes $@ to a log file. | test_logging.rs:176:70:176:78 | password2 | password2 |
+| test_logging.rs:180:24:180:33 | log_expect | test_logging.rs:180:72:180:80 | password2 | test_logging.rs:180:24:180:33 | log_expect | This operation writes $@ to a log file. | test_logging.rs:180:72:180:80 | password2 | password2 |
+| test_logging.rs:184:25:184:34 | log_expect | test_logging.rs:183:51:183:59 | password2 | test_logging.rs:184:25:184:34 | log_expect | This operation writes $@ to a log file. | test_logging.rs:183:51:183:59 | password2 | password2 |
+| test_logging.rs:188:25:188:34 | log_unwrap | test_logging.rs:187:51:187:59 | password2 | test_logging.rs:188:25:188:34 | log_unwrap | This operation writes $@ to a log file. | test_logging.rs:187:51:187:59 | password2 | password2 |
+| test_logging.rs:192:5:192:38 | ...::_print | test_logging.rs:192:30:192:37 | password | test_logging.rs:192:5:192:38 | ...::_print | This operation writes $@ to a log file. | test_logging.rs:192:30:192:37 | password | password |
+| test_logging.rs:193:5:193:38 | ...::_print | test_logging.rs:193:30:193:37 | password | test_logging.rs:193:5:193:38 | ...::_print | This operation writes $@ to a log file. | test_logging.rs:193:30:193:37 | password | password |
+| test_logging.rs:194:5:194:39 | ...::_eprint | test_logging.rs:194:31:194:38 | password | test_logging.rs:194:5:194:39 | ...::_eprint | This operation writes $@ to a log file. | test_logging.rs:194:31:194:38 | password | password |
+| test_logging.rs:195:5:195:39 | ...::_eprint | test_logging.rs:195:31:195:38 | password | test_logging.rs:195:5:195:39 | ...::_eprint | This operation writes $@ to a log file. | test_logging.rs:195:31:195:38 | password | password |
+| test_logging.rs:199:13:199:44 | ...::panic_fmt | test_logging.rs:199:36:199:43 | password | test_logging.rs:199:13:199:44 | ...::panic_fmt | This operation writes $@ to a log file. | test_logging.rs:199:36:199:43 | password | password |
+| test_logging.rs:202:13:202:43 | ...::panic_fmt | test_logging.rs:202:35:202:42 | password | test_logging.rs:202:13:202:43 | ...::panic_fmt | This operation writes $@ to a log file. | test_logging.rs:202:35:202:42 | password | password |
+| test_logging.rs:205:13:205:52 | ...::panic_fmt | test_logging.rs:205:44:205:51 | password | test_logging.rs:205:13:205:52 | ...::panic_fmt | This operation writes $@ to a log file. | test_logging.rs:205:44:205:51 | password | password |
+| test_logging.rs:208:13:208:50 | ...::panic_fmt | test_logging.rs:208:42:208:49 | password | test_logging.rs:208:13:208:50 | ...::panic_fmt | This operation writes $@ to a log file. | test_logging.rs:208:42:208:49 | password | password |
+| test_logging.rs:211:13:211:52 | ...::panic_fmt | test_logging.rs:211:44:211:51 | password | test_logging.rs:211:13:211:52 | ...::panic_fmt | This operation writes $@ to a log file. | test_logging.rs:211:44:211:51 | password | password |
+| test_logging.rs:214:13:214:54 | ...::assert_failed | test_logging.rs:214:46:214:53 | password | test_logging.rs:214:13:214:54 | ...::assert_failed | This operation writes $@ to a log file. | test_logging.rs:214:46:214:53 | password | password |
+| test_logging.rs:217:13:217:54 | ...::assert_failed | test_logging.rs:217:46:217:53 | password | test_logging.rs:217:13:217:54 | ...::assert_failed | This operation writes $@ to a log file. | test_logging.rs:217:46:217:53 | password | password |
+| test_logging.rs:220:13:220:58 | ...::panic_fmt | test_logging.rs:220:50:220:57 | password | test_logging.rs:220:13:220:58 | ...::panic_fmt | This operation writes $@ to a log file. | test_logging.rs:220:50:220:57 | password | password |
+| test_logging.rs:223:13:223:60 | ...::assert_failed | test_logging.rs:223:52:223:59 | password | test_logging.rs:223:13:223:60 | ...::assert_failed | This operation writes $@ to a log file. | test_logging.rs:223:52:223:59 | password | password |
+| test_logging.rs:226:13:226:60 | ...::assert_failed | test_logging.rs:226:52:226:59 | password | test_logging.rs:226:13:226:60 | ...::assert_failed | This operation writes $@ to a log file. | test_logging.rs:226:52:226:59 | password | password |
+| test_logging.rs:229:23:229:28 | expect | test_logging.rs:229:54:229:61 | password | test_logging.rs:229:23:229:28 | expect | This operation writes $@ to a log file. | test_logging.rs:229:54:229:61 | password | password |
+| test_logging.rs:229:23:229:28 | expect | test_logging.rs:229:54:229:61 | password | test_logging.rs:229:23:229:28 | expect | This operation writes $@ to a log file. | test_logging.rs:229:54:229:61 | password | password |
+| test_logging.rs:242:10:242:14 | write | test_logging.rs:242:42:242:49 | password | test_logging.rs:242:10:242:14 | write | This operation writes $@ to a log file. | test_logging.rs:242:42:242:49 | password | password |
+| test_logging.rs:245:10:245:18 | write_all | test_logging.rs:245:46:245:53 | password | test_logging.rs:245:10:245:18 | write_all | This operation writes $@ to a log file. | test_logging.rs:245:46:245:53 | password | password |
+| test_logging.rs:248:9:248:13 | write | test_logging.rs:248:41:248:48 | password | test_logging.rs:248:9:248:13 | write | This operation writes $@ to a log file. | test_logging.rs:248:41:248:48 | password | password |
+| test_logging.rs:251:9:251:13 | write | test_logging.rs:251:41:251:48 | password | test_logging.rs:251:9:251:13 | write | This operation writes $@ to a log file. | test_logging.rs:251:41:251:48 | password | password |
 edges
-| test_logging.rs:43:12:43:35 | MacroExpr | test_logging.rs:43:5:43:36 | ...::log | provenance | MaD:12 Sink:MaD:12 |
+| test_logging.rs:42:12:42:35 | MacroExpr | test_logging.rs:42:5:42:36 | ...::log | provenance | MaD:14 Sink:MaD:14 |
+| test_logging.rs:42:28:42:35 | password | test_logging.rs:42:12:42:35 | MacroExpr | provenance |  |
+| test_logging.rs:43:12:43:35 | MacroExpr | test_logging.rs:43:5:43:36 | ...::log | provenance | MaD:14 Sink:MaD:14 |
 | test_logging.rs:43:28:43:35 | password | test_logging.rs:43:12:43:35 | MacroExpr | provenance |  |
-| test_logging.rs:44:12:44:35 | MacroExpr | test_logging.rs:44:5:44:36 | ...::log | provenance | MaD:12 Sink:MaD:12 |
-| test_logging.rs:44:28:44:35 | password | test_logging.rs:44:12:44:35 | MacroExpr | provenance |  |
-| test_logging.rs:45:11:45:34 | MacroExpr | test_logging.rs:45:5:45:35 | ...::log | provenance | MaD:12 Sink:MaD:12 |
-| test_logging.rs:45:27:45:34 | password | test_logging.rs:45:11:45:34 | MacroExpr | provenance |  |
-| test_logging.rs:46:12:46:35 | MacroExpr | test_logging.rs:46:5:46:36 | ...::log | provenance | MaD:12 Sink:MaD:12 |
-| test_logging.rs:46:28:46:35 | password | test_logging.rs:46:12:46:35 | MacroExpr | provenance |  |
-| test_logging.rs:47:11:47:34 | MacroExpr | test_logging.rs:47:5:47:35 | ...::log | provenance | MaD:12 Sink:MaD:12 |
-| test_logging.rs:47:27:47:34 | password | test_logging.rs:47:11:47:34 | MacroExpr | provenance |  |
-| test_logging.rs:48:24:48:47 | MacroExpr | test_logging.rs:48:5:48:48 | ...::log | provenance | MaD:12 Sink:MaD:12 |
-| test_logging.rs:48:40:48:47 | password | test_logging.rs:48:24:48:47 | MacroExpr | provenance |  |
-| test_logging.rs:53:12:53:35 | MacroExpr | test_logging.rs:53:5:53:36 | ...::log | provenance | MaD:12 Sink:MaD:12 |
-| test_logging.rs:53:28:53:35 | password | test_logging.rs:53:12:53:35 | MacroExpr | provenance |  |
-| test_logging.rs:55:12:55:48 | MacroExpr | test_logging.rs:55:5:55:49 | ...::log | provenance | MaD:12 Sink:MaD:12 |
-| test_logging.rs:55:41:55:48 | password | test_logging.rs:55:12:55:48 | MacroExpr | provenance |  |
-| test_logging.rs:57:12:57:46 | MacroExpr | test_logging.rs:57:5:57:47 | ...::log | provenance | MaD:12 Sink:MaD:12 |
-| test_logging.rs:57:39:57:46 | password | test_logging.rs:57:12:57:46 | MacroExpr | provenance |  |
-| test_logging.rs:58:12:58:33 | MacroExpr | test_logging.rs:58:5:58:34 | ...::log | provenance | MaD:12 Sink:MaD:12 |
-| test_logging.rs:58:24:58:31 | password | test_logging.rs:58:12:58:33 | MacroExpr | provenance |  |
-| test_logging.rs:59:12:59:35 | MacroExpr | test_logging.rs:59:5:59:36 | ...::log | provenance | MaD:12 Sink:MaD:12 |
-| test_logging.rs:59:24:59:31 | password | test_logging.rs:59:12:59:35 | MacroExpr | provenance |  |
-| test_logging.rs:61:30:61:53 | MacroExpr | test_logging.rs:61:5:61:54 | ...::log | provenance | MaD:12 Sink:MaD:12 |
-| test_logging.rs:61:46:61:53 | password | test_logging.rs:61:30:61:53 | MacroExpr | provenance |  |
-| test_logging.rs:62:20:62:28 | &... [&ref, tuple.0, &ref] | test_logging.rs:62:5:62:55 | ...::log | provenance | MaD:13 Sink:MaD:13 Sink:MaD:13 |
-| test_logging.rs:62:20:62:28 | &... [&ref, tuple.0, &ref] | test_logging.rs:62:5:62:55 | ...::log | provenance | MaD:13 Sink:MaD:13 Sink:MaD:13 Sink:MaD:13 |
-| test_logging.rs:62:20:62:28 | &... [&ref, tuple.0] | test_logging.rs:62:5:62:55 | ...::log | provenance | MaD:13 Sink:MaD:13 Sink:MaD:13 |
-| test_logging.rs:62:20:62:28 | &password | test_logging.rs:62:20:62:28 | TupleExpr [tuple.0] | provenance |  |
-| test_logging.rs:62:20:62:28 | &password [&ref] | test_logging.rs:62:20:62:28 | TupleExpr [tuple.0, &ref] | provenance |  |
-| test_logging.rs:62:20:62:28 | TupleExpr [tuple.0, &ref] | test_logging.rs:62:20:62:28 | &... [&ref, tuple.0, &ref] | provenance |  |
-| test_logging.rs:62:20:62:28 | TupleExpr [tuple.0] | test_logging.rs:62:20:62:28 | &... [&ref, tuple.0] | provenance |  |
-| test_logging.rs:62:21:62:28 | password | test_logging.rs:62:20:62:28 | &password | provenance | Config |
-| test_logging.rs:62:21:62:28 | password | test_logging.rs:62:20:62:28 | &password [&ref] | provenance |  |
-| test_logging.rs:66:24:66:47 | MacroExpr | test_logging.rs:66:5:66:48 | ...::log | provenance | MaD:12 Sink:MaD:12 |
-| test_logging.rs:66:40:66:47 | password | test_logging.rs:66:24:66:47 | MacroExpr | provenance |  |
-| test_logging.rs:68:42:68:65 | MacroExpr | test_logging.rs:68:5:68:66 | ...::log | provenance | MaD:12 Sink:MaD:12 |
-| test_logging.rs:68:58:68:65 | password | test_logging.rs:68:42:68:65 | MacroExpr | provenance |  |
-| test_logging.rs:69:18:69:26 | &... [&ref, tuple.0, &ref] | test_logging.rs:69:5:69:67 | ...::log | provenance | MaD:13 Sink:MaD:13 Sink:MaD:13 |
-| test_logging.rs:69:18:69:26 | &... [&ref, tuple.0, &ref] | test_logging.rs:69:5:69:67 | ...::log | provenance | MaD:13 Sink:MaD:13 Sink:MaD:13 Sink:MaD:13 |
-| test_logging.rs:69:18:69:26 | &... [&ref, tuple.0] | test_logging.rs:69:5:69:67 | ...::log | provenance | MaD:13 Sink:MaD:13 Sink:MaD:13 |
-| test_logging.rs:69:18:69:26 | &password | test_logging.rs:69:18:69:26 | TupleExpr [tuple.0] | provenance |  |
-| test_logging.rs:69:18:69:26 | &password [&ref] | test_logging.rs:69:18:69:26 | TupleExpr [tuple.0, &ref] | provenance |  |
-| test_logging.rs:69:18:69:26 | TupleExpr [tuple.0, &ref] | test_logging.rs:69:18:69:26 | &... [&ref, tuple.0, &ref] | provenance |  |
-| test_logging.rs:69:18:69:26 | TupleExpr [tuple.0] | test_logging.rs:69:18:69:26 | &... [&ref, tuple.0] | provenance |  |
-| test_logging.rs:69:19:69:26 | password | test_logging.rs:69:18:69:26 | &password | provenance | Config |
-| test_logging.rs:69:19:69:26 | password | test_logging.rs:69:18:69:26 | &password [&ref] | provenance |  |
-| test_logging.rs:73:23:73:46 | MacroExpr | test_logging.rs:73:5:73:47 | ...::log | provenance | MaD:12 Sink:MaD:12 |
-| test_logging.rs:73:39:73:46 | password | test_logging.rs:73:23:73:46 | MacroExpr | provenance |  |
-| test_logging.rs:75:41:75:64 | MacroExpr | test_logging.rs:75:5:75:65 | ...::log | provenance | MaD:12 Sink:MaD:12 |
-| test_logging.rs:75:57:75:64 | password | test_logging.rs:75:41:75:64 | MacroExpr | provenance |  |
-| test_logging.rs:76:20:76:28 | &... [&ref, tuple.0, &ref] | test_logging.rs:76:5:76:51 | ...::log | provenance | MaD:13 Sink:MaD:13 Sink:MaD:13 |
-| test_logging.rs:76:20:76:28 | &... [&ref, tuple.0, &ref] | test_logging.rs:76:5:76:51 | ...::log | provenance | MaD:13 Sink:MaD:13 Sink:MaD:13 Sink:MaD:13 |
-| test_logging.rs:76:20:76:28 | &... [&ref, tuple.0] | test_logging.rs:76:5:76:51 | ...::log | provenance | MaD:13 Sink:MaD:13 Sink:MaD:13 |
-| test_logging.rs:76:20:76:28 | &password | test_logging.rs:76:20:76:28 | TupleExpr [tuple.0] | provenance |  |
-| test_logging.rs:76:20:76:28 | &password [&ref] | test_logging.rs:76:20:76:28 | TupleExpr [tuple.0, &ref] | provenance |  |
-| test_logging.rs:76:20:76:28 | TupleExpr [tuple.0, &ref] | test_logging.rs:76:20:76:28 | &... [&ref, tuple.0, &ref] | provenance |  |
-| test_logging.rs:76:20:76:28 | TupleExpr [tuple.0] | test_logging.rs:76:20:76:28 | &... [&ref, tuple.0] | provenance |  |
-| test_logging.rs:76:21:76:28 | password | test_logging.rs:76:20:76:28 | &password | provenance | Config |
-| test_logging.rs:76:21:76:28 | password | test_logging.rs:76:20:76:28 | &password [&ref] | provenance |  |
-| test_logging.rs:77:23:77:46 | MacroExpr | test_logging.rs:77:5:77:47 | ...::log | provenance | MaD:12 Sink:MaD:12 |
-| test_logging.rs:77:39:77:46 | password | test_logging.rs:77:23:77:46 | MacroExpr | provenance |  |
-| test_logging.rs:83:20:83:43 | MacroExpr | test_logging.rs:83:5:83:44 | ...::log | provenance | MaD:12 Sink:MaD:12 |
-| test_logging.rs:83:36:83:43 | password | test_logging.rs:83:20:83:43 | MacroExpr | provenance |  |
-| test_logging.rs:85:38:85:61 | MacroExpr | test_logging.rs:85:5:85:62 | ...::log | provenance | MaD:12 Sink:MaD:12 |
-| test_logging.rs:85:54:85:61 | password | test_logging.rs:85:38:85:61 | MacroExpr | provenance |  |
-| test_logging.rs:86:20:86:28 | &... [&ref, tuple.0, &ref] | test_logging.rs:86:5:86:48 | ...::log | provenance | MaD:13 Sink:MaD:13 Sink:MaD:13 |
-| test_logging.rs:86:20:86:28 | &... [&ref, tuple.0, &ref] | test_logging.rs:86:5:86:48 | ...::log | provenance | MaD:13 Sink:MaD:13 Sink:MaD:13 Sink:MaD:13 |
-| test_logging.rs:86:20:86:28 | &... [&ref, tuple.0] | test_logging.rs:86:5:86:48 | ...::log | provenance | MaD:13 Sink:MaD:13 Sink:MaD:13 |
-| test_logging.rs:86:20:86:28 | &password | test_logging.rs:86:20:86:28 | TupleExpr [tuple.0] | provenance |  |
-| test_logging.rs:86:20:86:28 | &password [&ref] | test_logging.rs:86:20:86:28 | TupleExpr [tuple.0, &ref] | provenance |  |
-| test_logging.rs:86:20:86:28 | TupleExpr [tuple.0, &ref] | test_logging.rs:86:20:86:28 | &... [&ref, tuple.0, &ref] | provenance |  |
-| test_logging.rs:86:20:86:28 | TupleExpr [tuple.0] | test_logging.rs:86:20:86:28 | &... [&ref, tuple.0] | provenance |  |
-| test_logging.rs:86:21:86:28 | password | test_logging.rs:86:20:86:28 | &password | provenance | Config |
-| test_logging.rs:86:21:86:28 | password | test_logging.rs:86:20:86:28 | &password [&ref] | provenance |  |
-| test_logging.rs:87:20:87:43 | MacroExpr | test_logging.rs:87:5:87:44 | ...::log | provenance | MaD:12 Sink:MaD:12 |
-| test_logging.rs:87:36:87:43 | password | test_logging.rs:87:20:87:43 | MacroExpr | provenance |  |
-| test_logging.rs:94:9:94:10 | m1 | test_logging.rs:95:11:95:28 | MacroExpr | provenance |  |
-| test_logging.rs:94:14:94:22 | &password | test_logging.rs:94:9:94:10 | m1 | provenance |  |
-| test_logging.rs:94:15:94:22 | password | test_logging.rs:94:14:94:22 | &password | provenance | Config |
-| test_logging.rs:95:11:95:28 | MacroExpr | test_logging.rs:95:5:95:29 | ...::log | provenance | MaD:12 Sink:MaD:12 |
-| test_logging.rs:97:9:97:10 | m2 | test_logging.rs:98:11:98:18 | MacroExpr | provenance |  |
-| test_logging.rs:97:41:97:49 | &password | test_logging.rs:97:9:97:10 | m2 | provenance |  |
-| test_logging.rs:97:42:97:49 | password | test_logging.rs:97:41:97:49 | &password | provenance | Config |
-| test_logging.rs:98:11:98:18 | MacroExpr | test_logging.rs:98:5:98:19 | ...::log | provenance | MaD:12 Sink:MaD:12 |
-| test_logging.rs:100:9:100:10 | m3 | test_logging.rs:101:11:101:18 | MacroExpr | provenance |  |
-| test_logging.rs:100:14:100:46 | res | test_logging.rs:100:22:100:45 | { ... } | provenance |  |
-| test_logging.rs:100:22:100:45 | ...::format(...) | test_logging.rs:100:14:100:46 | res | provenance |  |
-| test_logging.rs:100:22:100:45 | ...::must_use(...) | test_logging.rs:100:9:100:10 | m3 | provenance |  |
-| test_logging.rs:100:22:100:45 | MacroExpr | test_logging.rs:100:22:100:45 | ...::format(...) | provenance | MaD:16 |
-| test_logging.rs:100:22:100:45 | { ... } | test_logging.rs:100:22:100:45 | ...::must_use(...) | provenance | MaD:17 |
-| test_logging.rs:100:38:100:45 | password | test_logging.rs:100:22:100:45 | MacroExpr | provenance |  |
-| test_logging.rs:101:11:101:18 | MacroExpr | test_logging.rs:101:5:101:19 | ...::log | provenance | MaD:12 Sink:MaD:12 |
-| test_logging.rs:119:12:119:41 | MacroExpr | test_logging.rs:119:5:119:42 | ...::log | provenance | MaD:12 Sink:MaD:12 |
-| test_logging.rs:119:28:119:41 | get_password(...) | test_logging.rs:119:12:119:41 | MacroExpr | provenance |  |
-| test_logging.rs:130:9:130:10 | t1 [tuple.1] | test_logging.rs:132:28:132:29 | t1 [tuple.1] | provenance |  |
-| test_logging.rs:130:14:130:33 | TupleExpr [tuple.1] | test_logging.rs:130:9:130:10 | t1 [tuple.1] | provenance |  |
-| test_logging.rs:130:25:130:32 | password | test_logging.rs:130:14:130:33 | TupleExpr [tuple.1] | provenance |  |
-| test_logging.rs:132:12:132:31 | MacroExpr | test_logging.rs:132:5:132:32 | ...::log | provenance | MaD:12 Sink:MaD:12 |
-| test_logging.rs:132:28:132:29 | t1 [tuple.1] | test_logging.rs:132:28:132:31 | t1.1 | provenance |  |
-| test_logging.rs:132:28:132:31 | t1.1 | test_logging.rs:132:12:132:31 | MacroExpr | provenance |  |
-| test_logging.rs:139:11:139:37 | MacroExpr | test_logging.rs:139:5:139:38 | ...::log | provenance | MaD:12 Sink:MaD:12 |
-| test_logging.rs:139:27:139:37 | s1.password | test_logging.rs:139:11:139:37 | MacroExpr | provenance |  |
-| test_logging.rs:146:11:146:37 | MacroExpr | test_logging.rs:146:5:146:38 | ...::log | provenance | MaD:12 Sink:MaD:12 |
-| test_logging.rs:146:27:146:37 | s2.password | test_logging.rs:146:11:146:37 | MacroExpr | provenance |  |
-| test_logging.rs:171:33:171:79 | &... | test_logging.rs:171:22:171:31 | log_expect | provenance | MaD:9 Sink:MaD:9 |
-| test_logging.rs:171:33:171:79 | &... [&ref] | test_logging.rs:171:22:171:31 | log_expect | provenance | MaD:9 Sink:MaD:9 |
-| test_logging.rs:171:34:171:79 | MacroExpr | test_logging.rs:171:33:171:79 | &... | provenance | Config |
-| test_logging.rs:171:34:171:79 | MacroExpr | test_logging.rs:171:33:171:79 | &... [&ref] | provenance |  |
-| test_logging.rs:171:34:171:79 | res | test_logging.rs:171:42:171:78 | { ... } | provenance |  |
-| test_logging.rs:171:42:171:78 | ...::format(...) | test_logging.rs:171:34:171:79 | res | provenance |  |
-| test_logging.rs:171:42:171:78 | ...::must_use(...) | test_logging.rs:171:34:171:79 | MacroExpr | provenance |  |
-| test_logging.rs:171:42:171:78 | MacroExpr | test_logging.rs:171:42:171:78 | ...::format(...) | provenance | MaD:16 |
-| test_logging.rs:171:42:171:78 | { ... } | test_logging.rs:171:42:171:78 | ...::must_use(...) | provenance | MaD:17 |
-| test_logging.rs:171:70:171:78 | password2 | test_logging.rs:171:42:171:78 | MacroExpr | provenance |  |
-| test_logging.rs:175:35:175:81 | &... | test_logging.rs:175:24:175:33 | log_expect | provenance | MaD:10 Sink:MaD:10 |
-| test_logging.rs:175:35:175:81 | &... [&ref] | test_logging.rs:175:24:175:33 | log_expect | provenance | MaD:10 Sink:MaD:10 |
-| test_logging.rs:175:36:175:81 | MacroExpr | test_logging.rs:175:35:175:81 | &... | provenance | Config |
-| test_logging.rs:175:36:175:81 | MacroExpr | test_logging.rs:175:35:175:81 | &... [&ref] | provenance |  |
-| test_logging.rs:175:36:175:81 | res | test_logging.rs:175:44:175:80 | { ... } | provenance |  |
-| test_logging.rs:175:44:175:80 | ...::format(...) | test_logging.rs:175:36:175:81 | res | provenance |  |
-| test_logging.rs:175:44:175:80 | ...::must_use(...) | test_logging.rs:175:36:175:81 | MacroExpr | provenance |  |
-| test_logging.rs:175:44:175:80 | MacroExpr | test_logging.rs:175:44:175:80 | ...::format(...) | provenance | MaD:16 |
-| test_logging.rs:175:44:175:80 | { ... } | test_logging.rs:175:44:175:80 | ...::must_use(...) | provenance | MaD:17 |
-| test_logging.rs:175:72:175:80 | password2 | test_logging.rs:175:44:175:80 | MacroExpr | provenance |  |
-| test_logging.rs:182:9:182:19 | err_result3 [Err] | test_logging.rs:183:13:183:23 | err_result3 [Err] | provenance |  |
-| test_logging.rs:182:47:182:60 | Err(...) [Err] | test_logging.rs:182:9:182:19 | err_result3 [Err] | provenance |  |
-| test_logging.rs:182:51:182:59 | password2 | test_logging.rs:182:47:182:60 | Err(...) [Err] | provenance |  |
-| test_logging.rs:183:13:183:23 | err_result3 [Err] | test_logging.rs:183:25:183:34 | log_unwrap | provenance | MaD:11 Sink:MaD:11 |
-| test_logging.rs:187:12:187:37 | MacroExpr | test_logging.rs:187:5:187:38 | ...::_print | provenance | MaD:8 Sink:MaD:8 |
-| test_logging.rs:187:30:187:37 | password | test_logging.rs:187:12:187:37 | MacroExpr | provenance |  |
-| test_logging.rs:188:14:188:37 | MacroExpr | test_logging.rs:188:5:188:38 | ...::_print | provenance | MaD:8 Sink:MaD:8 |
-| test_logging.rs:188:30:188:37 | password | test_logging.rs:188:14:188:37 | MacroExpr | provenance |  |
-| test_logging.rs:189:13:189:38 | MacroExpr | test_logging.rs:189:5:189:39 | ...::_eprint | provenance | MaD:7 Sink:MaD:7 |
-| test_logging.rs:189:31:189:38 | password | test_logging.rs:189:13:189:38 | MacroExpr | provenance |  |
-| test_logging.rs:190:15:190:38 | MacroExpr | test_logging.rs:190:5:190:39 | ...::_eprint | provenance | MaD:7 Sink:MaD:7 |
-| test_logging.rs:190:31:190:38 | password | test_logging.rs:190:15:190:38 | MacroExpr | provenance |  |
-| test_logging.rs:193:23:193:46 | MacroExpr | test_logging.rs:193:16:193:47 | ...::panic_fmt | provenance | MaD:3 Sink:MaD:3 |
-| test_logging.rs:193:39:193:46 | password | test_logging.rs:193:23:193:46 | MacroExpr | provenance |  |
-| test_logging.rs:194:22:194:45 | MacroExpr | test_logging.rs:194:16:194:46 | ...::panic_fmt | provenance | MaD:3 Sink:MaD:3 |
-| test_logging.rs:194:38:194:45 | password | test_logging.rs:194:22:194:45 | MacroExpr | provenance |  |
-| test_logging.rs:195:31:195:54 | MacroExpr | test_logging.rs:195:16:195:55 | ...::panic_fmt | provenance | MaD:3 Sink:MaD:3 |
-| test_logging.rs:195:47:195:54 | password | test_logging.rs:195:31:195:54 | MacroExpr | provenance |  |
-| test_logging.rs:196:29:196:52 | MacroExpr | test_logging.rs:196:16:196:53 | ...::panic_fmt | provenance | MaD:3 Sink:MaD:3 |
-| test_logging.rs:196:45:196:52 | password | test_logging.rs:196:29:196:52 | MacroExpr | provenance |  |
-| test_logging.rs:197:31:197:54 | MacroExpr | test_logging.rs:197:16:197:55 | ...::panic_fmt | provenance | MaD:3 Sink:MaD:3 |
-| test_logging.rs:197:47:197:54 | password | test_logging.rs:197:31:197:54 | MacroExpr | provenance |  |
-| test_logging.rs:198:33:198:56 | ...::Some(...) [Some] | test_logging.rs:198:16:198:57 | ...::assert_failed | provenance | MaD:2 Sink:MaD:2 |
-| test_logging.rs:198:33:198:56 | MacroExpr | test_logging.rs:198:33:198:56 | ...::Some(...) [Some] | provenance |  |
-| test_logging.rs:198:49:198:56 | password | test_logging.rs:198:33:198:56 | MacroExpr | provenance |  |
-| test_logging.rs:199:33:199:56 | ...::Some(...) [Some] | test_logging.rs:199:16:199:57 | ...::assert_failed | provenance | MaD:2 Sink:MaD:2 |
-| test_logging.rs:199:33:199:56 | MacroExpr | test_logging.rs:199:33:199:56 | ...::Some(...) [Some] | provenance |  |
-| test_logging.rs:199:49:199:56 | password | test_logging.rs:199:33:199:56 | MacroExpr | provenance |  |
-| test_logging.rs:200:37:200:60 | MacroExpr | test_logging.rs:200:16:200:61 | ...::panic_fmt | provenance | MaD:3 Sink:MaD:3 |
-| test_logging.rs:200:53:200:60 | password | test_logging.rs:200:37:200:60 | MacroExpr | provenance |  |
-| test_logging.rs:201:39:201:62 | ...::Some(...) [Some] | test_logging.rs:201:16:201:63 | ...::assert_failed | provenance | MaD:2 Sink:MaD:2 |
-| test_logging.rs:201:39:201:62 | MacroExpr | test_logging.rs:201:39:201:62 | ...::Some(...) [Some] | provenance |  |
-| test_logging.rs:201:55:201:62 | password | test_logging.rs:201:39:201:62 | MacroExpr | provenance |  |
-| test_logging.rs:202:40:202:63 | ...::Some(...) [Some] | test_logging.rs:202:17:202:64 | ...::assert_failed | provenance | MaD:2 Sink:MaD:2 |
-| test_logging.rs:202:40:202:63 | MacroExpr | test_logging.rs:202:40:202:63 | ...::Some(...) [Some] | provenance |  |
-| test_logging.rs:202:56:202:63 | password | test_logging.rs:202:40:202:63 | MacroExpr | provenance |  |
-| test_logging.rs:203:34:203:66 | res | test_logging.rs:203:42:203:65 | { ... } | provenance |  |
-| test_logging.rs:203:34:203:75 | ... .as_str() | test_logging.rs:203:27:203:32 | expect | provenance | MaD:1 Sink:MaD:1 |
-| test_logging.rs:203:42:203:65 | ...::format(...) | test_logging.rs:203:34:203:66 | res | provenance |  |
-| test_logging.rs:203:42:203:65 | ...::must_use(...) | test_logging.rs:203:34:203:75 | ... .as_str() | provenance | MaD:15 |
-| test_logging.rs:203:42:203:65 | MacroExpr | test_logging.rs:203:42:203:65 | ...::format(...) | provenance | MaD:16 |
-| test_logging.rs:203:42:203:65 | { ... } | test_logging.rs:203:42:203:65 | ...::must_use(...) | provenance | MaD:17 |
-| test_logging.rs:203:58:203:65 | password | test_logging.rs:203:42:203:65 | MacroExpr | provenance |  |
-| test_logging.rs:209:36:209:70 | res | test_logging.rs:209:44:209:69 | { ... } | provenance |  |
-| test_logging.rs:209:36:209:81 | ... .as_bytes() | test_logging.rs:209:30:209:34 | write | provenance | MaD:5 Sink:MaD:5 |
-| test_logging.rs:209:44:209:69 | ...::format(...) | test_logging.rs:209:36:209:70 | res | provenance |  |
-| test_logging.rs:209:44:209:69 | ...::must_use(...) | test_logging.rs:209:36:209:81 | ... .as_bytes() | provenance | MaD:14 |
-| test_logging.rs:209:44:209:69 | MacroExpr | test_logging.rs:209:44:209:69 | ...::format(...) | provenance | MaD:16 |
-| test_logging.rs:209:44:209:69 | { ... } | test_logging.rs:209:44:209:69 | ...::must_use(...) | provenance | MaD:17 |
-| test_logging.rs:209:62:209:69 | password | test_logging.rs:209:44:209:69 | MacroExpr | provenance |  |
-| test_logging.rs:210:40:210:74 | res | test_logging.rs:210:48:210:73 | { ... } | provenance |  |
-| test_logging.rs:210:40:210:85 | ... .as_bytes() | test_logging.rs:210:30:210:38 | write_all | provenance | MaD:6 Sink:MaD:6 |
-| test_logging.rs:210:48:210:73 | ...::format(...) | test_logging.rs:210:40:210:74 | res | provenance |  |
-| test_logging.rs:210:48:210:73 | ...::must_use(...) | test_logging.rs:210:40:210:85 | ... .as_bytes() | provenance | MaD:14 |
-| test_logging.rs:210:48:210:73 | MacroExpr | test_logging.rs:210:48:210:73 | ...::format(...) | provenance | MaD:16 |
-| test_logging.rs:210:48:210:73 | { ... } | test_logging.rs:210:48:210:73 | ...::must_use(...) | provenance | MaD:17 |
-| test_logging.rs:210:66:210:73 | password | test_logging.rs:210:48:210:73 | MacroExpr | provenance |  |
-| test_logging.rs:213:15:213:49 | res | test_logging.rs:213:23:213:48 | { ... } | provenance |  |
-| test_logging.rs:213:15:213:60 | ... .as_bytes() | test_logging.rs:213:9:213:13 | write | provenance | MaD:5 Sink:MaD:5 |
-| test_logging.rs:213:23:213:48 | ...::format(...) | test_logging.rs:213:15:213:49 | res | provenance |  |
-| test_logging.rs:213:23:213:48 | ...::must_use(...) | test_logging.rs:213:15:213:60 | ... .as_bytes() | provenance | MaD:14 |
-| test_logging.rs:213:23:213:48 | MacroExpr | test_logging.rs:213:23:213:48 | ...::format(...) | provenance | MaD:16 |
-| test_logging.rs:213:23:213:48 | { ... } | test_logging.rs:213:23:213:48 | ...::must_use(...) | provenance | MaD:17 |
-| test_logging.rs:213:41:213:48 | password | test_logging.rs:213:23:213:48 | MacroExpr | provenance |  |
-| test_logging.rs:216:15:216:49 | res | test_logging.rs:216:23:216:48 | { ... } | provenance |  |
-| test_logging.rs:216:15:216:60 | ... .as_bytes() | test_logging.rs:216:9:216:13 | write | provenance | MaD:4 Sink:MaD:4 |
-| test_logging.rs:216:23:216:48 | ...::format(...) | test_logging.rs:216:15:216:49 | res | provenance |  |
-| test_logging.rs:216:23:216:48 | ...::must_use(...) | test_logging.rs:216:15:216:60 | ... .as_bytes() | provenance | MaD:14 |
-| test_logging.rs:216:23:216:48 | MacroExpr | test_logging.rs:216:23:216:48 | ...::format(...) | provenance | MaD:16 |
-| test_logging.rs:216:23:216:48 | { ... } | test_logging.rs:216:23:216:48 | ...::must_use(...) | provenance | MaD:17 |
-| test_logging.rs:216:41:216:48 | password | test_logging.rs:216:23:216:48 | MacroExpr | provenance |  |
+| test_logging.rs:44:11:44:34 | MacroExpr | test_logging.rs:44:5:44:35 | ...::log | provenance | MaD:14 Sink:MaD:14 |
+| test_logging.rs:44:27:44:34 | password | test_logging.rs:44:11:44:34 | MacroExpr | provenance |  |
+| test_logging.rs:45:12:45:35 | MacroExpr | test_logging.rs:45:5:45:36 | ...::log | provenance | MaD:14 Sink:MaD:14 |
+| test_logging.rs:45:28:45:35 | password | test_logging.rs:45:12:45:35 | MacroExpr | provenance |  |
+| test_logging.rs:46:11:46:34 | MacroExpr | test_logging.rs:46:5:46:35 | ...::log | provenance | MaD:14 Sink:MaD:14 |
+| test_logging.rs:46:27:46:34 | password | test_logging.rs:46:11:46:34 | MacroExpr | provenance |  |
+| test_logging.rs:47:24:47:47 | MacroExpr | test_logging.rs:47:5:47:48 | ...::log | provenance | MaD:14 Sink:MaD:14 |
+| test_logging.rs:47:40:47:47 | password | test_logging.rs:47:24:47:47 | MacroExpr | provenance |  |
+| test_logging.rs:52:12:52:35 | MacroExpr | test_logging.rs:52:5:52:36 | ...::log | provenance | MaD:14 Sink:MaD:14 |
+| test_logging.rs:52:28:52:35 | password | test_logging.rs:52:12:52:35 | MacroExpr | provenance |  |
+| test_logging.rs:54:12:54:48 | MacroExpr | test_logging.rs:54:5:54:49 | ...::log | provenance | MaD:14 Sink:MaD:14 |
+| test_logging.rs:54:41:54:48 | password | test_logging.rs:54:12:54:48 | MacroExpr | provenance |  |
+| test_logging.rs:56:12:56:46 | MacroExpr | test_logging.rs:56:5:56:47 | ...::log | provenance | MaD:14 Sink:MaD:14 |
+| test_logging.rs:56:39:56:46 | password | test_logging.rs:56:12:56:46 | MacroExpr | provenance |  |
+| test_logging.rs:57:12:57:33 | MacroExpr | test_logging.rs:57:5:57:34 | ...::log | provenance | MaD:14 Sink:MaD:14 |
+| test_logging.rs:57:24:57:31 | password | test_logging.rs:57:12:57:33 | MacroExpr | provenance |  |
+| test_logging.rs:58:12:58:35 | MacroExpr | test_logging.rs:58:5:58:36 | ...::log | provenance | MaD:14 Sink:MaD:14 |
+| test_logging.rs:58:24:58:31 | password | test_logging.rs:58:12:58:35 | MacroExpr | provenance |  |
+| test_logging.rs:60:30:60:53 | MacroExpr | test_logging.rs:60:5:60:54 | ...::log | provenance | MaD:14 Sink:MaD:14 |
+| test_logging.rs:60:46:60:53 | password | test_logging.rs:60:30:60:53 | MacroExpr | provenance |  |
+| test_logging.rs:61:20:61:28 | &... [&ref, tuple.0, &ref] | test_logging.rs:61:5:61:55 | ...::log | provenance | MaD:15 Sink:MaD:15 Sink:MaD:15 |
+| test_logging.rs:61:20:61:28 | &... [&ref, tuple.0, &ref] | test_logging.rs:61:5:61:55 | ...::log | provenance | MaD:15 Sink:MaD:15 Sink:MaD:15 Sink:MaD:15 |
+| test_logging.rs:61:20:61:28 | &... [&ref, tuple.0] | test_logging.rs:61:5:61:55 | ...::log | provenance | MaD:15 Sink:MaD:15 Sink:MaD:15 |
+| test_logging.rs:61:20:61:28 | &password | test_logging.rs:61:20:61:28 | TupleExpr [tuple.0] | provenance |  |
+| test_logging.rs:61:20:61:28 | &password [&ref] | test_logging.rs:61:20:61:28 | TupleExpr [tuple.0, &ref] | provenance |  |
+| test_logging.rs:61:20:61:28 | TupleExpr [tuple.0, &ref] | test_logging.rs:61:20:61:28 | &... [&ref, tuple.0, &ref] | provenance |  |
+| test_logging.rs:61:20:61:28 | TupleExpr [tuple.0] | test_logging.rs:61:20:61:28 | &... [&ref, tuple.0] | provenance |  |
+| test_logging.rs:61:21:61:28 | password | test_logging.rs:61:20:61:28 | &password | provenance | Config |
+| test_logging.rs:61:21:61:28 | password | test_logging.rs:61:20:61:28 | &password [&ref] | provenance |  |
+| test_logging.rs:65:24:65:47 | MacroExpr | test_logging.rs:65:5:65:48 | ...::log | provenance | MaD:14 Sink:MaD:14 |
+| test_logging.rs:65:40:65:47 | password | test_logging.rs:65:24:65:47 | MacroExpr | provenance |  |
+| test_logging.rs:67:42:67:65 | MacroExpr | test_logging.rs:67:5:67:66 | ...::log | provenance | MaD:14 Sink:MaD:14 |
+| test_logging.rs:67:58:67:65 | password | test_logging.rs:67:42:67:65 | MacroExpr | provenance |  |
+| test_logging.rs:68:18:68:26 | &... [&ref, tuple.0, &ref] | test_logging.rs:68:5:68:67 | ...::log | provenance | MaD:15 Sink:MaD:15 Sink:MaD:15 |
+| test_logging.rs:68:18:68:26 | &... [&ref, tuple.0, &ref] | test_logging.rs:68:5:68:67 | ...::log | provenance | MaD:15 Sink:MaD:15 Sink:MaD:15 Sink:MaD:15 |
+| test_logging.rs:68:18:68:26 | &... [&ref, tuple.0] | test_logging.rs:68:5:68:67 | ...::log | provenance | MaD:15 Sink:MaD:15 Sink:MaD:15 |
+| test_logging.rs:68:18:68:26 | &password | test_logging.rs:68:18:68:26 | TupleExpr [tuple.0] | provenance |  |
+| test_logging.rs:68:18:68:26 | &password [&ref] | test_logging.rs:68:18:68:26 | TupleExpr [tuple.0, &ref] | provenance |  |
+| test_logging.rs:68:18:68:26 | TupleExpr [tuple.0, &ref] | test_logging.rs:68:18:68:26 | &... [&ref, tuple.0, &ref] | provenance |  |
+| test_logging.rs:68:18:68:26 | TupleExpr [tuple.0] | test_logging.rs:68:18:68:26 | &... [&ref, tuple.0] | provenance |  |
+| test_logging.rs:68:19:68:26 | password | test_logging.rs:68:18:68:26 | &password | provenance | Config |
+| test_logging.rs:68:19:68:26 | password | test_logging.rs:68:18:68:26 | &password [&ref] | provenance |  |
+| test_logging.rs:72:23:72:46 | MacroExpr | test_logging.rs:72:5:72:47 | ...::log | provenance | MaD:14 Sink:MaD:14 |
+| test_logging.rs:72:39:72:46 | password | test_logging.rs:72:23:72:46 | MacroExpr | provenance |  |
+| test_logging.rs:74:41:74:64 | MacroExpr | test_logging.rs:74:5:74:65 | ...::log | provenance | MaD:14 Sink:MaD:14 |
+| test_logging.rs:74:57:74:64 | password | test_logging.rs:74:41:74:64 | MacroExpr | provenance |  |
+| test_logging.rs:75:20:75:28 | &... [&ref, tuple.0, &ref] | test_logging.rs:75:5:75:51 | ...::log | provenance | MaD:15 Sink:MaD:15 Sink:MaD:15 |
+| test_logging.rs:75:20:75:28 | &... [&ref, tuple.0, &ref] | test_logging.rs:75:5:75:51 | ...::log | provenance | MaD:15 Sink:MaD:15 Sink:MaD:15 Sink:MaD:15 |
+| test_logging.rs:75:20:75:28 | &... [&ref, tuple.0] | test_logging.rs:75:5:75:51 | ...::log | provenance | MaD:15 Sink:MaD:15 Sink:MaD:15 |
+| test_logging.rs:75:20:75:28 | &password | test_logging.rs:75:20:75:28 | TupleExpr [tuple.0] | provenance |  |
+| test_logging.rs:75:20:75:28 | &password [&ref] | test_logging.rs:75:20:75:28 | TupleExpr [tuple.0, &ref] | provenance |  |
+| test_logging.rs:75:20:75:28 | TupleExpr [tuple.0, &ref] | test_logging.rs:75:20:75:28 | &... [&ref, tuple.0, &ref] | provenance |  |
+| test_logging.rs:75:20:75:28 | TupleExpr [tuple.0] | test_logging.rs:75:20:75:28 | &... [&ref, tuple.0] | provenance |  |
+| test_logging.rs:75:21:75:28 | password | test_logging.rs:75:20:75:28 | &password | provenance | Config |
+| test_logging.rs:75:21:75:28 | password | test_logging.rs:75:20:75:28 | &password [&ref] | provenance |  |
+| test_logging.rs:76:23:76:46 | MacroExpr | test_logging.rs:76:5:76:47 | ...::log | provenance | MaD:14 Sink:MaD:14 |
+| test_logging.rs:76:39:76:46 | password | test_logging.rs:76:23:76:46 | MacroExpr | provenance |  |
+| test_logging.rs:82:20:82:43 | MacroExpr | test_logging.rs:82:5:82:44 | ...::log | provenance | MaD:14 Sink:MaD:14 |
+| test_logging.rs:82:36:82:43 | password | test_logging.rs:82:20:82:43 | MacroExpr | provenance |  |
+| test_logging.rs:84:38:84:61 | MacroExpr | test_logging.rs:84:5:84:62 | ...::log | provenance | MaD:14 Sink:MaD:14 |
+| test_logging.rs:84:54:84:61 | password | test_logging.rs:84:38:84:61 | MacroExpr | provenance |  |
+| test_logging.rs:85:20:85:28 | &... [&ref, tuple.0, &ref] | test_logging.rs:85:5:85:48 | ...::log | provenance | MaD:15 Sink:MaD:15 Sink:MaD:15 |
+| test_logging.rs:85:20:85:28 | &... [&ref, tuple.0, &ref] | test_logging.rs:85:5:85:48 | ...::log | provenance | MaD:15 Sink:MaD:15 Sink:MaD:15 Sink:MaD:15 |
+| test_logging.rs:85:20:85:28 | &... [&ref, tuple.0] | test_logging.rs:85:5:85:48 | ...::log | provenance | MaD:15 Sink:MaD:15 Sink:MaD:15 |
+| test_logging.rs:85:20:85:28 | &password | test_logging.rs:85:20:85:28 | TupleExpr [tuple.0] | provenance |  |
+| test_logging.rs:85:20:85:28 | &password [&ref] | test_logging.rs:85:20:85:28 | TupleExpr [tuple.0, &ref] | provenance |  |
+| test_logging.rs:85:20:85:28 | TupleExpr [tuple.0, &ref] | test_logging.rs:85:20:85:28 | &... [&ref, tuple.0, &ref] | provenance |  |
+| test_logging.rs:85:20:85:28 | TupleExpr [tuple.0] | test_logging.rs:85:20:85:28 | &... [&ref, tuple.0] | provenance |  |
+| test_logging.rs:85:21:85:28 | password | test_logging.rs:85:20:85:28 | &password | provenance | Config |
+| test_logging.rs:85:21:85:28 | password | test_logging.rs:85:20:85:28 | &password [&ref] | provenance |  |
+| test_logging.rs:86:20:86:43 | MacroExpr | test_logging.rs:86:5:86:44 | ...::log | provenance | MaD:14 Sink:MaD:14 |
+| test_logging.rs:86:36:86:43 | password | test_logging.rs:86:20:86:43 | MacroExpr | provenance |  |
+| test_logging.rs:93:9:93:10 | m1 | test_logging.rs:94:11:94:28 | MacroExpr | provenance |  |
+| test_logging.rs:93:14:93:22 | &password | test_logging.rs:93:9:93:10 | m1 | provenance |  |
+| test_logging.rs:93:15:93:22 | password | test_logging.rs:93:14:93:22 | &password | provenance | Config |
+| test_logging.rs:94:11:94:28 | MacroExpr | test_logging.rs:94:5:94:29 | ...::log | provenance | MaD:14 Sink:MaD:14 |
+| test_logging.rs:96:9:96:10 | m2 | test_logging.rs:97:11:97:18 | MacroExpr | provenance |  |
+| test_logging.rs:96:41:96:49 | &password | test_logging.rs:96:9:96:10 | m2 | provenance |  |
+| test_logging.rs:96:42:96:49 | password | test_logging.rs:96:41:96:49 | &password | provenance | Config |
+| test_logging.rs:97:11:97:18 | MacroExpr | test_logging.rs:97:5:97:19 | ...::log | provenance | MaD:14 Sink:MaD:14 |
+| test_logging.rs:99:9:99:10 | m3 | test_logging.rs:100:11:100:18 | MacroExpr | provenance |  |
+| test_logging.rs:99:14:99:46 | res | test_logging.rs:99:22:99:45 | { ... } | provenance |  |
+| test_logging.rs:99:22:99:45 | ...::format(...) | test_logging.rs:99:14:99:46 | res | provenance |  |
+| test_logging.rs:99:22:99:45 | ...::must_use(...) | test_logging.rs:99:9:99:10 | m3 | provenance |  |
+| test_logging.rs:99:22:99:45 | MacroExpr | test_logging.rs:99:22:99:45 | ...::format(...) | provenance | MaD:18 |
+| test_logging.rs:99:22:99:45 | { ... } | test_logging.rs:99:22:99:45 | ...::must_use(...) | provenance | MaD:19 |
+| test_logging.rs:99:38:99:45 | password | test_logging.rs:99:22:99:45 | MacroExpr | provenance |  |
+| test_logging.rs:100:11:100:18 | MacroExpr | test_logging.rs:100:5:100:19 | ...::log | provenance | MaD:14 Sink:MaD:14 |
+| test_logging.rs:118:12:118:41 | MacroExpr | test_logging.rs:118:5:118:42 | ...::log | provenance | MaD:14 Sink:MaD:14 |
+| test_logging.rs:118:28:118:41 | get_password(...) | test_logging.rs:118:12:118:41 | MacroExpr | provenance |  |
+| test_logging.rs:129:9:129:10 | t1 [tuple.1] | test_logging.rs:131:28:131:29 | t1 [tuple.1] | provenance |  |
+| test_logging.rs:129:14:129:33 | TupleExpr [tuple.1] | test_logging.rs:129:9:129:10 | t1 [tuple.1] | provenance |  |
+| test_logging.rs:129:25:129:32 | password | test_logging.rs:129:14:129:33 | TupleExpr [tuple.1] | provenance |  |
+| test_logging.rs:131:12:131:31 | MacroExpr | test_logging.rs:131:5:131:32 | ...::log | provenance | MaD:14 Sink:MaD:14 |
+| test_logging.rs:131:28:131:29 | t1 [tuple.1] | test_logging.rs:131:28:131:31 | t1.1 | provenance |  |
+| test_logging.rs:131:28:131:31 | t1.1 | test_logging.rs:131:12:131:31 | MacroExpr | provenance |  |
+| test_logging.rs:141:11:141:37 | MacroExpr | test_logging.rs:141:5:141:38 | ...::log | provenance | MaD:14 Sink:MaD:14 |
+| test_logging.rs:141:27:141:37 | s1.password | test_logging.rs:141:11:141:37 | MacroExpr | provenance |  |
+| test_logging.rs:151:11:151:37 | MacroExpr | test_logging.rs:151:5:151:38 | ...::log | provenance | MaD:14 Sink:MaD:14 |
+| test_logging.rs:151:27:151:37 | s2.password | test_logging.rs:151:11:151:37 | MacroExpr | provenance |  |
+| test_logging.rs:176:33:176:79 | &... | test_logging.rs:176:22:176:31 | log_expect | provenance | MaD:10 Sink:MaD:10 |
+| test_logging.rs:176:33:176:79 | &... [&ref] | test_logging.rs:176:22:176:31 | log_expect | provenance | MaD:10 Sink:MaD:10 |
+| test_logging.rs:176:34:176:79 | MacroExpr | test_logging.rs:176:33:176:79 | &... | provenance | Config |
+| test_logging.rs:176:34:176:79 | MacroExpr | test_logging.rs:176:33:176:79 | &... [&ref] | provenance |  |
+| test_logging.rs:176:34:176:79 | res | test_logging.rs:176:42:176:78 | { ... } | provenance |  |
+| test_logging.rs:176:42:176:78 | ...::format(...) | test_logging.rs:176:34:176:79 | res | provenance |  |
+| test_logging.rs:176:42:176:78 | ...::must_use(...) | test_logging.rs:176:34:176:79 | MacroExpr | provenance |  |
+| test_logging.rs:176:42:176:78 | MacroExpr | test_logging.rs:176:42:176:78 | ...::format(...) | provenance | MaD:18 |
+| test_logging.rs:176:42:176:78 | { ... } | test_logging.rs:176:42:176:78 | ...::must_use(...) | provenance | MaD:19 |
+| test_logging.rs:176:70:176:78 | password2 | test_logging.rs:176:42:176:78 | MacroExpr | provenance |  |
+| test_logging.rs:180:35:180:81 | &... | test_logging.rs:180:24:180:33 | log_expect | provenance | MaD:11 Sink:MaD:11 |
+| test_logging.rs:180:35:180:81 | &... [&ref] | test_logging.rs:180:24:180:33 | log_expect | provenance | MaD:11 Sink:MaD:11 |
+| test_logging.rs:180:36:180:81 | MacroExpr | test_logging.rs:180:35:180:81 | &... | provenance | Config |
+| test_logging.rs:180:36:180:81 | MacroExpr | test_logging.rs:180:35:180:81 | &... [&ref] | provenance |  |
+| test_logging.rs:180:36:180:81 | res | test_logging.rs:180:44:180:80 | { ... } | provenance |  |
+| test_logging.rs:180:44:180:80 | ...::format(...) | test_logging.rs:180:36:180:81 | res | provenance |  |
+| test_logging.rs:180:44:180:80 | ...::must_use(...) | test_logging.rs:180:36:180:81 | MacroExpr | provenance |  |
+| test_logging.rs:180:44:180:80 | MacroExpr | test_logging.rs:180:44:180:80 | ...::format(...) | provenance | MaD:18 |
+| test_logging.rs:180:44:180:80 | { ... } | test_logging.rs:180:44:180:80 | ...::must_use(...) | provenance | MaD:19 |
+| test_logging.rs:180:72:180:80 | password2 | test_logging.rs:180:44:180:80 | MacroExpr | provenance |  |
+| test_logging.rs:183:9:183:19 | err_result2 [Err] | test_logging.rs:184:13:184:23 | err_result2 [Err] | provenance |  |
+| test_logging.rs:183:47:183:68 | Err(...) [Err] | test_logging.rs:183:9:183:19 | err_result2 [Err] | provenance |  |
+| test_logging.rs:183:51:183:59 | password2 | test_logging.rs:183:51:183:67 | password2.clone() | provenance | generated |
+| test_logging.rs:183:51:183:67 | password2.clone() | test_logging.rs:183:47:183:68 | Err(...) [Err] | provenance |  |
+| test_logging.rs:184:13:184:23 | err_result2 [Err] | test_logging.rs:184:25:184:34 | log_expect | provenance | MaD:12 Sink:MaD:12 |
+| test_logging.rs:187:9:187:19 | err_result3 [Err] | test_logging.rs:188:13:188:23 | err_result3 [Err] | provenance |  |
+| test_logging.rs:187:47:187:60 | Err(...) [Err] | test_logging.rs:187:9:187:19 | err_result3 [Err] | provenance |  |
+| test_logging.rs:187:51:187:59 | password2 | test_logging.rs:187:47:187:60 | Err(...) [Err] | provenance |  |
+| test_logging.rs:188:13:188:23 | err_result3 [Err] | test_logging.rs:188:25:188:34 | log_unwrap | provenance | MaD:13 Sink:MaD:13 |
+| test_logging.rs:192:12:192:37 | MacroExpr | test_logging.rs:192:5:192:38 | ...::_print | provenance | MaD:9 Sink:MaD:9 |
+| test_logging.rs:192:30:192:37 | password | test_logging.rs:192:12:192:37 | MacroExpr | provenance |  |
+| test_logging.rs:193:14:193:37 | MacroExpr | test_logging.rs:193:5:193:38 | ...::_print | provenance | MaD:9 Sink:MaD:9 |
+| test_logging.rs:193:30:193:37 | password | test_logging.rs:193:14:193:37 | MacroExpr | provenance |  |
+| test_logging.rs:194:13:194:38 | MacroExpr | test_logging.rs:194:5:194:39 | ...::_eprint | provenance | MaD:8 Sink:MaD:8 |
+| test_logging.rs:194:31:194:38 | password | test_logging.rs:194:13:194:38 | MacroExpr | provenance |  |
+| test_logging.rs:195:15:195:38 | MacroExpr | test_logging.rs:195:5:195:39 | ...::_eprint | provenance | MaD:8 Sink:MaD:8 |
+| test_logging.rs:195:31:195:38 | password | test_logging.rs:195:15:195:38 | MacroExpr | provenance |  |
+| test_logging.rs:199:20:199:43 | MacroExpr | test_logging.rs:199:13:199:44 | ...::panic_fmt | provenance | MaD:4 Sink:MaD:4 |
+| test_logging.rs:199:36:199:43 | password | test_logging.rs:199:20:199:43 | MacroExpr | provenance |  |
+| test_logging.rs:202:19:202:42 | MacroExpr | test_logging.rs:202:13:202:43 | ...::panic_fmt | provenance | MaD:4 Sink:MaD:4 |
+| test_logging.rs:202:35:202:42 | password | test_logging.rs:202:19:202:42 | MacroExpr | provenance |  |
+| test_logging.rs:205:28:205:51 | MacroExpr | test_logging.rs:205:13:205:52 | ...::panic_fmt | provenance | MaD:4 Sink:MaD:4 |
+| test_logging.rs:205:44:205:51 | password | test_logging.rs:205:28:205:51 | MacroExpr | provenance |  |
+| test_logging.rs:208:26:208:49 | MacroExpr | test_logging.rs:208:13:208:50 | ...::panic_fmt | provenance | MaD:4 Sink:MaD:4 |
+| test_logging.rs:208:42:208:49 | password | test_logging.rs:208:26:208:49 | MacroExpr | provenance |  |
+| test_logging.rs:211:28:211:51 | MacroExpr | test_logging.rs:211:13:211:52 | ...::panic_fmt | provenance | MaD:4 Sink:MaD:4 |
+| test_logging.rs:211:44:211:51 | password | test_logging.rs:211:28:211:51 | MacroExpr | provenance |  |
+| test_logging.rs:214:13:214:54 | ...::assert_failed [Some] | test_logging.rs:214:13:214:54 | ...::assert_failed | provenance | Sink:MaD:3 |
+| test_logging.rs:214:30:214:53 | ...::Some(...) [Some] | test_logging.rs:214:13:214:54 | ...::assert_failed | provenance | MaD:3 Sink:MaD:3 |
+| test_logging.rs:214:30:214:53 | ...::Some(...) [Some] | test_logging.rs:214:13:214:54 | ...::assert_failed [Some] | provenance | MaD:2 |
+| test_logging.rs:214:30:214:53 | MacroExpr | test_logging.rs:214:30:214:53 | ...::Some(...) [Some] | provenance |  |
+| test_logging.rs:214:46:214:53 | password | test_logging.rs:214:30:214:53 | MacroExpr | provenance |  |
+| test_logging.rs:217:13:217:54 | ...::assert_failed [Some] | test_logging.rs:217:13:217:54 | ...::assert_failed | provenance | Sink:MaD:3 |
+| test_logging.rs:217:30:217:53 | ...::Some(...) [Some] | test_logging.rs:217:13:217:54 | ...::assert_failed | provenance | MaD:3 Sink:MaD:3 |
+| test_logging.rs:217:30:217:53 | ...::Some(...) [Some] | test_logging.rs:217:13:217:54 | ...::assert_failed [Some] | provenance | MaD:2 |
+| test_logging.rs:217:30:217:53 | MacroExpr | test_logging.rs:217:30:217:53 | ...::Some(...) [Some] | provenance |  |
+| test_logging.rs:217:46:217:53 | password | test_logging.rs:217:30:217:53 | MacroExpr | provenance |  |
+| test_logging.rs:220:34:220:57 | MacroExpr | test_logging.rs:220:13:220:58 | ...::panic_fmt | provenance | MaD:4 Sink:MaD:4 |
+| test_logging.rs:220:50:220:57 | password | test_logging.rs:220:34:220:57 | MacroExpr | provenance |  |
+| test_logging.rs:223:13:223:60 | ...::assert_failed [Some] | test_logging.rs:223:13:223:60 | ...::assert_failed | provenance | Sink:MaD:3 |
+| test_logging.rs:223:36:223:59 | ...::Some(...) [Some] | test_logging.rs:223:13:223:60 | ...::assert_failed | provenance | MaD:3 Sink:MaD:3 |
+| test_logging.rs:223:36:223:59 | ...::Some(...) [Some] | test_logging.rs:223:13:223:60 | ...::assert_failed [Some] | provenance | MaD:2 |
+| test_logging.rs:223:36:223:59 | MacroExpr | test_logging.rs:223:36:223:59 | ...::Some(...) [Some] | provenance |  |
+| test_logging.rs:223:52:223:59 | password | test_logging.rs:223:36:223:59 | MacroExpr | provenance |  |
+| test_logging.rs:226:13:226:60 | ...::assert_failed [Some] | test_logging.rs:226:13:226:60 | ...::assert_failed | provenance | Sink:MaD:3 |
+| test_logging.rs:226:36:226:59 | ...::Some(...) [Some] | test_logging.rs:226:13:226:60 | ...::assert_failed | provenance | MaD:3 Sink:MaD:3 |
+| test_logging.rs:226:36:226:59 | ...::Some(...) [Some] | test_logging.rs:226:13:226:60 | ...::assert_failed [Some] | provenance | MaD:2 |
+| test_logging.rs:226:36:226:59 | MacroExpr | test_logging.rs:226:36:226:59 | ...::Some(...) [Some] | provenance |  |
+| test_logging.rs:226:52:226:59 | password | test_logging.rs:226:36:226:59 | MacroExpr | provenance |  |
+| test_logging.rs:229:30:229:62 | res | test_logging.rs:229:38:229:61 | { ... } | provenance |  |
+| test_logging.rs:229:30:229:71 | ... .as_str() | test_logging.rs:229:23:229:28 | expect | provenance | MaD:1 Sink:MaD:1 |
+| test_logging.rs:229:30:229:71 | ... .as_str() | test_logging.rs:229:23:229:28 | expect | provenance | MaD:1 Sink:MaD:1 |
+| test_logging.rs:229:38:229:61 | ...::format(...) | test_logging.rs:229:30:229:62 | res | provenance |  |
+| test_logging.rs:229:38:229:61 | ...::must_use(...) | test_logging.rs:229:30:229:71 | ... .as_str() | provenance | MaD:17 |
+| test_logging.rs:229:38:229:61 | MacroExpr | test_logging.rs:229:38:229:61 | ...::format(...) | provenance | MaD:18 |
+| test_logging.rs:229:38:229:61 | { ... } | test_logging.rs:229:38:229:61 | ...::must_use(...) | provenance | MaD:19 |
+| test_logging.rs:229:54:229:61 | password | test_logging.rs:229:38:229:61 | MacroExpr | provenance |  |
+| test_logging.rs:242:16:242:50 | res | test_logging.rs:242:24:242:49 | { ... } | provenance |  |
+| test_logging.rs:242:16:242:61 | ... .as_bytes() | test_logging.rs:242:10:242:14 | write | provenance | MaD:6 Sink:MaD:6 |
+| test_logging.rs:242:24:242:49 | ...::format(...) | test_logging.rs:242:16:242:50 | res | provenance |  |
+| test_logging.rs:242:24:242:49 | ...::must_use(...) | test_logging.rs:242:16:242:61 | ... .as_bytes() | provenance | MaD:16 |
+| test_logging.rs:242:24:242:49 | MacroExpr | test_logging.rs:242:24:242:49 | ...::format(...) | provenance | MaD:18 |
+| test_logging.rs:242:24:242:49 | { ... } | test_logging.rs:242:24:242:49 | ...::must_use(...) | provenance | MaD:19 |
+| test_logging.rs:242:42:242:49 | password | test_logging.rs:242:24:242:49 | MacroExpr | provenance |  |
+| test_logging.rs:245:20:245:54 | res | test_logging.rs:245:28:245:53 | { ... } | provenance |  |
+| test_logging.rs:245:20:245:65 | ... .as_bytes() | test_logging.rs:245:10:245:18 | write_all | provenance | MaD:7 Sink:MaD:7 |
+| test_logging.rs:245:28:245:53 | ...::format(...) | test_logging.rs:245:20:245:54 | res | provenance |  |
+| test_logging.rs:245:28:245:53 | ...::must_use(...) | test_logging.rs:245:20:245:65 | ... .as_bytes() | provenance | MaD:16 |
+| test_logging.rs:245:28:245:53 | MacroExpr | test_logging.rs:245:28:245:53 | ...::format(...) | provenance | MaD:18 |
+| test_logging.rs:245:28:245:53 | { ... } | test_logging.rs:245:28:245:53 | ...::must_use(...) | provenance | MaD:19 |
+| test_logging.rs:245:46:245:53 | password | test_logging.rs:245:28:245:53 | MacroExpr | provenance |  |
+| test_logging.rs:248:15:248:49 | res | test_logging.rs:248:23:248:48 | { ... } | provenance |  |
+| test_logging.rs:248:15:248:60 | ... .as_bytes() | test_logging.rs:248:9:248:13 | write | provenance | MaD:6 Sink:MaD:6 |
+| test_logging.rs:248:23:248:48 | ...::format(...) | test_logging.rs:248:15:248:49 | res | provenance |  |
+| test_logging.rs:248:23:248:48 | ...::must_use(...) | test_logging.rs:248:15:248:60 | ... .as_bytes() | provenance | MaD:16 |
+| test_logging.rs:248:23:248:48 | MacroExpr | test_logging.rs:248:23:248:48 | ...::format(...) | provenance | MaD:18 |
+| test_logging.rs:248:23:248:48 | { ... } | test_logging.rs:248:23:248:48 | ...::must_use(...) | provenance | MaD:19 |
+| test_logging.rs:248:41:248:48 | password | test_logging.rs:248:23:248:48 | MacroExpr | provenance |  |
+| test_logging.rs:251:15:251:49 | res | test_logging.rs:251:23:251:48 | { ... } | provenance |  |
+| test_logging.rs:251:15:251:60 | ... .as_bytes() | test_logging.rs:251:9:251:13 | write | provenance | MaD:5 Sink:MaD:5 |
+| test_logging.rs:251:23:251:48 | ...::format(...) | test_logging.rs:251:15:251:49 | res | provenance |  |
+| test_logging.rs:251:23:251:48 | ...::must_use(...) | test_logging.rs:251:15:251:60 | ... .as_bytes() | provenance | MaD:16 |
+| test_logging.rs:251:23:251:48 | MacroExpr | test_logging.rs:251:23:251:48 | ...::format(...) | provenance | MaD:18 |
+| test_logging.rs:251:23:251:48 | { ... } | test_logging.rs:251:23:251:48 | ...::must_use(...) | provenance | MaD:19 |
+| test_logging.rs:251:41:251:48 | password | test_logging.rs:251:23:251:48 | MacroExpr | provenance |  |
 models
 | 1 | Sink: lang:core; <crate::option::Option>::expect; log-injection; Argument[0] |
-| 2 | Sink: lang:core; crate::panicking::assert_failed; log-injection; Argument[3].Field[crate::option::Option::Some(0)] |
-| 3 | Sink: lang:core; crate::panicking::panic_fmt; log-injection; Argument[0] |
-| 4 | Sink: lang:std; <crate::io::stdio::StderrLock as crate::io::Write>::write; log-injection; Argument[0] |
-| 5 | Sink: lang:std; <crate::io::stdio::StdoutLock as crate::io::Write>::write; log-injection; Argument[0] |
-| 6 | Sink: lang:std; <crate::io::stdio::StdoutLock as crate::io::Write>::write_all; log-injection; Argument[0] |
-| 7 | Sink: lang:std; crate::io::stdio::_eprint; log-injection; Argument[0] |
-| 8 | Sink: lang:std; crate::io::stdio::_print; log-injection; Argument[0] |
-| 9 | Sink: repo:https://github.com/DesmondWillowbrook/rs-log_err:log_err; <crate::option::Option as crate::LogErrOption>::log_expect; log-injection; Argument[0] |
-| 10 | Sink: repo:https://github.com/DesmondWillowbrook/rs-log_err:log_err; <crate::result::Result as crate::LogErrResult>::log_expect; log-injection; Argument[0] |
-| 11 | Sink: repo:https://github.com/DesmondWillowbrook/rs-log_err:log_err; <crate::result::Result as crate::LogErrResult>::log_unwrap; log-injection; Argument[self].Field[crate::result::Result::Err(0)] |
-| 12 | Sink: repo:https://github.com/rust-lang/log:log; crate::__private_api::log; log-injection; Argument[1] |
-| 13 | Sink: repo:https://github.com/rust-lang/log:log; crate::__private_api::log; log-injection; Argument[3] |
-| 14 | Summary: lang:alloc; <crate::string::String>::as_bytes; Argument[self]; ReturnValue; value |
-| 15 | Summary: lang:alloc; <crate::string::String>::as_str; Argument[self]; ReturnValue; value |
-| 16 | Summary: lang:alloc; crate::fmt::format; Argument[0]; ReturnValue; taint |
-| 17 | Summary: lang:core; crate::hint::must_use; Argument[0]; ReturnValue; value |
+| 2 | Sink: lang:core; crate::panicking::assert_failed; log-injection; Argument[3] |
+| 3 | Sink: lang:core; crate::panicking::assert_failed; log-injection; Argument[3].Field[crate::option::Option::Some(0)] |
+| 4 | Sink: lang:core; crate::panicking::panic_fmt; log-injection; Argument[0] |
+| 5 | Sink: lang:std; <crate::io::stdio::StderrLock as crate::io::Write>::write; log-injection; Argument[0] |
+| 6 | Sink: lang:std; <crate::io::stdio::StdoutLock as crate::io::Write>::write; log-injection; Argument[0] |
+| 7 | Sink: lang:std; <crate::io::stdio::StdoutLock as crate::io::Write>::write_all; log-injection; Argument[0] |
+| 8 | Sink: lang:std; crate::io::stdio::_eprint; log-injection; Argument[0] |
+| 9 | Sink: lang:std; crate::io::stdio::_print; log-injection; Argument[0] |
+| 10 | Sink: repo:https://github.com/DesmondWillowbrook/rs-log_err:log_err; <crate::option::Option as crate::LogErrOption>::log_expect; log-injection; Argument[0] |
+| 11 | Sink: repo:https://github.com/DesmondWillowbrook/rs-log_err:log_err; <crate::result::Result as crate::LogErrResult>::log_expect; log-injection; Argument[0] |
+| 12 | Sink: repo:https://github.com/DesmondWillowbrook/rs-log_err:log_err; <crate::result::Result as crate::LogErrResult>::log_expect; log-injection; Argument[self].Field[crate::result::Result::Err(0)] |
+| 13 | Sink: repo:https://github.com/DesmondWillowbrook/rs-log_err:log_err; <crate::result::Result as crate::LogErrResult>::log_unwrap; log-injection; Argument[self].Field[crate::result::Result::Err(0)] |
+| 14 | Sink: repo:https://github.com/rust-lang/log:log; crate::__private_api::log; log-injection; Argument[1] |
+| 15 | Sink: repo:https://github.com/rust-lang/log:log; crate::__private_api::log; log-injection; Argument[3] |
+| 16 | Summary: lang:alloc; <crate::string::String>::as_bytes; Argument[self]; ReturnValue; value |
+| 17 | Summary: lang:alloc; <crate::string::String>::as_str; Argument[self]; ReturnValue; value |
+| 18 | Summary: lang:alloc; crate::fmt::format; Argument[0]; ReturnValue; taint |
+| 19 | Summary: lang:core; crate::hint::must_use; Argument[0]; ReturnValue; value |
 nodes
+| test_logging.rs:42:5:42:36 | ...::log | semmle.label | ...::log |
+| test_logging.rs:42:12:42:35 | MacroExpr | semmle.label | MacroExpr |
+| test_logging.rs:42:28:42:35 | password | semmle.label | password |
 | test_logging.rs:43:5:43:36 | ...::log | semmle.label | ...::log |
 | test_logging.rs:43:12:43:35 | MacroExpr | semmle.label | MacroExpr |
 | test_logging.rs:43:28:43:35 | password | semmle.label | password |
-| test_logging.rs:44:5:44:36 | ...::log | semmle.label | ...::log |
-| test_logging.rs:44:12:44:35 | MacroExpr | semmle.label | MacroExpr |
-| test_logging.rs:44:28:44:35 | password | semmle.label | password |
-| test_logging.rs:45:5:45:35 | ...::log | semmle.label | ...::log |
-| test_logging.rs:45:11:45:34 | MacroExpr | semmle.label | MacroExpr |
-| test_logging.rs:45:27:45:34 | password | semmle.label | password |
-| test_logging.rs:46:5:46:36 | ...::log | semmle.label | ...::log |
-| test_logging.rs:46:12:46:35 | MacroExpr | semmle.label | MacroExpr |
-| test_logging.rs:46:28:46:35 | password | semmle.label | password |
-| test_logging.rs:47:5:47:35 | ...::log | semmle.label | ...::log |
-| test_logging.rs:47:11:47:34 | MacroExpr | semmle.label | MacroExpr |
-| test_logging.rs:47:27:47:34 | password | semmle.label | password |
-| test_logging.rs:48:5:48:48 | ...::log | semmle.label | ...::log |
-| test_logging.rs:48:24:48:47 | MacroExpr | semmle.label | MacroExpr |
-| test_logging.rs:48:40:48:47 | password | semmle.label | password |
-| test_logging.rs:53:5:53:36 | ...::log | semmle.label | ...::log |
-| test_logging.rs:53:12:53:35 | MacroExpr | semmle.label | MacroExpr |
-| test_logging.rs:53:28:53:35 | password | semmle.label | password |
-| test_logging.rs:55:5:55:49 | ...::log | semmle.label | ...::log |
-| test_logging.rs:55:12:55:48 | MacroExpr | semmle.label | MacroExpr |
-| test_logging.rs:55:41:55:48 | password | semmle.label | password |
-| test_logging.rs:57:5:57:47 | ...::log | semmle.label | ...::log |
-| test_logging.rs:57:12:57:46 | MacroExpr | semmle.label | MacroExpr |
-| test_logging.rs:57:39:57:46 | password | semmle.label | password |
-| test_logging.rs:58:5:58:34 | ...::log | semmle.label | ...::log |
-| test_logging.rs:58:12:58:33 | MacroExpr | semmle.label | MacroExpr |
+| test_logging.rs:44:5:44:35 | ...::log | semmle.label | ...::log |
+| test_logging.rs:44:11:44:34 | MacroExpr | semmle.label | MacroExpr |
+| test_logging.rs:44:27:44:34 | password | semmle.label | password |
+| test_logging.rs:45:5:45:36 | ...::log | semmle.label | ...::log |
+| test_logging.rs:45:12:45:35 | MacroExpr | semmle.label | MacroExpr |
+| test_logging.rs:45:28:45:35 | password | semmle.label | password |
+| test_logging.rs:46:5:46:35 | ...::log | semmle.label | ...::log |
+| test_logging.rs:46:11:46:34 | MacroExpr | semmle.label | MacroExpr |
+| test_logging.rs:46:27:46:34 | password | semmle.label | password |
+| test_logging.rs:47:5:47:48 | ...::log | semmle.label | ...::log |
+| test_logging.rs:47:24:47:47 | MacroExpr | semmle.label | MacroExpr |
+| test_logging.rs:47:40:47:47 | password | semmle.label | password |
+| test_logging.rs:52:5:52:36 | ...::log | semmle.label | ...::log |
+| test_logging.rs:52:12:52:35 | MacroExpr | semmle.label | MacroExpr |
+| test_logging.rs:52:28:52:35 | password | semmle.label | password |
+| test_logging.rs:54:5:54:49 | ...::log | semmle.label | ...::log |
+| test_logging.rs:54:12:54:48 | MacroExpr | semmle.label | MacroExpr |
+| test_logging.rs:54:41:54:48 | password | semmle.label | password |
+| test_logging.rs:56:5:56:47 | ...::log | semmle.label | ...::log |
+| test_logging.rs:56:12:56:46 | MacroExpr | semmle.label | MacroExpr |
+| test_logging.rs:56:39:56:46 | password | semmle.label | password |
+| test_logging.rs:57:5:57:34 | ...::log | semmle.label | ...::log |
+| test_logging.rs:57:12:57:33 | MacroExpr | semmle.label | MacroExpr |
+| test_logging.rs:57:24:57:31 | password | semmle.label | password |
+| test_logging.rs:58:5:58:36 | ...::log | semmle.label | ...::log |
+| test_logging.rs:58:12:58:35 | MacroExpr | semmle.label | MacroExpr |
 | test_logging.rs:58:24:58:31 | password | semmle.label | password |
-| test_logging.rs:59:5:59:36 | ...::log | semmle.label | ...::log |
-| test_logging.rs:59:12:59:35 | MacroExpr | semmle.label | MacroExpr |
-| test_logging.rs:59:24:59:31 | password | semmle.label | password |
-| test_logging.rs:61:5:61:54 | ...::log | semmle.label | ...::log |
-| test_logging.rs:61:30:61:53 | MacroExpr | semmle.label | MacroExpr |
-| test_logging.rs:61:46:61:53 | password | semmle.label | password |
-| test_logging.rs:62:5:62:55 | ...::log | semmle.label | ...::log |
-| test_logging.rs:62:20:62:28 | &... [&ref, tuple.0, &ref] | semmle.label | &... [&ref, tuple.0, &ref] |
-| test_logging.rs:62:20:62:28 | &... [&ref, tuple.0] | semmle.label | &... [&ref, tuple.0] |
-| test_logging.rs:62:20:62:28 | &password | semmle.label | &password |
-| test_logging.rs:62:20:62:28 | &password [&ref] | semmle.label | &password [&ref] |
-| test_logging.rs:62:20:62:28 | TupleExpr [tuple.0, &ref] | semmle.label | TupleExpr [tuple.0, &ref] |
-| test_logging.rs:62:20:62:28 | TupleExpr [tuple.0] | semmle.label | TupleExpr [tuple.0] |
-| test_logging.rs:62:21:62:28 | password | semmle.label | password |
-| test_logging.rs:66:5:66:48 | ...::log | semmle.label | ...::log |
-| test_logging.rs:66:24:66:47 | MacroExpr | semmle.label | MacroExpr |
-| test_logging.rs:66:40:66:47 | password | semmle.label | password |
-| test_logging.rs:68:5:68:66 | ...::log | semmle.label | ...::log |
-| test_logging.rs:68:42:68:65 | MacroExpr | semmle.label | MacroExpr |
-| test_logging.rs:68:58:68:65 | password | semmle.label | password |
-| test_logging.rs:69:5:69:67 | ...::log | semmle.label | ...::log |
-| test_logging.rs:69:18:69:26 | &... [&ref, tuple.0, &ref] | semmle.label | &... [&ref, tuple.0, &ref] |
-| test_logging.rs:69:18:69:26 | &... [&ref, tuple.0] | semmle.label | &... [&ref, tuple.0] |
-| test_logging.rs:69:18:69:26 | &password | semmle.label | &password |
-| test_logging.rs:69:18:69:26 | &password [&ref] | semmle.label | &password [&ref] |
-| test_logging.rs:69:18:69:26 | TupleExpr [tuple.0, &ref] | semmle.label | TupleExpr [tuple.0, &ref] |
-| test_logging.rs:69:18:69:26 | TupleExpr [tuple.0] | semmle.label | TupleExpr [tuple.0] |
-| test_logging.rs:69:19:69:26 | password | semmle.label | password |
-| test_logging.rs:73:5:73:47 | ...::log | semmle.label | ...::log |
-| test_logging.rs:73:23:73:46 | MacroExpr | semmle.label | MacroExpr |
-| test_logging.rs:73:39:73:46 | password | semmle.label | password |
-| test_logging.rs:75:5:75:65 | ...::log | semmle.label | ...::log |
-| test_logging.rs:75:41:75:64 | MacroExpr | semmle.label | MacroExpr |
-| test_logging.rs:75:57:75:64 | password | semmle.label | password |
-| test_logging.rs:76:5:76:51 | ...::log | semmle.label | ...::log |
-| test_logging.rs:76:20:76:28 | &... [&ref, tuple.0, &ref] | semmle.label | &... [&ref, tuple.0, &ref] |
-| test_logging.rs:76:20:76:28 | &... [&ref, tuple.0] | semmle.label | &... [&ref, tuple.0] |
-| test_logging.rs:76:20:76:28 | &password | semmle.label | &password |
-| test_logging.rs:76:20:76:28 | &password [&ref] | semmle.label | &password [&ref] |
-| test_logging.rs:76:20:76:28 | TupleExpr [tuple.0, &ref] | semmle.label | TupleExpr [tuple.0, &ref] |
-| test_logging.rs:76:20:76:28 | TupleExpr [tuple.0] | semmle.label | TupleExpr [tuple.0] |
-| test_logging.rs:76:21:76:28 | password | semmle.label | password |
-| test_logging.rs:77:5:77:47 | ...::log | semmle.label | ...::log |
-| test_logging.rs:77:23:77:46 | MacroExpr | semmle.label | MacroExpr |
-| test_logging.rs:77:39:77:46 | password | semmle.label | password |
-| test_logging.rs:83:5:83:44 | ...::log | semmle.label | ...::log |
-| test_logging.rs:83:20:83:43 | MacroExpr | semmle.label | MacroExpr |
-| test_logging.rs:83:36:83:43 | password | semmle.label | password |
-| test_logging.rs:85:5:85:62 | ...::log | semmle.label | ...::log |
-| test_logging.rs:85:38:85:61 | MacroExpr | semmle.label | MacroExpr |
-| test_logging.rs:85:54:85:61 | password | semmle.label | password |
-| test_logging.rs:86:5:86:48 | ...::log | semmle.label | ...::log |
-| test_logging.rs:86:20:86:28 | &... [&ref, tuple.0, &ref] | semmle.label | &... [&ref, tuple.0, &ref] |
-| test_logging.rs:86:20:86:28 | &... [&ref, tuple.0] | semmle.label | &... [&ref, tuple.0] |
-| test_logging.rs:86:20:86:28 | &password | semmle.label | &password |
-| test_logging.rs:86:20:86:28 | &password [&ref] | semmle.label | &password [&ref] |
-| test_logging.rs:86:20:86:28 | TupleExpr [tuple.0, &ref] | semmle.label | TupleExpr [tuple.0, &ref] |
-| test_logging.rs:86:20:86:28 | TupleExpr [tuple.0] | semmle.label | TupleExpr [tuple.0] |
-| test_logging.rs:86:21:86:28 | password | semmle.label | password |
-| test_logging.rs:87:5:87:44 | ...::log | semmle.label | ...::log |
-| test_logging.rs:87:20:87:43 | MacroExpr | semmle.label | MacroExpr |
-| test_logging.rs:87:36:87:43 | password | semmle.label | password |
-| test_logging.rs:94:9:94:10 | m1 | semmle.label | m1 |
-| test_logging.rs:94:14:94:22 | &password | semmle.label | &password |
-| test_logging.rs:94:15:94:22 | password | semmle.label | password |
-| test_logging.rs:95:5:95:29 | ...::log | semmle.label | ...::log |
-| test_logging.rs:95:11:95:28 | MacroExpr | semmle.label | MacroExpr |
-| test_logging.rs:97:9:97:10 | m2 | semmle.label | m2 |
-| test_logging.rs:97:41:97:49 | &password | semmle.label | &password |
-| test_logging.rs:97:42:97:49 | password | semmle.label | password |
-| test_logging.rs:98:5:98:19 | ...::log | semmle.label | ...::log |
-| test_logging.rs:98:11:98:18 | MacroExpr | semmle.label | MacroExpr |
-| test_logging.rs:100:9:100:10 | m3 | semmle.label | m3 |
-| test_logging.rs:100:14:100:46 | res | semmle.label | res |
-| test_logging.rs:100:22:100:45 | ...::format(...) | semmle.label | ...::format(...) |
-| test_logging.rs:100:22:100:45 | ...::must_use(...) | semmle.label | ...::must_use(...) |
-| test_logging.rs:100:22:100:45 | MacroExpr | semmle.label | MacroExpr |
-| test_logging.rs:100:22:100:45 | { ... } | semmle.label | { ... } |
-| test_logging.rs:100:38:100:45 | password | semmle.label | password |
-| test_logging.rs:101:5:101:19 | ...::log | semmle.label | ...::log |
-| test_logging.rs:101:11:101:18 | MacroExpr | semmle.label | MacroExpr |
-| test_logging.rs:119:5:119:42 | ...::log | semmle.label | ...::log |
-| test_logging.rs:119:12:119:41 | MacroExpr | semmle.label | MacroExpr |
-| test_logging.rs:119:28:119:41 | get_password(...) | semmle.label | get_password(...) |
-| test_logging.rs:130:9:130:10 | t1 [tuple.1] | semmle.label | t1 [tuple.1] |
-| test_logging.rs:130:14:130:33 | TupleExpr [tuple.1] | semmle.label | TupleExpr [tuple.1] |
-| test_logging.rs:130:25:130:32 | password | semmle.label | password |
-| test_logging.rs:132:5:132:32 | ...::log | semmle.label | ...::log |
-| test_logging.rs:132:12:132:31 | MacroExpr | semmle.label | MacroExpr |
-| test_logging.rs:132:28:132:29 | t1 [tuple.1] | semmle.label | t1 [tuple.1] |
-| test_logging.rs:132:28:132:31 | t1.1 | semmle.label | t1.1 |
-| test_logging.rs:139:5:139:38 | ...::log | semmle.label | ...::log |
-| test_logging.rs:139:11:139:37 | MacroExpr | semmle.label | MacroExpr |
-| test_logging.rs:139:27:139:37 | s1.password | semmle.label | s1.password |
-| test_logging.rs:146:5:146:38 | ...::log | semmle.label | ...::log |
-| test_logging.rs:146:11:146:37 | MacroExpr | semmle.label | MacroExpr |
-| test_logging.rs:146:27:146:37 | s2.password | semmle.label | s2.password |
-| test_logging.rs:171:22:171:31 | log_expect | semmle.label | log_expect |
-| test_logging.rs:171:33:171:79 | &... | semmle.label | &... |
-| test_logging.rs:171:33:171:79 | &... [&ref] | semmle.label | &... [&ref] |
-| test_logging.rs:171:34:171:79 | MacroExpr | semmle.label | MacroExpr |
-| test_logging.rs:171:34:171:79 | res | semmle.label | res |
-| test_logging.rs:171:42:171:78 | ...::format(...) | semmle.label | ...::format(...) |
-| test_logging.rs:171:42:171:78 | ...::must_use(...) | semmle.label | ...::must_use(...) |
-| test_logging.rs:171:42:171:78 | MacroExpr | semmle.label | MacroExpr |
-| test_logging.rs:171:42:171:78 | { ... } | semmle.label | { ... } |
-| test_logging.rs:171:70:171:78 | password2 | semmle.label | password2 |
-| test_logging.rs:175:24:175:33 | log_expect | semmle.label | log_expect |
-| test_logging.rs:175:35:175:81 | &... | semmle.label | &... |
-| test_logging.rs:175:35:175:81 | &... [&ref] | semmle.label | &... [&ref] |
-| test_logging.rs:175:36:175:81 | MacroExpr | semmle.label | MacroExpr |
-| test_logging.rs:175:36:175:81 | res | semmle.label | res |
-| test_logging.rs:175:44:175:80 | ...::format(...) | semmle.label | ...::format(...) |
-| test_logging.rs:175:44:175:80 | ...::must_use(...) | semmle.label | ...::must_use(...) |
-| test_logging.rs:175:44:175:80 | MacroExpr | semmle.label | MacroExpr |
-| test_logging.rs:175:44:175:80 | { ... } | semmle.label | { ... } |
-| test_logging.rs:175:72:175:80 | password2 | semmle.label | password2 |
-| test_logging.rs:182:9:182:19 | err_result3 [Err] | semmle.label | err_result3 [Err] |
-| test_logging.rs:182:47:182:60 | Err(...) [Err] | semmle.label | Err(...) [Err] |
-| test_logging.rs:182:51:182:59 | password2 | semmle.label | password2 |
-| test_logging.rs:183:13:183:23 | err_result3 [Err] | semmle.label | err_result3 [Err] |
-| test_logging.rs:183:25:183:34 | log_unwrap | semmle.label | log_unwrap |
-| test_logging.rs:187:5:187:38 | ...::_print | semmle.label | ...::_print |
-| test_logging.rs:187:12:187:37 | MacroExpr | semmle.label | MacroExpr |
-| test_logging.rs:187:30:187:37 | password | semmle.label | password |
-| test_logging.rs:188:5:188:38 | ...::_print | semmle.label | ...::_print |
-| test_logging.rs:188:14:188:37 | MacroExpr | semmle.label | MacroExpr |
-| test_logging.rs:188:30:188:37 | password | semmle.label | password |
-| test_logging.rs:189:5:189:39 | ...::_eprint | semmle.label | ...::_eprint |
-| test_logging.rs:189:13:189:38 | MacroExpr | semmle.label | MacroExpr |
-| test_logging.rs:189:31:189:38 | password | semmle.label | password |
-| test_logging.rs:190:5:190:39 | ...::_eprint | semmle.label | ...::_eprint |
-| test_logging.rs:190:15:190:38 | MacroExpr | semmle.label | MacroExpr |
-| test_logging.rs:190:31:190:38 | password | semmle.label | password |
-| test_logging.rs:193:16:193:47 | ...::panic_fmt | semmle.label | ...::panic_fmt |
-| test_logging.rs:193:23:193:46 | MacroExpr | semmle.label | MacroExpr |
-| test_logging.rs:193:39:193:46 | password | semmle.label | password |
-| test_logging.rs:194:16:194:46 | ...::panic_fmt | semmle.label | ...::panic_fmt |
-| test_logging.rs:194:22:194:45 | MacroExpr | semmle.label | MacroExpr |
-| test_logging.rs:194:38:194:45 | password | semmle.label | password |
-| test_logging.rs:195:16:195:55 | ...::panic_fmt | semmle.label | ...::panic_fmt |
-| test_logging.rs:195:31:195:54 | MacroExpr | semmle.label | MacroExpr |
-| test_logging.rs:195:47:195:54 | password | semmle.label | password |
-| test_logging.rs:196:16:196:53 | ...::panic_fmt | semmle.label | ...::panic_fmt |
-| test_logging.rs:196:29:196:52 | MacroExpr | semmle.label | MacroExpr |
-| test_logging.rs:196:45:196:52 | password | semmle.label | password |
-| test_logging.rs:197:16:197:55 | ...::panic_fmt | semmle.label | ...::panic_fmt |
-| test_logging.rs:197:31:197:54 | MacroExpr | semmle.label | MacroExpr |
-| test_logging.rs:197:47:197:54 | password | semmle.label | password |
-| test_logging.rs:198:16:198:57 | ...::assert_failed | semmle.label | ...::assert_failed |
-| test_logging.rs:198:33:198:56 | ...::Some(...) [Some] | semmle.label | ...::Some(...) [Some] |
-| test_logging.rs:198:33:198:56 | MacroExpr | semmle.label | MacroExpr |
-| test_logging.rs:198:49:198:56 | password | semmle.label | password |
-| test_logging.rs:199:16:199:57 | ...::assert_failed | semmle.label | ...::assert_failed |
-| test_logging.rs:199:33:199:56 | ...::Some(...) [Some] | semmle.label | ...::Some(...) [Some] |
-| test_logging.rs:199:33:199:56 | MacroExpr | semmle.label | MacroExpr |
-| test_logging.rs:199:49:199:56 | password | semmle.label | password |
-| test_logging.rs:200:16:200:61 | ...::panic_fmt | semmle.label | ...::panic_fmt |
-| test_logging.rs:200:37:200:60 | MacroExpr | semmle.label | MacroExpr |
-| test_logging.rs:200:53:200:60 | password | semmle.label | password |
-| test_logging.rs:201:16:201:63 | ...::assert_failed | semmle.label | ...::assert_failed |
-| test_logging.rs:201:39:201:62 | ...::Some(...) [Some] | semmle.label | ...::Some(...) [Some] |
-| test_logging.rs:201:39:201:62 | MacroExpr | semmle.label | MacroExpr |
-| test_logging.rs:201:55:201:62 | password | semmle.label | password |
-| test_logging.rs:202:17:202:64 | ...::assert_failed | semmle.label | ...::assert_failed |
-| test_logging.rs:202:40:202:63 | ...::Some(...) [Some] | semmle.label | ...::Some(...) [Some] |
-| test_logging.rs:202:40:202:63 | MacroExpr | semmle.label | MacroExpr |
-| test_logging.rs:202:56:202:63 | password | semmle.label | password |
-| test_logging.rs:203:27:203:32 | expect | semmle.label | expect |
-| test_logging.rs:203:34:203:66 | res | semmle.label | res |
-| test_logging.rs:203:34:203:75 | ... .as_str() | semmle.label | ... .as_str() |
-| test_logging.rs:203:42:203:65 | ...::format(...) | semmle.label | ...::format(...) |
-| test_logging.rs:203:42:203:65 | ...::must_use(...) | semmle.label | ...::must_use(...) |
-| test_logging.rs:203:42:203:65 | MacroExpr | semmle.label | MacroExpr |
-| test_logging.rs:203:42:203:65 | { ... } | semmle.label | { ... } |
-| test_logging.rs:203:58:203:65 | password | semmle.label | password |
-| test_logging.rs:209:30:209:34 | write | semmle.label | write |
-| test_logging.rs:209:36:209:70 | res | semmle.label | res |
-| test_logging.rs:209:36:209:81 | ... .as_bytes() | semmle.label | ... .as_bytes() |
-| test_logging.rs:209:44:209:69 | ...::format(...) | semmle.label | ...::format(...) |
-| test_logging.rs:209:44:209:69 | ...::must_use(...) | semmle.label | ...::must_use(...) |
-| test_logging.rs:209:44:209:69 | MacroExpr | semmle.label | MacroExpr |
-| test_logging.rs:209:44:209:69 | { ... } | semmle.label | { ... } |
-| test_logging.rs:209:62:209:69 | password | semmle.label | password |
-| test_logging.rs:210:30:210:38 | write_all | semmle.label | write_all |
-| test_logging.rs:210:40:210:74 | res | semmle.label | res |
-| test_logging.rs:210:40:210:85 | ... .as_bytes() | semmle.label | ... .as_bytes() |
-| test_logging.rs:210:48:210:73 | ...::format(...) | semmle.label | ...::format(...) |
-| test_logging.rs:210:48:210:73 | ...::must_use(...) | semmle.label | ...::must_use(...) |
-| test_logging.rs:210:48:210:73 | MacroExpr | semmle.label | MacroExpr |
-| test_logging.rs:210:48:210:73 | { ... } | semmle.label | { ... } |
-| test_logging.rs:210:66:210:73 | password | semmle.label | password |
-| test_logging.rs:213:9:213:13 | write | semmle.label | write |
-| test_logging.rs:213:15:213:49 | res | semmle.label | res |
-| test_logging.rs:213:15:213:60 | ... .as_bytes() | semmle.label | ... .as_bytes() |
-| test_logging.rs:213:23:213:48 | ...::format(...) | semmle.label | ...::format(...) |
-| test_logging.rs:213:23:213:48 | ...::must_use(...) | semmle.label | ...::must_use(...) |
-| test_logging.rs:213:23:213:48 | MacroExpr | semmle.label | MacroExpr |
-| test_logging.rs:213:23:213:48 | { ... } | semmle.label | { ... } |
-| test_logging.rs:213:41:213:48 | password | semmle.label | password |
-| test_logging.rs:216:9:216:13 | write | semmle.label | write |
-| test_logging.rs:216:15:216:49 | res | semmle.label | res |
-| test_logging.rs:216:15:216:60 | ... .as_bytes() | semmle.label | ... .as_bytes() |
-| test_logging.rs:216:23:216:48 | ...::format(...) | semmle.label | ...::format(...) |
-| test_logging.rs:216:23:216:48 | ...::must_use(...) | semmle.label | ...::must_use(...) |
-| test_logging.rs:216:23:216:48 | MacroExpr | semmle.label | MacroExpr |
-| test_logging.rs:216:23:216:48 | { ... } | semmle.label | { ... } |
-| test_logging.rs:216:41:216:48 | password | semmle.label | password |
+| test_logging.rs:60:5:60:54 | ...::log | semmle.label | ...::log |
+| test_logging.rs:60:30:60:53 | MacroExpr | semmle.label | MacroExpr |
+| test_logging.rs:60:46:60:53 | password | semmle.label | password |
+| test_logging.rs:61:5:61:55 | ...::log | semmle.label | ...::log |
+| test_logging.rs:61:20:61:28 | &... [&ref, tuple.0, &ref] | semmle.label | &... [&ref, tuple.0, &ref] |
+| test_logging.rs:61:20:61:28 | &... [&ref, tuple.0] | semmle.label | &... [&ref, tuple.0] |
+| test_logging.rs:61:20:61:28 | &password | semmle.label | &password |
+| test_logging.rs:61:20:61:28 | &password [&ref] | semmle.label | &password [&ref] |
+| test_logging.rs:61:20:61:28 | TupleExpr [tuple.0, &ref] | semmle.label | TupleExpr [tuple.0, &ref] |
+| test_logging.rs:61:20:61:28 | TupleExpr [tuple.0] | semmle.label | TupleExpr [tuple.0] |
+| test_logging.rs:61:21:61:28 | password | semmle.label | password |
+| test_logging.rs:65:5:65:48 | ...::log | semmle.label | ...::log |
+| test_logging.rs:65:24:65:47 | MacroExpr | semmle.label | MacroExpr |
+| test_logging.rs:65:40:65:47 | password | semmle.label | password |
+| test_logging.rs:67:5:67:66 | ...::log | semmle.label | ...::log |
+| test_logging.rs:67:42:67:65 | MacroExpr | semmle.label | MacroExpr |
+| test_logging.rs:67:58:67:65 | password | semmle.label | password |
+| test_logging.rs:68:5:68:67 | ...::log | semmle.label | ...::log |
+| test_logging.rs:68:18:68:26 | &... [&ref, tuple.0, &ref] | semmle.label | &... [&ref, tuple.0, &ref] |
+| test_logging.rs:68:18:68:26 | &... [&ref, tuple.0] | semmle.label | &... [&ref, tuple.0] |
+| test_logging.rs:68:18:68:26 | &password | semmle.label | &password |
+| test_logging.rs:68:18:68:26 | &password [&ref] | semmle.label | &password [&ref] |
+| test_logging.rs:68:18:68:26 | TupleExpr [tuple.0, &ref] | semmle.label | TupleExpr [tuple.0, &ref] |
+| test_logging.rs:68:18:68:26 | TupleExpr [tuple.0] | semmle.label | TupleExpr [tuple.0] |
+| test_logging.rs:68:19:68:26 | password | semmle.label | password |
+| test_logging.rs:72:5:72:47 | ...::log | semmle.label | ...::log |
+| test_logging.rs:72:23:72:46 | MacroExpr | semmle.label | MacroExpr |
+| test_logging.rs:72:39:72:46 | password | semmle.label | password |
+| test_logging.rs:74:5:74:65 | ...::log | semmle.label | ...::log |
+| test_logging.rs:74:41:74:64 | MacroExpr | semmle.label | MacroExpr |
+| test_logging.rs:74:57:74:64 | password | semmle.label | password |
+| test_logging.rs:75:5:75:51 | ...::log | semmle.label | ...::log |
+| test_logging.rs:75:20:75:28 | &... [&ref, tuple.0, &ref] | semmle.label | &... [&ref, tuple.0, &ref] |
+| test_logging.rs:75:20:75:28 | &... [&ref, tuple.0] | semmle.label | &... [&ref, tuple.0] |
+| test_logging.rs:75:20:75:28 | &password | semmle.label | &password |
+| test_logging.rs:75:20:75:28 | &password [&ref] | semmle.label | &password [&ref] |
+| test_logging.rs:75:20:75:28 | TupleExpr [tuple.0, &ref] | semmle.label | TupleExpr [tuple.0, &ref] |
+| test_logging.rs:75:20:75:28 | TupleExpr [tuple.0] | semmle.label | TupleExpr [tuple.0] |
+| test_logging.rs:75:21:75:28 | password | semmle.label | password |
+| test_logging.rs:76:5:76:47 | ...::log | semmle.label | ...::log |
+| test_logging.rs:76:23:76:46 | MacroExpr | semmle.label | MacroExpr |
+| test_logging.rs:76:39:76:46 | password | semmle.label | password |
+| test_logging.rs:82:5:82:44 | ...::log | semmle.label | ...::log |
+| test_logging.rs:82:20:82:43 | MacroExpr | semmle.label | MacroExpr |
+| test_logging.rs:82:36:82:43 | password | semmle.label | password |
+| test_logging.rs:84:5:84:62 | ...::log | semmle.label | ...::log |
+| test_logging.rs:84:38:84:61 | MacroExpr | semmle.label | MacroExpr |
+| test_logging.rs:84:54:84:61 | password | semmle.label | password |
+| test_logging.rs:85:5:85:48 | ...::log | semmle.label | ...::log |
+| test_logging.rs:85:20:85:28 | &... [&ref, tuple.0, &ref] | semmle.label | &... [&ref, tuple.0, &ref] |
+| test_logging.rs:85:20:85:28 | &... [&ref, tuple.0] | semmle.label | &... [&ref, tuple.0] |
+| test_logging.rs:85:20:85:28 | &password | semmle.label | &password |
+| test_logging.rs:85:20:85:28 | &password [&ref] | semmle.label | &password [&ref] |
+| test_logging.rs:85:20:85:28 | TupleExpr [tuple.0, &ref] | semmle.label | TupleExpr [tuple.0, &ref] |
+| test_logging.rs:85:20:85:28 | TupleExpr [tuple.0] | semmle.label | TupleExpr [tuple.0] |
+| test_logging.rs:85:21:85:28 | password | semmle.label | password |
+| test_logging.rs:86:5:86:44 | ...::log | semmle.label | ...::log |
+| test_logging.rs:86:20:86:43 | MacroExpr | semmle.label | MacroExpr |
+| test_logging.rs:86:36:86:43 | password | semmle.label | password |
+| test_logging.rs:93:9:93:10 | m1 | semmle.label | m1 |
+| test_logging.rs:93:14:93:22 | &password | semmle.label | &password |
+| test_logging.rs:93:15:93:22 | password | semmle.label | password |
+| test_logging.rs:94:5:94:29 | ...::log | semmle.label | ...::log |
+| test_logging.rs:94:11:94:28 | MacroExpr | semmle.label | MacroExpr |
+| test_logging.rs:96:9:96:10 | m2 | semmle.label | m2 |
+| test_logging.rs:96:41:96:49 | &password | semmle.label | &password |
+| test_logging.rs:96:42:96:49 | password | semmle.label | password |
+| test_logging.rs:97:5:97:19 | ...::log | semmle.label | ...::log |
+| test_logging.rs:97:11:97:18 | MacroExpr | semmle.label | MacroExpr |
+| test_logging.rs:99:9:99:10 | m3 | semmle.label | m3 |
+| test_logging.rs:99:14:99:46 | res | semmle.label | res |
+| test_logging.rs:99:22:99:45 | ...::format(...) | semmle.label | ...::format(...) |
+| test_logging.rs:99:22:99:45 | ...::must_use(...) | semmle.label | ...::must_use(...) |
+| test_logging.rs:99:22:99:45 | MacroExpr | semmle.label | MacroExpr |
+| test_logging.rs:99:22:99:45 | { ... } | semmle.label | { ... } |
+| test_logging.rs:99:38:99:45 | password | semmle.label | password |
+| test_logging.rs:100:5:100:19 | ...::log | semmle.label | ...::log |
+| test_logging.rs:100:11:100:18 | MacroExpr | semmle.label | MacroExpr |
+| test_logging.rs:118:5:118:42 | ...::log | semmle.label | ...::log |
+| test_logging.rs:118:12:118:41 | MacroExpr | semmle.label | MacroExpr |
+| test_logging.rs:118:28:118:41 | get_password(...) | semmle.label | get_password(...) |
+| test_logging.rs:129:9:129:10 | t1 [tuple.1] | semmle.label | t1 [tuple.1] |
+| test_logging.rs:129:14:129:33 | TupleExpr [tuple.1] | semmle.label | TupleExpr [tuple.1] |
+| test_logging.rs:129:25:129:32 | password | semmle.label | password |
+| test_logging.rs:131:5:131:32 | ...::log | semmle.label | ...::log |
+| test_logging.rs:131:12:131:31 | MacroExpr | semmle.label | MacroExpr |
+| test_logging.rs:131:28:131:29 | t1 [tuple.1] | semmle.label | t1 [tuple.1] |
+| test_logging.rs:131:28:131:31 | t1.1 | semmle.label | t1.1 |
+| test_logging.rs:141:5:141:38 | ...::log | semmle.label | ...::log |
+| test_logging.rs:141:11:141:37 | MacroExpr | semmle.label | MacroExpr |
+| test_logging.rs:141:27:141:37 | s1.password | semmle.label | s1.password |
+| test_logging.rs:151:5:151:38 | ...::log | semmle.label | ...::log |
+| test_logging.rs:151:11:151:37 | MacroExpr | semmle.label | MacroExpr |
+| test_logging.rs:151:27:151:37 | s2.password | semmle.label | s2.password |
+| test_logging.rs:176:22:176:31 | log_expect | semmle.label | log_expect |
+| test_logging.rs:176:33:176:79 | &... | semmle.label | &... |
+| test_logging.rs:176:33:176:79 | &... [&ref] | semmle.label | &... [&ref] |
+| test_logging.rs:176:34:176:79 | MacroExpr | semmle.label | MacroExpr |
+| test_logging.rs:176:34:176:79 | res | semmle.label | res |
+| test_logging.rs:176:42:176:78 | ...::format(...) | semmle.label | ...::format(...) |
+| test_logging.rs:176:42:176:78 | ...::must_use(...) | semmle.label | ...::must_use(...) |
+| test_logging.rs:176:42:176:78 | MacroExpr | semmle.label | MacroExpr |
+| test_logging.rs:176:42:176:78 | { ... } | semmle.label | { ... } |
+| test_logging.rs:176:70:176:78 | password2 | semmle.label | password2 |
+| test_logging.rs:180:24:180:33 | log_expect | semmle.label | log_expect |
+| test_logging.rs:180:35:180:81 | &... | semmle.label | &... |
+| test_logging.rs:180:35:180:81 | &... [&ref] | semmle.label | &... [&ref] |
+| test_logging.rs:180:36:180:81 | MacroExpr | semmle.label | MacroExpr |
+| test_logging.rs:180:36:180:81 | res | semmle.label | res |
+| test_logging.rs:180:44:180:80 | ...::format(...) | semmle.label | ...::format(...) |
+| test_logging.rs:180:44:180:80 | ...::must_use(...) | semmle.label | ...::must_use(...) |
+| test_logging.rs:180:44:180:80 | MacroExpr | semmle.label | MacroExpr |
+| test_logging.rs:180:44:180:80 | { ... } | semmle.label | { ... } |
+| test_logging.rs:180:72:180:80 | password2 | semmle.label | password2 |
+| test_logging.rs:183:9:183:19 | err_result2 [Err] | semmle.label | err_result2 [Err] |
+| test_logging.rs:183:47:183:68 | Err(...) [Err] | semmle.label | Err(...) [Err] |
+| test_logging.rs:183:51:183:59 | password2 | semmle.label | password2 |
+| test_logging.rs:183:51:183:67 | password2.clone() | semmle.label | password2.clone() |
+| test_logging.rs:184:13:184:23 | err_result2 [Err] | semmle.label | err_result2 [Err] |
+| test_logging.rs:184:25:184:34 | log_expect | semmle.label | log_expect |
+| test_logging.rs:187:9:187:19 | err_result3 [Err] | semmle.label | err_result3 [Err] |
+| test_logging.rs:187:47:187:60 | Err(...) [Err] | semmle.label | Err(...) [Err] |
+| test_logging.rs:187:51:187:59 | password2 | semmle.label | password2 |
+| test_logging.rs:188:13:188:23 | err_result3 [Err] | semmle.label | err_result3 [Err] |
+| test_logging.rs:188:25:188:34 | log_unwrap | semmle.label | log_unwrap |
+| test_logging.rs:192:5:192:38 | ...::_print | semmle.label | ...::_print |
+| test_logging.rs:192:12:192:37 | MacroExpr | semmle.label | MacroExpr |
+| test_logging.rs:192:30:192:37 | password | semmle.label | password |
+| test_logging.rs:193:5:193:38 | ...::_print | semmle.label | ...::_print |
+| test_logging.rs:193:14:193:37 | MacroExpr | semmle.label | MacroExpr |
+| test_logging.rs:193:30:193:37 | password | semmle.label | password |
+| test_logging.rs:194:5:194:39 | ...::_eprint | semmle.label | ...::_eprint |
+| test_logging.rs:194:13:194:38 | MacroExpr | semmle.label | MacroExpr |
+| test_logging.rs:194:31:194:38 | password | semmle.label | password |
+| test_logging.rs:195:5:195:39 | ...::_eprint | semmle.label | ...::_eprint |
+| test_logging.rs:195:15:195:38 | MacroExpr | semmle.label | MacroExpr |
+| test_logging.rs:195:31:195:38 | password | semmle.label | password |
+| test_logging.rs:199:13:199:44 | ...::panic_fmt | semmle.label | ...::panic_fmt |
+| test_logging.rs:199:20:199:43 | MacroExpr | semmle.label | MacroExpr |
+| test_logging.rs:199:36:199:43 | password | semmle.label | password |
+| test_logging.rs:202:13:202:43 | ...::panic_fmt | semmle.label | ...::panic_fmt |
+| test_logging.rs:202:19:202:42 | MacroExpr | semmle.label | MacroExpr |
+| test_logging.rs:202:35:202:42 | password | semmle.label | password |
+| test_logging.rs:205:13:205:52 | ...::panic_fmt | semmle.label | ...::panic_fmt |
+| test_logging.rs:205:28:205:51 | MacroExpr | semmle.label | MacroExpr |
+| test_logging.rs:205:44:205:51 | password | semmle.label | password |
+| test_logging.rs:208:13:208:50 | ...::panic_fmt | semmle.label | ...::panic_fmt |
+| test_logging.rs:208:26:208:49 | MacroExpr | semmle.label | MacroExpr |
+| test_logging.rs:208:42:208:49 | password | semmle.label | password |
+| test_logging.rs:211:13:211:52 | ...::panic_fmt | semmle.label | ...::panic_fmt |
+| test_logging.rs:211:28:211:51 | MacroExpr | semmle.label | MacroExpr |
+| test_logging.rs:211:44:211:51 | password | semmle.label | password |
+| test_logging.rs:214:13:214:54 | ...::assert_failed | semmle.label | ...::assert_failed |
+| test_logging.rs:214:13:214:54 | ...::assert_failed [Some] | semmle.label | ...::assert_failed [Some] |
+| test_logging.rs:214:30:214:53 | ...::Some(...) [Some] | semmle.label | ...::Some(...) [Some] |
+| test_logging.rs:214:30:214:53 | MacroExpr | semmle.label | MacroExpr |
+| test_logging.rs:214:46:214:53 | password | semmle.label | password |
+| test_logging.rs:217:13:217:54 | ...::assert_failed | semmle.label | ...::assert_failed |
+| test_logging.rs:217:13:217:54 | ...::assert_failed [Some] | semmle.label | ...::assert_failed [Some] |
+| test_logging.rs:217:30:217:53 | ...::Some(...) [Some] | semmle.label | ...::Some(...) [Some] |
+| test_logging.rs:217:30:217:53 | MacroExpr | semmle.label | MacroExpr |
+| test_logging.rs:217:46:217:53 | password | semmle.label | password |
+| test_logging.rs:220:13:220:58 | ...::panic_fmt | semmle.label | ...::panic_fmt |
+| test_logging.rs:220:34:220:57 | MacroExpr | semmle.label | MacroExpr |
+| test_logging.rs:220:50:220:57 | password | semmle.label | password |
+| test_logging.rs:223:13:223:60 | ...::assert_failed | semmle.label | ...::assert_failed |
+| test_logging.rs:223:13:223:60 | ...::assert_failed [Some] | semmle.label | ...::assert_failed [Some] |
+| test_logging.rs:223:36:223:59 | ...::Some(...) [Some] | semmle.label | ...::Some(...) [Some] |
+| test_logging.rs:223:36:223:59 | MacroExpr | semmle.label | MacroExpr |
+| test_logging.rs:223:52:223:59 | password | semmle.label | password |
+| test_logging.rs:226:13:226:60 | ...::assert_failed | semmle.label | ...::assert_failed |
+| test_logging.rs:226:13:226:60 | ...::assert_failed [Some] | semmle.label | ...::assert_failed [Some] |
+| test_logging.rs:226:36:226:59 | ...::Some(...) [Some] | semmle.label | ...::Some(...) [Some] |
+| test_logging.rs:226:36:226:59 | MacroExpr | semmle.label | MacroExpr |
+| test_logging.rs:226:52:226:59 | password | semmle.label | password |
+| test_logging.rs:229:23:229:28 | expect | semmle.label | expect |
+| test_logging.rs:229:23:229:28 | expect | semmle.label | expect |
+| test_logging.rs:229:30:229:62 | res | semmle.label | res |
+| test_logging.rs:229:30:229:71 | ... .as_str() | semmle.label | ... .as_str() |
+| test_logging.rs:229:38:229:61 | ...::format(...) | semmle.label | ...::format(...) |
+| test_logging.rs:229:38:229:61 | ...::must_use(...) | semmle.label | ...::must_use(...) |
+| test_logging.rs:229:38:229:61 | MacroExpr | semmle.label | MacroExpr |
+| test_logging.rs:229:38:229:61 | { ... } | semmle.label | { ... } |
+| test_logging.rs:229:54:229:61 | password | semmle.label | password |
+| test_logging.rs:242:10:242:14 | write | semmle.label | write |
+| test_logging.rs:242:16:242:50 | res | semmle.label | res |
+| test_logging.rs:242:16:242:61 | ... .as_bytes() | semmle.label | ... .as_bytes() |
+| test_logging.rs:242:24:242:49 | ...::format(...) | semmle.label | ...::format(...) |
+| test_logging.rs:242:24:242:49 | ...::must_use(...) | semmle.label | ...::must_use(...) |
+| test_logging.rs:242:24:242:49 | MacroExpr | semmle.label | MacroExpr |
+| test_logging.rs:242:24:242:49 | { ... } | semmle.label | { ... } |
+| test_logging.rs:242:42:242:49 | password | semmle.label | password |
+| test_logging.rs:245:10:245:18 | write_all | semmle.label | write_all |
+| test_logging.rs:245:20:245:54 | res | semmle.label | res |
+| test_logging.rs:245:20:245:65 | ... .as_bytes() | semmle.label | ... .as_bytes() |
+| test_logging.rs:245:28:245:53 | ...::format(...) | semmle.label | ...::format(...) |
+| test_logging.rs:245:28:245:53 | ...::must_use(...) | semmle.label | ...::must_use(...) |
+| test_logging.rs:245:28:245:53 | MacroExpr | semmle.label | MacroExpr |
+| test_logging.rs:245:28:245:53 | { ... } | semmle.label | { ... } |
+| test_logging.rs:245:46:245:53 | password | semmle.label | password |
+| test_logging.rs:248:9:248:13 | write | semmle.label | write |
+| test_logging.rs:248:15:248:49 | res | semmle.label | res |
+| test_logging.rs:248:15:248:60 | ... .as_bytes() | semmle.label | ... .as_bytes() |
+| test_logging.rs:248:23:248:48 | ...::format(...) | semmle.label | ...::format(...) |
+| test_logging.rs:248:23:248:48 | ...::must_use(...) | semmle.label | ...::must_use(...) |
+| test_logging.rs:248:23:248:48 | MacroExpr | semmle.label | MacroExpr |
+| test_logging.rs:248:23:248:48 | { ... } | semmle.label | { ... } |
+| test_logging.rs:248:41:248:48 | password | semmle.label | password |
+| test_logging.rs:251:9:251:13 | write | semmle.label | write |
+| test_logging.rs:251:15:251:49 | res | semmle.label | res |
+| test_logging.rs:251:15:251:60 | ... .as_bytes() | semmle.label | ... .as_bytes() |
+| test_logging.rs:251:23:251:48 | ...::format(...) | semmle.label | ...::format(...) |
+| test_logging.rs:251:23:251:48 | ...::must_use(...) | semmle.label | ...::must_use(...) |
+| test_logging.rs:251:23:251:48 | MacroExpr | semmle.label | MacroExpr |
+| test_logging.rs:251:23:251:48 | { ... } | semmle.label | { ... } |
+| test_logging.rs:251:41:251:48 | password | semmle.label | password |
 subpaths
diff --git a/rust/ql/test/query-tests/security/CWE-312/test_logging.rs b/rust/ql/test/query-tests/security/CWE-312/test_logging.rs
index 3e8dbe81636..4b12005a6cb 100644
--- a/rust/ql/test/query-tests/security/CWE-312/test_logging.rs
+++ b/rust/ql/test/query-tests/security/CWE-312/test_logging.rs
@@ -1,8 +1,7 @@
-
-use log::{debug, error, info, trace, warn, log, Level};
-use std::io::Write as _;
-use std::fmt::Write as _;
+use log::{debug, error, info, log, trace, warn, Level};
 use log_err::{LogErrOption, LogErrResult};
+use std::fmt::Write as _;
+use std::io::Write as _;
 
 // --- tests ---
 
@@ -134,14 +133,20 @@ fn test_log(harmless: String, password: String, encrypted_password: String) {
     trace!("message = {:#?}", t1); // $ MISSING: Alert[rust/cleartext-logging]=t1
 
     // logging from a struct
-    let s1 = MyStruct1 { harmless: "foo".to_string(), password: "123456".to_string() }; // $ MISSING: Source=s1
+    let s1 = MyStruct1 {
+        harmless: "foo".to_string(),
+        password: "123456".to_string(), // $ MISSING: Source=s1
+    };
     warn!("message = {}", s1.harmless);
     warn!("message = {}", s1.password); // $ Alert[rust/cleartext-logging]
     warn!("message = {}", s1); // $ MISSING: Alert[rust/cleartext-logging]=s1
     warn!("message = {:?}", s1); // $ MISSING: Alert[rust/cleartext-logging]=s1
     warn!("message = {:#?}", s1); // $ MISSING: Alert[rust/cleartext-logging]=s1
 
-    let s2 = MyStruct2 { harmless: "foo".to_string(), password: "123456".to_string() }; // $ MISSING: Source=s2
+    let s2 = MyStruct2 {
+        harmless: "foo".to_string(),
+        password: "123456".to_string(), // $ MISSING: Source=s2
+    };
     warn!("message = {}", s2.harmless);
     warn!("message = {}", s2.password); // $ Alert[rust/cleartext-logging]
     warn!("message = {}", s2); // (this implementation does not output the password field)
@@ -175,8 +180,8 @@ fn test_log(harmless: String, password: String, encrypted_password: String) {
     let _ = err_result.log_expect(&format!("Failed with password: {}", password2)); // $ Alert[rust/cleartext-logging]
 
     // test `log_expect` with sensitive `Result.Err`
-    let err_result2: Result<String, String> = Err(password2.clone());
-    let _ = err_result2.log_expect(""); // $ MISSING: Alert[rust/cleartext-logging]
+    let err_result2: Result<String, String> = Err(password2.clone()); // $ Source=s3
+    let _ = err_result2.log_expect(""); // $ Alert[rust/cleartext-logging]=s3
 
     // test `log_unwrap` with sensitive `Result.Err`
     let err_result3: Result<String, String> = Err(password2); // $ Source=err_result3
@@ -190,24 +195,54 @@ fn test_std(password: String, i: i32, opt_i: Option<i32>) {
     eprintln!("message = {}", password); // $ Alert[rust/cleartext-logging]
 
     match i {
-        1 => { panic!("message = {}", password); } // $ Alert[rust/cleartext-logging]
-        2 => { todo!("message = {}", password); } // $ Alert[rust/cleartext-logging]
-        3 => { unimplemented!("message = {}", password); } // $ Alert[rust/cleartext-logging]
-        4 => { unreachable!("message = {}", password); } // $ Alert[rust/cleartext-logging]
-        5 => { assert!(false, "message = {}", password); } // $ Alert[rust/cleartext-logging]
-        6 => { assert_eq!(1, 2, "message = {}", password); } // $ Alert[rust/cleartext-logging]
-        7 => { assert_ne!(1, 1, "message = {}", password); } // $ Alert[rust/cleartext-logging]
-        8 => { debug_assert!(false, "message = {}", password); } // $ Alert[rust/cleartext-logging]
-        9 => { debug_assert_eq!(1, 2, "message = {}", password); } // $ Alert[rust/cleartext-logging]
-        10 => { debug_assert_ne!(1, 1, "message = {}", password); } // $ Alert[rust/cleartext-logging]
-        11 => { _ = opt_i.expect(format!("message = {}", password).as_str()); } // $ Alert[rust/cleartext-logging]
+        1 => {
+            panic!("message = {}", password); // $ Alert[rust/cleartext-logging]
+        }
+        2 => {
+            todo!("message = {}", password); // $ Alert[rust/cleartext-logging]
+        }
+        3 => {
+            unimplemented!("message = {}", password); // $ Alert[rust/cleartext-logging]
+        }
+        4 => {
+            unreachable!("message = {}", password); // $ Alert[rust/cleartext-logging]
+        }
+        5 => {
+            assert!(false, "message = {}", password); // $ Alert[rust/cleartext-logging]
+        }
+        6 => {
+            assert_eq!(1, 2, "message = {}", password); // $ Alert[rust/cleartext-logging]
+        }
+        7 => {
+            assert_ne!(1, 1, "message = {}", password); // $ Alert[rust/cleartext-logging]
+        }
+        8 => {
+            debug_assert!(false, "message = {}", password); // $ Alert[rust/cleartext-logging]
+        }
+        9 => {
+            debug_assert_eq!(1, 2, "message = {}", password); // $ Alert[rust/cleartext-logging]
+        }
+        10 => {
+            debug_assert_ne!(1, 1, "message = {}", password); // $ Alert[rust/cleartext-logging]
+        }
+        11 => {
+            _ = opt_i.expect(format!("message = {}", password).as_str()); // $ Alert[rust/cleartext-logging]
+        }
         _ => {}
     }
 
-    std::io::stdout().lock().write_fmt(format_args!("message = {}\n", password)); // $ MISSING: Alert[rust/cleartext-logging]
-    std::io::stderr().lock().write_fmt(format_args!("message = {}\n", password)); // $ MISSING: Alert[rust/cleartext-logging]
-    std::io::stdout().lock().write(format!("message = {}\n", password).as_bytes()); // $ Alert[rust/cleartext-logging]
-    std::io::stdout().lock().write_all(format!("message = {}\n", password).as_bytes()); // $ Alert[rust/cleartext-logging]
+    std::io::stdout()
+        .lock()
+        .write_fmt(format_args!("message = {}\n", password)); // $ MISSING: Alert[rust/cleartext-logging]
+    std::io::stderr()
+        .lock()
+        .write_fmt(format_args!("message = {}\n", password)); // $ MISSING: Alert[rust/cleartext-logging]
+    std::io::stdout()
+        .lock()
+        .write(format!("message = {}\n", password).as_bytes()); // $ Alert[rust/cleartext-logging]
+    std::io::stdout()
+        .lock()
+        .write_all(format!("message = {}\n", password).as_bytes()); // $ Alert[rust/cleartext-logging]
 
     let mut out = std::io::stdout().lock();
     out.write(format!("message = {}\n", password).as_bytes()); // $ Alert[rust/cleartext-logging]
@@ -219,6 +254,10 @@ fn test_std(password: String, i: i32, opt_i: Option<i32>) {
 fn main() {
     simple_logger::SimpleLogger::new().init().unwrap();
 
-    test_log("harmless".to_string(), "123456".to_string(), "[encrypted]".to_string());
+    test_log(
+        "harmless".to_string(),
+        "123456".to_string(),
+        "[encrypted]".to_string(),
+    );
     test_std("123456".to_string(), 0, None);
 }
diff --git a/rust/ql/test/query-tests/security/CWE-770/CONSISTENCY/PathResolutionConsistency.expected b/rust/ql/test/query-tests/security/CWE-770/CONSISTENCY/PathResolutionConsistency.expected
index d3d59980e32..99dc5510ef3 100644
--- a/rust/ql/test/query-tests/security/CWE-770/CONSISTENCY/PathResolutionConsistency.expected
+++ b/rust/ql/test/query-tests/security/CWE-770/CONSISTENCY/PathResolutionConsistency.expected
@@ -13,3 +13,7 @@ multiplePathResolutions
 | main.rs:223:13:223:16 | libc | file://:0:0:0:0 | Crate(libc@0.2.172) |
 | main.rs:224:13:224:16 | libc | file://:0:0:0:0 | Crate(libc@0.2.172) |
 | main.rs:224:13:224:16 | libc | file://:0:0:0:0 | Crate(libc@0.2.172) |
+| main.rs:229:13:229:37 | ...::with_capacity | file://:0:0:0:0 | fn with_capacity |
+| main.rs:229:13:229:37 | ...::with_capacity | file://:0:0:0:0 | fn with_capacity |
+| main.rs:233:18:233:42 | ...::with_capacity | file://:0:0:0:0 | fn with_capacity |
+| main.rs:233:18:233:42 | ...::with_capacity | file://:0:0:0:0 | fn with_capacity |
diff --git a/rust/ql/test/query-tests/security/CWE-770/UncontrolledAllocationSize.expected b/rust/ql/test/query-tests/security/CWE-770/UncontrolledAllocationSize.expected
index 0e9acca98d7..54157a7f7d1 100644
--- a/rust/ql/test/query-tests/security/CWE-770/UncontrolledAllocationSize.expected
+++ b/rust/ql/test/query-tests/security/CWE-770/UncontrolledAllocationSize.expected
@@ -32,11 +32,17 @@
 | main.rs:169:17:169:33 | ...::alloc | main.rs:317:13:317:26 | ...::args | main.rs:169:17:169:33 | ...::alloc | This allocation size is derived from a $@ and could allocate arbitrary amounts of memory. | main.rs:317:13:317:26 | ...::args | user-provided value |
 | main.rs:177:13:177:29 | ...::alloc | main.rs:317:13:317:26 | ...::args | main.rs:177:13:177:29 | ...::alloc | This allocation size is derived from a $@ and could allocate arbitrary amounts of memory. | main.rs:317:13:317:26 | ...::args | user-provided value |
 | main.rs:193:32:193:36 | alloc | main.rs:317:13:317:26 | ...::args | main.rs:193:32:193:36 | alloc | This allocation size is derived from a $@ and could allocate arbitrary amounts of memory. | main.rs:317:13:317:26 | ...::args | user-provided value |
+| main.rs:193:32:193:36 | alloc | main.rs:317:13:317:26 | ...::args | main.rs:193:32:193:36 | alloc | This allocation size is derived from a $@ and could allocate arbitrary amounts of memory. | main.rs:317:13:317:26 | ...::args | user-provided value |
+| main.rs:194:32:194:43 | alloc_zeroed | main.rs:317:13:317:26 | ...::args | main.rs:194:32:194:43 | alloc_zeroed | This allocation size is derived from a $@ and could allocate arbitrary amounts of memory. | main.rs:317:13:317:26 | ...::args | user-provided value |
+| main.rs:194:32:194:43 | alloc_zeroed | main.rs:317:13:317:26 | ...::args | main.rs:194:32:194:43 | alloc_zeroed | This allocation size is derived from a $@ and could allocate arbitrary amounts of memory. | main.rs:317:13:317:26 | ...::args | user-provided value |
 | main.rs:194:32:194:43 | alloc_zeroed | main.rs:317:13:317:26 | ...::args | main.rs:194:32:194:43 | alloc_zeroed | This allocation size is derived from a $@ and could allocate arbitrary amounts of memory. | main.rs:317:13:317:26 | ...::args | user-provided value |
 | main.rs:195:32:195:39 | allocate | main.rs:317:13:317:26 | ...::args | main.rs:195:32:195:39 | allocate | This allocation size is derived from a $@ and could allocate arbitrary amounts of memory. | main.rs:317:13:317:26 | ...::args | user-provided value |
 | main.rs:196:32:196:46 | allocate_zeroed | main.rs:317:13:317:26 | ...::args | main.rs:196:32:196:46 | allocate_zeroed | This allocation size is derived from a $@ and could allocate arbitrary amounts of memory. | main.rs:317:13:317:26 | ...::args | user-provided value |
 | main.rs:197:32:197:39 | allocate | main.rs:317:13:317:26 | ...::args | main.rs:197:32:197:39 | allocate | This allocation size is derived from a $@ and could allocate arbitrary amounts of memory. | main.rs:317:13:317:26 | ...::args | user-provided value |
+| main.rs:197:32:197:39 | allocate | main.rs:317:13:317:26 | ...::args | main.rs:197:32:197:39 | allocate | This allocation size is derived from a $@ and could allocate arbitrary amounts of memory. | main.rs:317:13:317:26 | ...::args | user-provided value |
 | main.rs:198:32:198:46 | allocate_zeroed | main.rs:317:13:317:26 | ...::args | main.rs:198:32:198:46 | allocate_zeroed | This allocation size is derived from a $@ and could allocate arbitrary amounts of memory. | main.rs:317:13:317:26 | ...::args | user-provided value |
+| main.rs:198:32:198:46 | allocate_zeroed | main.rs:317:13:317:26 | ...::args | main.rs:198:32:198:46 | allocate_zeroed | This allocation size is derived from a $@ and could allocate arbitrary amounts of memory. | main.rs:317:13:317:26 | ...::args | user-provided value |
+| main.rs:202:32:202:38 | realloc | main.rs:317:13:317:26 | ...::args | main.rs:202:32:202:38 | realloc | This allocation size is derived from a $@ and could allocate arbitrary amounts of memory. | main.rs:317:13:317:26 | ...::args | user-provided value |
 | main.rs:208:40:208:43 | grow | main.rs:317:13:317:26 | ...::args | main.rs:208:40:208:43 | grow | This allocation size is derived from a $@ and could allocate arbitrary amounts of memory. | main.rs:317:13:317:26 | ...::args | user-provided value |
 | main.rs:210:40:210:50 | grow_zeroed | main.rs:317:13:317:26 | ...::args | main.rs:210:40:210:50 | grow_zeroed | This allocation size is derived from a $@ and could allocate arbitrary amounts of memory. | main.rs:317:13:317:26 | ...::args | user-provided value |
 | main.rs:219:13:219:24 | ...::malloc | main.rs:317:13:317:26 | ...::args | main.rs:219:13:219:24 | ...::malloc | This allocation size is derived from a $@ and could allocate arbitrary amounts of memory. | main.rs:317:13:317:26 | ...::args | user-provided value |
@@ -53,36 +59,36 @@ edges
 | main.rs:18:41:18:41 | v | main.rs:32:60:32:89 | ... * ... | provenance |  |
 | main.rs:18:41:18:41 | v | main.rs:35:9:35:10 | s6 | provenance |  |
 | main.rs:20:9:20:10 | l2 | main.rs:21:31:21:32 | l2 | provenance |  |
-| main.rs:20:14:20:54 | ...::from_size_align(...) [Ok] | main.rs:20:14:20:63 | ... .unwrap() | provenance | MaD:31 |
+| main.rs:20:14:20:54 | ...::from_size_align(...) [Ok] | main.rs:20:14:20:63 | ... .unwrap() | provenance | MaD:34 |
 | main.rs:20:14:20:63 | ... .unwrap() | main.rs:20:9:20:10 | l2 | provenance |  |
-| main.rs:20:50:20:50 | v | main.rs:20:14:20:54 | ...::from_size_align(...) [Ok] | provenance | MaD:23 |
+| main.rs:20:50:20:50 | v | main.rs:20:14:20:54 | ...::from_size_align(...) [Ok] | provenance | MaD:26 |
 | main.rs:21:31:21:32 | l2 | main.rs:21:13:21:29 | ...::alloc | provenance | MaD:3 Sink:MaD:3 |
-| main.rs:21:31:21:32 | l2 | main.rs:22:31:22:44 | l2.align_to(...) [Ok] | provenance | MaD:17 |
-| main.rs:21:31:21:32 | l2 | main.rs:23:31:23:44 | l2.align_to(...) [Ok] | provenance | MaD:17 |
+| main.rs:21:31:21:32 | l2 | main.rs:22:31:22:44 | l2.align_to(...) [Ok] | provenance | MaD:20 |
+| main.rs:21:31:21:32 | l2 | main.rs:23:31:23:44 | l2.align_to(...) [Ok] | provenance | MaD:20 |
 | main.rs:21:31:21:32 | l2 | main.rs:24:38:24:39 | l2 | provenance |  |
-| main.rs:22:31:22:44 | l2.align_to(...) [Ok] | main.rs:22:31:22:53 | ... .unwrap() | provenance | MaD:31 |
+| main.rs:22:31:22:44 | l2.align_to(...) [Ok] | main.rs:22:31:22:53 | ... .unwrap() | provenance | MaD:34 |
 | main.rs:22:31:22:53 | ... .unwrap() | main.rs:22:13:22:29 | ...::alloc | provenance | MaD:3 Sink:MaD:3 |
-| main.rs:23:31:23:44 | l2.align_to(...) [Ok] | main.rs:23:31:23:53 | ... .unwrap() | provenance | MaD:31 |
-| main.rs:23:31:23:53 | ... .unwrap() | main.rs:23:31:23:68 | ... .pad_to_align() | provenance | MaD:25 |
+| main.rs:23:31:23:44 | l2.align_to(...) [Ok] | main.rs:23:31:23:53 | ... .unwrap() | provenance | MaD:34 |
+| main.rs:23:31:23:53 | ... .unwrap() | main.rs:23:31:23:68 | ... .pad_to_align() | provenance | MaD:28 |
 | main.rs:23:31:23:68 | ... .pad_to_align() | main.rs:23:13:23:29 | ...::alloc | provenance | MaD:3 Sink:MaD:3 |
 | main.rs:24:38:24:39 | l2 | main.rs:24:13:24:36 | ...::alloc_zeroed | provenance | MaD:4 Sink:MaD:4 |
 | main.rs:29:9:29:10 | l4 | main.rs:30:31:30:32 | l4 | provenance |  |
 | main.rs:29:14:29:64 | ...::from_size_align_unchecked(...) | main.rs:29:9:29:10 | l4 | provenance |  |
-| main.rs:29:60:29:60 | v | main.rs:29:14:29:64 | ...::from_size_align_unchecked(...) | provenance | MaD:24 |
+| main.rs:29:60:29:60 | v | main.rs:29:14:29:64 | ...::from_size_align_unchecked(...) | provenance | MaD:27 |
 | main.rs:30:31:30:32 | l4 | main.rs:30:13:30:29 | ...::alloc | provenance | MaD:3 Sink:MaD:3 |
 | main.rs:32:9:32:10 | l5 | main.rs:33:31:33:32 | l5 | provenance |  |
 | main.rs:32:14:32:118 | ...::from_size_align_unchecked(...) | main.rs:32:9:32:10 | l5 | provenance |  |
-| main.rs:32:60:32:89 | ... * ... | main.rs:32:14:32:118 | ...::from_size_align_unchecked(...) | provenance | MaD:24 |
+| main.rs:32:60:32:89 | ... * ... | main.rs:32:14:32:118 | ...::from_size_align_unchecked(...) | provenance | MaD:27 |
 | main.rs:33:31:33:32 | l5 | main.rs:33:13:33:29 | ...::alloc | provenance | MaD:3 Sink:MaD:3 |
 | main.rs:35:9:35:10 | s6 | main.rs:36:60:36:61 | s6 | provenance |  |
 | main.rs:36:9:36:10 | l6 | main.rs:37:31:37:32 | l6 | provenance |  |
 | main.rs:36:14:36:65 | ...::from_size_align_unchecked(...) | main.rs:36:9:36:10 | l6 | provenance |  |
-| main.rs:36:60:36:61 | s6 | main.rs:36:14:36:65 | ...::from_size_align_unchecked(...) | provenance | MaD:24 |
+| main.rs:36:60:36:61 | s6 | main.rs:36:14:36:65 | ...::from_size_align_unchecked(...) | provenance | MaD:27 |
 | main.rs:37:31:37:32 | l6 | main.rs:37:13:37:29 | ...::alloc | provenance | MaD:3 Sink:MaD:3 |
-| main.rs:37:31:37:32 | l6 | main.rs:39:60:39:68 | l6.size() | provenance | MaD:28 |
+| main.rs:37:31:37:32 | l6 | main.rs:39:60:39:68 | l6.size() | provenance | MaD:31 |
 | main.rs:39:9:39:10 | l7 | main.rs:40:31:40:32 | l7 | provenance |  |
 | main.rs:39:14:39:72 | ...::from_size_align_unchecked(...) | main.rs:39:9:39:10 | l7 | provenance |  |
-| main.rs:39:60:39:68 | l6.size() | main.rs:39:14:39:72 | ...::from_size_align_unchecked(...) | provenance | MaD:24 |
+| main.rs:39:60:39:68 | l6.size() | main.rs:39:14:39:72 | ...::from_size_align_unchecked(...) | provenance | MaD:27 |
 | main.rs:40:31:40:32 | l7 | main.rs:40:13:40:29 | ...::alloc | provenance | MaD:3 Sink:MaD:3 |
 | main.rs:43:44:43:51 | ...: usize | main.rs:50:41:50:41 | v | provenance |  |
 | main.rs:43:44:43:51 | ...: usize | main.rs:51:41:51:45 | ... + ... | provenance |  |
@@ -90,56 +96,56 @@ edges
 | main.rs:43:44:43:51 | ...: usize | main.rs:54:48:54:53 | ... * ... | provenance |  |
 | main.rs:43:44:43:51 | ...: usize | main.rs:58:34:58:34 | v | provenance |  |
 | main.rs:43:44:43:51 | ...: usize | main.rs:67:46:67:46 | v | provenance |  |
-| main.rs:50:31:50:42 | l2.repeat(...) [Ok, tuple.0] | main.rs:50:31:50:51 | ... .unwrap() [tuple.0] | provenance | MaD:31 |
+| main.rs:50:31:50:42 | l2.repeat(...) [Ok, tuple.0] | main.rs:50:31:50:51 | ... .unwrap() [tuple.0] | provenance | MaD:34 |
 | main.rs:50:31:50:51 | ... .unwrap() [tuple.0] | main.rs:50:31:50:53 | ... .0 | provenance |  |
 | main.rs:50:31:50:53 | ... .0 | main.rs:50:13:50:29 | ...::alloc | provenance | MaD:3 Sink:MaD:3 |
-| main.rs:50:41:50:41 | v | main.rs:50:31:50:42 | l2.repeat(...) [Ok, tuple.0] | provenance | MaD:26 |
-| main.rs:51:31:51:46 | l2.repeat(...) [Ok, tuple.0] | main.rs:51:31:51:55 | ... .unwrap() [tuple.0] | provenance | MaD:31 |
+| main.rs:50:41:50:41 | v | main.rs:50:31:50:42 | l2.repeat(...) [Ok, tuple.0] | provenance | MaD:29 |
+| main.rs:51:31:51:46 | l2.repeat(...) [Ok, tuple.0] | main.rs:51:31:51:55 | ... .unwrap() [tuple.0] | provenance | MaD:34 |
 | main.rs:51:31:51:55 | ... .unwrap() [tuple.0] | main.rs:51:31:51:57 | ... .0 | provenance |  |
 | main.rs:51:31:51:57 | ... .0 | main.rs:51:13:51:29 | ...::alloc | provenance | MaD:3 Sink:MaD:3 |
-| main.rs:51:41:51:45 | ... + ... | main.rs:51:31:51:46 | l2.repeat(...) [Ok, tuple.0] | provenance | MaD:26 |
-| main.rs:53:31:53:49 | l2.repeat_packed(...) [Ok] | main.rs:53:31:53:58 | ... .unwrap() | provenance | MaD:31 |
+| main.rs:51:41:51:45 | ... + ... | main.rs:51:31:51:46 | l2.repeat(...) [Ok, tuple.0] | provenance | MaD:29 |
+| main.rs:53:31:53:49 | l2.repeat_packed(...) [Ok] | main.rs:53:31:53:58 | ... .unwrap() | provenance | MaD:34 |
 | main.rs:53:31:53:58 | ... .unwrap() | main.rs:53:13:53:29 | ...::alloc | provenance | MaD:3 Sink:MaD:3 |
-| main.rs:53:48:53:48 | v | main.rs:53:31:53:49 | l2.repeat_packed(...) [Ok] | provenance | MaD:27 |
-| main.rs:54:31:54:54 | l2.repeat_packed(...) [Ok] | main.rs:54:31:54:63 | ... .unwrap() | provenance | MaD:31 |
+| main.rs:53:48:53:48 | v | main.rs:53:31:53:49 | l2.repeat_packed(...) [Ok] | provenance | MaD:30 |
+| main.rs:54:31:54:54 | l2.repeat_packed(...) [Ok] | main.rs:54:31:54:63 | ... .unwrap() | provenance | MaD:34 |
 | main.rs:54:31:54:63 | ... .unwrap() | main.rs:54:13:54:29 | ...::alloc | provenance | MaD:3 Sink:MaD:3 |
-| main.rs:54:48:54:53 | ... * ... | main.rs:54:31:54:54 | l2.repeat_packed(...) [Ok] | provenance | MaD:27 |
+| main.rs:54:48:54:53 | ... * ... | main.rs:54:31:54:54 | l2.repeat_packed(...) [Ok] | provenance | MaD:30 |
 | main.rs:58:9:58:20 | TuplePat [tuple.0] | main.rs:58:10:58:11 | k1 | provenance |  |
 | main.rs:58:10:58:11 | k1 | main.rs:59:31:59:32 | k1 | provenance |  |
-| main.rs:58:24:58:35 | l3.repeat(...) [Ok, tuple.0] | main.rs:58:24:58:66 | ... .expect(...) [tuple.0] | provenance | MaD:30 |
+| main.rs:58:24:58:35 | l3.repeat(...) [Ok, tuple.0] | main.rs:58:24:58:66 | ... .expect(...) [tuple.0] | provenance | MaD:33 |
 | main.rs:58:24:58:66 | ... .expect(...) [tuple.0] | main.rs:58:9:58:20 | TuplePat [tuple.0] | provenance |  |
-| main.rs:58:34:58:34 | v | main.rs:58:24:58:35 | l3.repeat(...) [Ok, tuple.0] | provenance | MaD:26 |
+| main.rs:58:34:58:34 | v | main.rs:58:24:58:35 | l3.repeat(...) [Ok, tuple.0] | provenance | MaD:29 |
 | main.rs:59:31:59:32 | k1 | main.rs:59:13:59:29 | ...::alloc | provenance | MaD:3 Sink:MaD:3 |
 | main.rs:59:31:59:32 | k1 | main.rs:60:34:60:35 | k1 | provenance |  |
-| main.rs:59:31:59:32 | k1 | main.rs:62:24:62:36 | k1.extend(...) [Ok, tuple.0] | provenance | MaD:20 |
+| main.rs:59:31:59:32 | k1 | main.rs:62:24:62:36 | k1.extend(...) [Ok, tuple.0] | provenance | MaD:23 |
 | main.rs:59:31:59:32 | k1 | main.rs:64:48:64:49 | k1 | provenance |  |
-| main.rs:59:31:59:32 | k1 | main.rs:65:31:65:50 | k1.extend_packed(...) [Ok] | provenance | MaD:22 |
+| main.rs:59:31:59:32 | k1 | main.rs:65:31:65:50 | k1.extend_packed(...) [Ok] | provenance | MaD:25 |
 | main.rs:60:9:60:20 | TuplePat [tuple.0] | main.rs:60:10:60:11 | k2 | provenance |  |
 | main.rs:60:10:60:11 | k2 | main.rs:61:31:61:32 | k2 | provenance |  |
-| main.rs:60:24:60:36 | l3.extend(...) [Ok, tuple.0] | main.rs:60:24:60:45 | ... .unwrap() [tuple.0] | provenance | MaD:31 |
+| main.rs:60:24:60:36 | l3.extend(...) [Ok, tuple.0] | main.rs:60:24:60:45 | ... .unwrap() [tuple.0] | provenance | MaD:34 |
 | main.rs:60:24:60:45 | ... .unwrap() [tuple.0] | main.rs:60:9:60:20 | TuplePat [tuple.0] | provenance |  |
-| main.rs:60:34:60:35 | k1 | main.rs:60:24:60:36 | l3.extend(...) [Ok, tuple.0] | provenance | MaD:19 |
+| main.rs:60:34:60:35 | k1 | main.rs:60:24:60:36 | l3.extend(...) [Ok, tuple.0] | provenance | MaD:22 |
 | main.rs:61:31:61:32 | k2 | main.rs:61:13:61:29 | ...::alloc | provenance | MaD:3 Sink:MaD:3 |
 | main.rs:62:9:62:20 | TuplePat [tuple.0] | main.rs:62:10:62:11 | k3 | provenance |  |
 | main.rs:62:10:62:11 | k3 | main.rs:63:31:63:32 | k3 | provenance |  |
-| main.rs:62:24:62:36 | k1.extend(...) [Ok, tuple.0] | main.rs:62:24:62:45 | ... .unwrap() [tuple.0] | provenance | MaD:31 |
+| main.rs:62:24:62:36 | k1.extend(...) [Ok, tuple.0] | main.rs:62:24:62:45 | ... .unwrap() [tuple.0] | provenance | MaD:34 |
 | main.rs:62:24:62:45 | ... .unwrap() [tuple.0] | main.rs:62:9:62:20 | TuplePat [tuple.0] | provenance |  |
 | main.rs:63:31:63:32 | k3 | main.rs:63:13:63:29 | ...::alloc | provenance | MaD:3 Sink:MaD:3 |
-| main.rs:64:31:64:50 | l3.extend_packed(...) [Ok] | main.rs:64:31:64:59 | ... .unwrap() | provenance | MaD:31 |
+| main.rs:64:31:64:50 | l3.extend_packed(...) [Ok] | main.rs:64:31:64:59 | ... .unwrap() | provenance | MaD:34 |
 | main.rs:64:31:64:59 | ... .unwrap() | main.rs:64:13:64:29 | ...::alloc | provenance | MaD:3 Sink:MaD:3 |
-| main.rs:64:48:64:49 | k1 | main.rs:64:31:64:50 | l3.extend_packed(...) [Ok] | provenance | MaD:21 |
-| main.rs:65:31:65:50 | k1.extend_packed(...) [Ok] | main.rs:65:31:65:59 | ... .unwrap() | provenance | MaD:31 |
+| main.rs:64:48:64:49 | k1 | main.rs:64:31:64:50 | l3.extend_packed(...) [Ok] | provenance | MaD:24 |
+| main.rs:65:31:65:50 | k1.extend_packed(...) [Ok] | main.rs:65:31:65:59 | ... .unwrap() | provenance | MaD:34 |
 | main.rs:65:31:65:59 | ... .unwrap() | main.rs:65:13:65:29 | ...::alloc | provenance | MaD:3 Sink:MaD:3 |
 | main.rs:67:9:67:10 | l4 | main.rs:68:31:68:32 | l4 | provenance |  |
-| main.rs:67:14:67:47 | ...::array::<...>(...) [Ok] | main.rs:67:14:67:56 | ... .unwrap() | provenance | MaD:31 |
+| main.rs:67:14:67:47 | ...::array::<...>(...) [Ok] | main.rs:67:14:67:56 | ... .unwrap() | provenance | MaD:34 |
 | main.rs:67:14:67:56 | ... .unwrap() | main.rs:67:9:67:10 | l4 | provenance |  |
-| main.rs:67:46:67:46 | v | main.rs:67:14:67:47 | ...::array::<...>(...) [Ok] | provenance | MaD:18 |
+| main.rs:67:46:67:46 | v | main.rs:67:14:67:47 | ...::array::<...>(...) [Ok] | provenance | MaD:21 |
 | main.rs:68:31:68:32 | l4 | main.rs:68:13:68:29 | ...::alloc | provenance | MaD:3 Sink:MaD:3 |
 | main.rs:86:35:86:42 | ...: usize | main.rs:87:54:87:54 | v | provenance |  |
 | main.rs:87:9:87:14 | layout | main.rs:88:31:88:36 | layout | provenance |  |
-| main.rs:87:18:87:58 | ...::from_size_align(...) [Ok] | main.rs:87:18:87:67 | ... .unwrap() | provenance | MaD:31 |
+| main.rs:87:18:87:58 | ...::from_size_align(...) [Ok] | main.rs:87:18:87:67 | ... .unwrap() | provenance | MaD:34 |
 | main.rs:87:18:87:67 | ... .unwrap() | main.rs:87:9:87:14 | layout | provenance |  |
-| main.rs:87:54:87:54 | v | main.rs:87:18:87:58 | ...::from_size_align(...) [Ok] | provenance | MaD:23 |
+| main.rs:87:54:87:54 | v | main.rs:87:18:87:58 | ...::from_size_align(...) [Ok] | provenance | MaD:26 |
 | main.rs:88:31:88:36 | layout | main.rs:88:13:88:29 | ...::alloc | provenance | MaD:3 Sink:MaD:3 |
 | main.rs:91:38:91:45 | ...: usize | main.rs:92:47:92:47 | v | provenance |  |
 | main.rs:91:38:91:45 | ...: usize | main.rs:101:51:101:51 | v | provenance |  |
@@ -150,16 +156,16 @@ edges
 | main.rs:91:38:91:45 | ...: usize | main.rs:161:55:161:55 | v | provenance |  |
 | main.rs:92:9:92:10 | l1 | main.rs:96:35:96:36 | l1 | provenance |  |
 | main.rs:92:9:92:10 | l1 | main.rs:102:35:102:36 | l1 | provenance |  |
-| main.rs:92:14:92:48 | ...::array::<...>(...) [Ok] | main.rs:92:14:92:57 | ... .unwrap() | provenance | MaD:31 |
+| main.rs:92:14:92:48 | ...::array::<...>(...) [Ok] | main.rs:92:14:92:57 | ... .unwrap() | provenance | MaD:34 |
 | main.rs:92:14:92:57 | ... .unwrap() | main.rs:92:9:92:10 | l1 | provenance |  |
-| main.rs:92:47:92:47 | v | main.rs:92:14:92:48 | ...::array::<...>(...) [Ok] | provenance | MaD:18 |
+| main.rs:92:47:92:47 | v | main.rs:92:14:92:48 | ...::array::<...>(...) [Ok] | provenance | MaD:21 |
 | main.rs:96:35:96:36 | l1 | main.rs:96:17:96:33 | ...::alloc | provenance | MaD:3 Sink:MaD:3 |
 | main.rs:96:35:96:36 | l1 | main.rs:109:35:109:36 | l1 | provenance |  |
 | main.rs:96:35:96:36 | l1 | main.rs:111:35:111:36 | l1 | provenance |  |
 | main.rs:101:13:101:14 | l3 | main.rs:103:35:103:36 | l3 | provenance |  |
-| main.rs:101:18:101:52 | ...::array::<...>(...) [Ok] | main.rs:101:18:101:61 | ... .unwrap() | provenance | MaD:31 |
+| main.rs:101:18:101:52 | ...::array::<...>(...) [Ok] | main.rs:101:18:101:61 | ... .unwrap() | provenance | MaD:34 |
 | main.rs:101:18:101:61 | ... .unwrap() | main.rs:101:13:101:14 | l3 | provenance |  |
-| main.rs:101:51:101:51 | v | main.rs:101:18:101:52 | ...::array::<...>(...) [Ok] | provenance | MaD:18 |
+| main.rs:101:51:101:51 | v | main.rs:101:18:101:52 | ...::array::<...>(...) [Ok] | provenance | MaD:21 |
 | main.rs:102:35:102:36 | l1 | main.rs:102:17:102:33 | ...::alloc | provenance | MaD:3 Sink:MaD:3 |
 | main.rs:102:35:102:36 | l1 | main.rs:109:35:109:36 | l1 | provenance |  |
 | main.rs:102:35:102:36 | l1 | main.rs:111:35:111:36 | l1 | provenance |  |
@@ -170,85 +176,92 @@ edges
 | main.rs:111:35:111:36 | l1 | main.rs:111:17:111:33 | ...::alloc | provenance | MaD:3 Sink:MaD:3 |
 | main.rs:111:35:111:36 | l1 | main.rs:146:35:146:36 | l1 | provenance |  |
 | main.rs:145:13:145:14 | l9 | main.rs:148:35:148:36 | l9 | provenance |  |
-| main.rs:145:18:145:52 | ...::array::<...>(...) [Ok] | main.rs:145:18:145:61 | ... .unwrap() | provenance | MaD:31 |
+| main.rs:145:18:145:52 | ...::array::<...>(...) [Ok] | main.rs:145:18:145:61 | ... .unwrap() | provenance | MaD:34 |
 | main.rs:145:18:145:61 | ... .unwrap() | main.rs:145:13:145:14 | l9 | provenance |  |
-| main.rs:145:51:145:51 | v | main.rs:145:18:145:52 | ...::array::<...>(...) [Ok] | provenance | MaD:18 |
+| main.rs:145:51:145:51 | v | main.rs:145:18:145:52 | ...::array::<...>(...) [Ok] | provenance | MaD:21 |
 | main.rs:146:35:146:36 | l1 | main.rs:146:17:146:33 | ...::alloc | provenance | MaD:3 Sink:MaD:3 |
 | main.rs:146:35:146:36 | l1 | main.rs:177:31:177:32 | l1 | provenance |  |
 | main.rs:148:35:148:36 | l9 | main.rs:148:17:148:33 | ...::alloc | provenance | MaD:3 Sink:MaD:3 |
 | main.rs:151:9:151:11 | l10 | main.rs:152:31:152:33 | l10 | provenance |  |
-| main.rs:151:15:151:69 | ...::array::<...>(...) [Ok] | main.rs:151:15:151:78 | ... .unwrap() | provenance | MaD:31 |
+| main.rs:151:15:151:69 | ...::array::<...>(...) [Ok] | main.rs:151:15:151:78 | ... .unwrap() | provenance | MaD:34 |
 | main.rs:151:15:151:78 | ... .unwrap() | main.rs:151:9:151:11 | l10 | provenance |  |
-| main.rs:151:48:151:68 | ...::min(...) | main.rs:151:15:151:69 | ...::array::<...>(...) [Ok] | provenance | MaD:18 |
-| main.rs:151:62:151:62 | v | main.rs:151:48:151:68 | ...::min(...) | provenance | MaD:34 |
+| main.rs:151:48:151:68 | ...::min(...) | main.rs:151:15:151:69 | ...::array::<...>(...) [Ok] | provenance | MaD:21 |
+| main.rs:151:62:151:62 | v | main.rs:151:48:151:68 | ...::min(...) | provenance | MaD:37 |
 | main.rs:152:31:152:33 | l10 | main.rs:152:13:152:29 | ...::alloc | provenance | MaD:3 Sink:MaD:3 |
 | main.rs:154:9:154:11 | l11 | main.rs:155:31:155:33 | l11 | provenance |  |
-| main.rs:154:15:154:69 | ...::array::<...>(...) [Ok] | main.rs:154:15:154:78 | ... .unwrap() | provenance | MaD:31 |
+| main.rs:154:15:154:69 | ...::array::<...>(...) [Ok] | main.rs:154:15:154:78 | ... .unwrap() | provenance | MaD:34 |
 | main.rs:154:15:154:78 | ... .unwrap() | main.rs:154:9:154:11 | l11 | provenance |  |
-| main.rs:154:48:154:68 | ...::max(...) | main.rs:154:15:154:69 | ...::array::<...>(...) [Ok] | provenance | MaD:18 |
-| main.rs:154:62:154:62 | v | main.rs:154:48:154:68 | ...::max(...) | provenance | MaD:33 |
+| main.rs:154:48:154:68 | ...::max(...) | main.rs:154:15:154:69 | ...::array::<...>(...) [Ok] | provenance | MaD:21 |
+| main.rs:154:62:154:62 | v | main.rs:154:48:154:68 | ...::max(...) | provenance | MaD:36 |
 | main.rs:155:31:155:33 | l11 | main.rs:155:13:155:29 | ...::alloc | provenance | MaD:3 Sink:MaD:3 |
 | main.rs:161:13:161:15 | l13 | main.rs:162:35:162:37 | l13 | provenance |  |
-| main.rs:161:19:161:59 | ...::from_size_align(...) [Ok] | main.rs:161:19:161:68 | ... .unwrap() | provenance | MaD:31 |
+| main.rs:161:19:161:59 | ...::from_size_align(...) [Ok] | main.rs:161:19:161:68 | ... .unwrap() | provenance | MaD:34 |
 | main.rs:161:19:161:68 | ... .unwrap() | main.rs:161:13:161:15 | l13 | provenance |  |
-| main.rs:161:55:161:55 | v | main.rs:161:19:161:59 | ...::from_size_align(...) [Ok] | provenance | MaD:23 |
+| main.rs:161:55:161:55 | v | main.rs:161:19:161:59 | ...::from_size_align(...) [Ok] | provenance | MaD:26 |
 | main.rs:162:35:162:37 | l13 | main.rs:162:17:162:33 | ...::alloc | provenance | MaD:3 Sink:MaD:3 |
 | main.rs:162:35:162:37 | l13 | main.rs:169:35:169:37 | l13 | provenance |  |
 | main.rs:169:35:169:37 | l13 | main.rs:169:17:169:33 | ...::alloc | provenance | MaD:3 Sink:MaD:3 |
 | main.rs:177:31:177:32 | l1 | main.rs:177:13:177:29 | ...::alloc | provenance | MaD:3 Sink:MaD:3 |
 | main.rs:183:29:183:36 | ...: usize | main.rs:192:46:192:46 | v | provenance |  |
+| main.rs:183:29:183:36 | ...: usize | main.rs:202:48:202:48 | v | provenance |  |
 | main.rs:192:9:192:10 | l2 | main.rs:193:38:193:39 | l2 | provenance |  |
-| main.rs:192:14:192:47 | ...::array::<...>(...) [Ok] | main.rs:192:14:192:56 | ... .unwrap() | provenance | MaD:31 |
+| main.rs:192:14:192:47 | ...::array::<...>(...) [Ok] | main.rs:192:14:192:56 | ... .unwrap() | provenance | MaD:34 |
 | main.rs:192:14:192:56 | ... .unwrap() | main.rs:192:9:192:10 | l2 | provenance |  |
-| main.rs:192:46:192:46 | v | main.rs:192:14:192:47 | ...::array::<...>(...) [Ok] | provenance | MaD:18 |
+| main.rs:192:46:192:46 | v | main.rs:192:14:192:47 | ...::array::<...>(...) [Ok] | provenance | MaD:21 |
 | main.rs:193:38:193:39 | l2 | main.rs:193:32:193:36 | alloc | provenance | MaD:10 Sink:MaD:10 |
+| main.rs:193:38:193:39 | l2 | main.rs:193:32:193:36 | alloc | provenance | MaD:11 Sink:MaD:11 |
 | main.rs:193:38:193:39 | l2 | main.rs:194:45:194:46 | l2 | provenance |  |
-| main.rs:194:45:194:46 | l2 | main.rs:194:32:194:43 | alloc_zeroed | provenance | MaD:11 Sink:MaD:11 |
+| main.rs:194:45:194:46 | l2 | main.rs:194:32:194:43 | alloc_zeroed | provenance | MaD:12 Sink:MaD:12 |
+| main.rs:194:45:194:46 | l2 | main.rs:194:32:194:43 | alloc_zeroed | provenance | MaD:12 Sink:MaD:12 |
+| main.rs:194:45:194:46 | l2 | main.rs:194:32:194:43 | alloc_zeroed | provenance | MaD:13 Sink:MaD:13 |
 | main.rs:194:45:194:46 | l2 | main.rs:195:41:195:42 | l2 | provenance |  |
 | main.rs:195:41:195:42 | l2 | main.rs:195:32:195:39 | allocate | provenance | MaD:6 Sink:MaD:6 |
 | main.rs:195:41:195:42 | l2 | main.rs:196:48:196:49 | l2 | provenance |  |
 | main.rs:196:48:196:49 | l2 | main.rs:196:32:196:46 | allocate_zeroed | provenance | MaD:7 Sink:MaD:7 |
 | main.rs:196:48:196:49 | l2 | main.rs:197:41:197:42 | l2 | provenance |  |
 | main.rs:197:41:197:42 | l2 | main.rs:197:32:197:39 | allocate | provenance | MaD:1 Sink:MaD:1 |
+| main.rs:197:41:197:42 | l2 | main.rs:197:32:197:39 | allocate | provenance | MaD:1 Sink:MaD:1 |
 | main.rs:197:41:197:42 | l2 | main.rs:198:48:198:49 | l2 | provenance |  |
 | main.rs:198:48:198:49 | l2 | main.rs:198:32:198:46 | allocate_zeroed | provenance | MaD:2 Sink:MaD:2 |
+| main.rs:198:48:198:49 | l2 | main.rs:198:32:198:46 | allocate_zeroed | provenance | MaD:2 Sink:MaD:2 |
 | main.rs:198:48:198:49 | l2 | main.rs:208:53:208:54 | l2 | provenance |  |
 | main.rs:198:48:198:49 | l2 | main.rs:210:60:210:61 | l2 | provenance |  |
+| main.rs:202:48:202:48 | v | main.rs:202:32:202:38 | realloc | provenance | MaD:14 Sink:MaD:14 |
 | main.rs:208:53:208:54 | l2 | main.rs:208:40:208:43 | grow | provenance | MaD:8 Sink:MaD:8 |
 | main.rs:210:60:210:61 | l2 | main.rs:210:40:210:50 | grow_zeroed | provenance | MaD:9 Sink:MaD:9 |
 | main.rs:217:27:217:34 | ...: usize | main.rs:219:26:219:26 | v | provenance |  |
-| main.rs:219:26:219:26 | v | main.rs:219:13:219:24 | ...::malloc | provenance | MaD:14 Sink:MaD:14 |
+| main.rs:219:26:219:26 | v | main.rs:219:13:219:24 | ...::malloc | provenance | MaD:17 Sink:MaD:17 |
 | main.rs:219:26:219:26 | v | main.rs:220:36:220:36 | v | provenance |  |
-| main.rs:220:36:220:36 | v | main.rs:220:13:220:31 | ...::aligned_alloc | provenance | MaD:12 Sink:MaD:12 |
+| main.rs:220:36:220:36 | v | main.rs:220:13:220:31 | ...::aligned_alloc | provenance | MaD:15 Sink:MaD:15 |
 | main.rs:220:36:220:36 | v | main.rs:222:30:222:30 | v | provenance |  |
-| main.rs:222:30:222:30 | v | main.rs:222:13:222:24 | ...::calloc | provenance | MaD:13 Sink:MaD:13 |
+| main.rs:222:30:222:30 | v | main.rs:222:13:222:24 | ...::calloc | provenance | MaD:16 Sink:MaD:16 |
 | main.rs:222:30:222:30 | v | main.rs:223:26:223:26 | v | provenance |  |
-| main.rs:223:26:223:26 | v | main.rs:223:13:223:24 | ...::calloc | provenance | MaD:13 Sink:MaD:13 |
+| main.rs:223:26:223:26 | v | main.rs:223:13:223:24 | ...::calloc | provenance | MaD:16 Sink:MaD:16 |
 | main.rs:223:26:223:26 | v | main.rs:224:31:224:31 | v | provenance |  |
-| main.rs:224:31:224:31 | v | main.rs:224:13:224:25 | ...::realloc | provenance | MaD:15 Sink:MaD:15 |
-| main.rs:279:24:279:41 | ...: String | main.rs:280:21:280:47 | user_input.parse() [Ok] | provenance | MaD:32 |
+| main.rs:224:31:224:31 | v | main.rs:224:13:224:25 | ...::realloc | provenance | MaD:18 Sink:MaD:18 |
+| main.rs:279:24:279:41 | ...: String | main.rs:280:21:280:47 | user_input.parse() [Ok] | provenance | MaD:35 |
 | main.rs:280:9:280:17 | num_bytes | main.rs:282:54:282:62 | num_bytes | provenance |  |
 | main.rs:280:21:280:47 | user_input.parse() [Ok] | main.rs:280:21:280:48 | TryExpr | provenance |  |
 | main.rs:280:21:280:48 | TryExpr | main.rs:280:9:280:17 | num_bytes | provenance |  |
 | main.rs:282:9:282:14 | layout | main.rs:284:40:284:45 | layout | provenance |  |
-| main.rs:282:18:282:66 | ...::from_size_align(...) [Ok] | main.rs:282:18:282:75 | ... .unwrap() | provenance | MaD:31 |
+| main.rs:282:18:282:66 | ...::from_size_align(...) [Ok] | main.rs:282:18:282:75 | ... .unwrap() | provenance | MaD:34 |
 | main.rs:282:18:282:75 | ... .unwrap() | main.rs:282:9:282:14 | layout | provenance |  |
-| main.rs:282:54:282:62 | num_bytes | main.rs:282:18:282:66 | ...::from_size_align(...) [Ok] | provenance | MaD:23 |
+| main.rs:282:54:282:62 | num_bytes | main.rs:282:18:282:66 | ...::from_size_align(...) [Ok] | provenance | MaD:26 |
 | main.rs:284:40:284:45 | layout | main.rs:284:22:284:38 | ...::alloc | provenance | MaD:3 Sink:MaD:3 |
-| main.rs:308:25:308:38 | ...::args | main.rs:308:25:308:40 | ...::args(...) [element] | provenance | Src:MaD:16  |
-| main.rs:308:25:308:40 | ...::args(...) [element] | main.rs:308:25:308:47 | ... .nth(...) [Some] | provenance | MaD:35 |
-| main.rs:308:25:308:47 | ... .nth(...) [Some] | main.rs:308:25:308:74 | ... .unwrap_or(...) | provenance | MaD:29 |
+| main.rs:308:25:308:38 | ...::args | main.rs:308:25:308:40 | ...::args(...) [element] | provenance | Src:MaD:19  |
+| main.rs:308:25:308:40 | ...::args(...) [element] | main.rs:308:25:308:47 | ... .nth(...) [Some] | provenance | MaD:38 |
+| main.rs:308:25:308:47 | ... .nth(...) [Some] | main.rs:308:25:308:74 | ... .unwrap_or(...) | provenance | MaD:32 |
 | main.rs:308:25:308:74 | ... .unwrap_or(...) | main.rs:279:24:279:41 | ...: String | provenance |  |
 | main.rs:317:9:317:9 | v | main.rs:320:34:320:34 | v | provenance |  |
 | main.rs:317:9:317:9 | v | main.rs:321:42:321:42 | v | provenance |  |
 | main.rs:317:9:317:9 | v | main.rs:322:36:322:36 | v | provenance |  |
 | main.rs:317:9:317:9 | v | main.rs:323:27:323:27 | v | provenance |  |
 | main.rs:317:9:317:9 | v | main.rs:324:25:324:25 | v | provenance |  |
-| main.rs:317:13:317:26 | ...::args | main.rs:317:13:317:28 | ...::args(...) [element] | provenance | Src:MaD:16  |
-| main.rs:317:13:317:28 | ...::args(...) [element] | main.rs:317:13:317:35 | ... .nth(...) [Some] | provenance | MaD:35 |
-| main.rs:317:13:317:35 | ... .nth(...) [Some] | main.rs:317:13:317:65 | ... .unwrap_or(...) | provenance | MaD:29 |
-| main.rs:317:13:317:65 | ... .unwrap_or(...) | main.rs:317:13:317:82 | ... .parse() [Ok] | provenance | MaD:32 |
-| main.rs:317:13:317:82 | ... .parse() [Ok] | main.rs:317:13:317:91 | ... .unwrap() | provenance | MaD:31 |
+| main.rs:317:13:317:26 | ...::args | main.rs:317:13:317:28 | ...::args(...) [element] | provenance | Src:MaD:19  |
+| main.rs:317:13:317:28 | ...::args(...) [element] | main.rs:317:13:317:35 | ... .nth(...) [Some] | provenance | MaD:38 |
+| main.rs:317:13:317:35 | ... .nth(...) [Some] | main.rs:317:13:317:65 | ... .unwrap_or(...) | provenance | MaD:32 |
+| main.rs:317:13:317:65 | ... .unwrap_or(...) | main.rs:317:13:317:82 | ... .parse() [Ok] | provenance | MaD:35 |
+| main.rs:317:13:317:82 | ... .parse() [Ok] | main.rs:317:13:317:91 | ... .unwrap() | provenance | MaD:34 |
 | main.rs:317:13:317:91 | ... .unwrap() | main.rs:317:9:317:9 | v | provenance |  |
 | main.rs:320:34:320:34 | v | main.rs:12:36:12:43 | ...: usize | provenance |  |
 | main.rs:321:42:321:42 | v | main.rs:43:44:43:51 | ...: usize | provenance |  |
@@ -266,31 +279,34 @@ models
 | 8 | Sink: lang:std; <crate::alloc::System as crate::alloc::Allocator>::grow; alloc-layout; Argument[2] |
 | 9 | Sink: lang:std; <crate::alloc::System as crate::alloc::Allocator>::grow_zeroed; alloc-layout; Argument[2] |
 | 10 | Sink: lang:std; <crate::alloc::System as crate::alloc::global::GlobalAlloc>::alloc; alloc-layout; Argument[0] |
-| 11 | Sink: lang:std; <crate::alloc::System as crate::alloc::global::GlobalAlloc>::alloc_zeroed; alloc-layout; Argument[0] |
-| 12 | Sink: repo:https://github.com/rust-lang/libc:libc; ::aligned_alloc; alloc-size; Argument[1] |
-| 13 | Sink: repo:https://github.com/rust-lang/libc:libc; ::calloc; alloc-size; Argument[0,1] |
-| 14 | Sink: repo:https://github.com/rust-lang/libc:libc; ::malloc; alloc-size; Argument[0] |
-| 15 | Sink: repo:https://github.com/rust-lang/libc:libc; ::realloc; alloc-size; Argument[1] |
-| 16 | Source: lang:std; crate::env::args; commandargs; ReturnValue.Element |
-| 17 | Summary: lang:core; <crate::alloc::layout::Layout>::align_to; Argument[self]; ReturnValue.Field[crate::result::Result::Ok(0)]; taint |
-| 18 | Summary: lang:core; <crate::alloc::layout::Layout>::array; Argument[0]; ReturnValue.Field[crate::result::Result::Ok(0)]; taint |
-| 19 | Summary: lang:core; <crate::alloc::layout::Layout>::extend; Argument[0]; ReturnValue.Field[crate::result::Result::Ok(0)].Field[0]; taint |
-| 20 | Summary: lang:core; <crate::alloc::layout::Layout>::extend; Argument[self]; ReturnValue.Field[crate::result::Result::Ok(0)].Field[0]; taint |
-| 21 | Summary: lang:core; <crate::alloc::layout::Layout>::extend_packed; Argument[0]; ReturnValue.Field[crate::result::Result::Ok(0)]; taint |
-| 22 | Summary: lang:core; <crate::alloc::layout::Layout>::extend_packed; Argument[self]; ReturnValue.Field[crate::result::Result::Ok(0)]; taint |
-| 23 | Summary: lang:core; <crate::alloc::layout::Layout>::from_size_align; Argument[0]; ReturnValue.Field[crate::result::Result::Ok(0)]; taint |
-| 24 | Summary: lang:core; <crate::alloc::layout::Layout>::from_size_align_unchecked; Argument[0]; ReturnValue; taint |
-| 25 | Summary: lang:core; <crate::alloc::layout::Layout>::pad_to_align; Argument[self]; ReturnValue; taint |
-| 26 | Summary: lang:core; <crate::alloc::layout::Layout>::repeat; Argument[0]; ReturnValue.Field[crate::result::Result::Ok(0)].Field[0]; taint |
-| 27 | Summary: lang:core; <crate::alloc::layout::Layout>::repeat_packed; Argument[0]; ReturnValue.Field[crate::result::Result::Ok(0)]; taint |
-| 28 | Summary: lang:core; <crate::alloc::layout::Layout>::size; Argument[self]; ReturnValue; taint |
-| 29 | Summary: lang:core; <crate::option::Option>::unwrap_or; Argument[self].Field[crate::option::Option::Some(0)]; ReturnValue; value |
-| 30 | Summary: lang:core; <crate::result::Result>::expect; Argument[self].Field[crate::result::Result::Ok(0)]; ReturnValue; value |
-| 31 | Summary: lang:core; <crate::result::Result>::unwrap; Argument[self].Field[crate::result::Result::Ok(0)]; ReturnValue; value |
-| 32 | Summary: lang:core; <str>::parse; Argument[self]; ReturnValue.Field[crate::result::Result::Ok(0)]; taint |
-| 33 | Summary: lang:core; crate::cmp::max; Argument[0]; ReturnValue; value |
-| 34 | Summary: lang:core; crate::cmp::min; Argument[0]; ReturnValue; value |
-| 35 | Summary: lang:core; crate::iter::traits::iterator::Iterator::nth; Argument[self].Element; ReturnValue.Field[crate::option::Option::Some(0)]; value |
+| 11 | Sink: lang:std; <crate::alloc::System as crate::alloc::global::GlobalAlloc>::alloc; alloc-size; Argument[0] |
+| 12 | Sink: lang:std; <crate::alloc::System as crate::alloc::global::GlobalAlloc>::alloc_zeroed; alloc-layout; Argument[0] |
+| 13 | Sink: lang:std; <crate::alloc::System as crate::alloc::global::GlobalAlloc>::alloc_zeroed; alloc-size; Argument[0] |
+| 14 | Sink: lang:std; <crate::alloc::System as crate::alloc::global::GlobalAlloc>::realloc; alloc-size; Argument[2] |
+| 15 | Sink: repo:https://github.com/rust-lang/libc:libc; ::aligned_alloc; alloc-size; Argument[1] |
+| 16 | Sink: repo:https://github.com/rust-lang/libc:libc; ::calloc; alloc-size; Argument[0,1] |
+| 17 | Sink: repo:https://github.com/rust-lang/libc:libc; ::malloc; alloc-size; Argument[0] |
+| 18 | Sink: repo:https://github.com/rust-lang/libc:libc; ::realloc; alloc-size; Argument[1] |
+| 19 | Source: lang:std; crate::env::args; commandargs; ReturnValue.Element |
+| 20 | Summary: lang:core; <crate::alloc::layout::Layout>::align_to; Argument[self]; ReturnValue.Field[crate::result::Result::Ok(0)]; taint |
+| 21 | Summary: lang:core; <crate::alloc::layout::Layout>::array; Argument[0]; ReturnValue.Field[crate::result::Result::Ok(0)]; taint |
+| 22 | Summary: lang:core; <crate::alloc::layout::Layout>::extend; Argument[0]; ReturnValue.Field[crate::result::Result::Ok(0)].Field[0]; taint |
+| 23 | Summary: lang:core; <crate::alloc::layout::Layout>::extend; Argument[self]; ReturnValue.Field[crate::result::Result::Ok(0)].Field[0]; taint |
+| 24 | Summary: lang:core; <crate::alloc::layout::Layout>::extend_packed; Argument[0]; ReturnValue.Field[crate::result::Result::Ok(0)]; taint |
+| 25 | Summary: lang:core; <crate::alloc::layout::Layout>::extend_packed; Argument[self]; ReturnValue.Field[crate::result::Result::Ok(0)]; taint |
+| 26 | Summary: lang:core; <crate::alloc::layout::Layout>::from_size_align; Argument[0]; ReturnValue.Field[crate::result::Result::Ok(0)]; taint |
+| 27 | Summary: lang:core; <crate::alloc::layout::Layout>::from_size_align_unchecked; Argument[0]; ReturnValue; taint |
+| 28 | Summary: lang:core; <crate::alloc::layout::Layout>::pad_to_align; Argument[self]; ReturnValue; taint |
+| 29 | Summary: lang:core; <crate::alloc::layout::Layout>::repeat; Argument[0]; ReturnValue.Field[crate::result::Result::Ok(0)].Field[0]; taint |
+| 30 | Summary: lang:core; <crate::alloc::layout::Layout>::repeat_packed; Argument[0]; ReturnValue.Field[crate::result::Result::Ok(0)]; taint |
+| 31 | Summary: lang:core; <crate::alloc::layout::Layout>::size; Argument[self]; ReturnValue; taint |
+| 32 | Summary: lang:core; <crate::option::Option>::unwrap_or; Argument[self].Field[crate::option::Option::Some(0)]; ReturnValue; value |
+| 33 | Summary: lang:core; <crate::result::Result>::expect; Argument[self].Field[crate::result::Result::Ok(0)]; ReturnValue; value |
+| 34 | Summary: lang:core; <crate::result::Result>::unwrap; Argument[self].Field[crate::result::Result::Ok(0)]; ReturnValue; value |
+| 35 | Summary: lang:core; <str>::parse; Argument[self]; ReturnValue.Field[crate::result::Result::Ok(0)]; taint |
+| 36 | Summary: lang:core; crate::cmp::max; Argument[0]; ReturnValue; value |
+| 37 | Summary: lang:core; crate::cmp::min; Argument[0]; ReturnValue; value |
+| 38 | Summary: lang:core; crate::iter::traits::iterator::Iterator::nth; Argument[self].Element; ReturnValue.Field[crate::option::Option::Some(0)]; value |
 nodes
 | main.rs:12:36:12:43 | ...: usize | semmle.label | ...: usize |
 | main.rs:18:13:18:31 | ...::realloc | semmle.label | ...::realloc |
@@ -448,17 +464,24 @@ nodes
 | main.rs:192:14:192:56 | ... .unwrap() | semmle.label | ... .unwrap() |
 | main.rs:192:46:192:46 | v | semmle.label | v |
 | main.rs:193:32:193:36 | alloc | semmle.label | alloc |
+| main.rs:193:32:193:36 | alloc | semmle.label | alloc |
 | main.rs:193:38:193:39 | l2 | semmle.label | l2 |
 | main.rs:194:32:194:43 | alloc_zeroed | semmle.label | alloc_zeroed |
+| main.rs:194:32:194:43 | alloc_zeroed | semmle.label | alloc_zeroed |
+| main.rs:194:32:194:43 | alloc_zeroed | semmle.label | alloc_zeroed |
 | main.rs:194:45:194:46 | l2 | semmle.label | l2 |
 | main.rs:195:32:195:39 | allocate | semmle.label | allocate |
 | main.rs:195:41:195:42 | l2 | semmle.label | l2 |
 | main.rs:196:32:196:46 | allocate_zeroed | semmle.label | allocate_zeroed |
 | main.rs:196:48:196:49 | l2 | semmle.label | l2 |
 | main.rs:197:32:197:39 | allocate | semmle.label | allocate |
+| main.rs:197:32:197:39 | allocate | semmle.label | allocate |
 | main.rs:197:41:197:42 | l2 | semmle.label | l2 |
 | main.rs:198:32:198:46 | allocate_zeroed | semmle.label | allocate_zeroed |
+| main.rs:198:32:198:46 | allocate_zeroed | semmle.label | allocate_zeroed |
 | main.rs:198:48:198:49 | l2 | semmle.label | l2 |
+| main.rs:202:32:202:38 | realloc | semmle.label | realloc |
+| main.rs:202:48:202:48 | v | semmle.label | v |
 | main.rs:208:40:208:43 | grow | semmle.label | grow |
 | main.rs:208:53:208:54 | l2 | semmle.label | l2 |
 | main.rs:210:40:210:50 | grow_zeroed | semmle.label | grow_zeroed |
diff --git a/rust/ql/test/query-tests/security/CWE-770/main.rs b/rust/ql/test/query-tests/security/CWE-770/main.rs
index 6d786dd0323..656a6aa23a6 100644
--- a/rust/ql/test/query-tests/security/CWE-770/main.rs
+++ b/rust/ql/test/query-tests/security/CWE-770/main.rs
@@ -199,7 +199,7 @@ unsafe fn test_system_alloc(v: usize) {
 
     let l3 = std::alloc::Layout::array::<u8>(10).unwrap();
     let m3 = std::alloc::System.alloc(l3);
-    let _ = std::alloc::System.realloc(m3, l3, v); // $ MISSING: Alert[rust/uncontrolled-allocation-size]
+    let _ = std::alloc::System.realloc(m3, l3, v); // $ Alert[rust/uncontrolled-allocation-size]=arg1
 
     let l4 = std::alloc::Layout::array::<u8>(10).unwrap();
     let m4 = std::ptr::NonNull::<u8>::new(std::alloc::alloc(l4)).unwrap();
diff --git a/rust/ql/test/query-tests/security/CWE-825/AccessInvalidPointer.expected b/rust/ql/test/query-tests/security/CWE-825/AccessInvalidPointer.expected
index 7bccaa02f63..e8a0eead8f9 100644
--- a/rust/ql/test/query-tests/security/CWE-825/AccessInvalidPointer.expected
+++ b/rust/ql/test/query-tests/security/CWE-825/AccessInvalidPointer.expected
@@ -10,9 +10,12 @@
 | deallocation.rs:95:5:95:31 | ...::write::<...> | deallocation.rs:70:3:70:21 | ...::dealloc | deallocation.rs:95:5:95:31 | ...::write::<...> | This operation dereferences a pointer that may be $@. | deallocation.rs:70:3:70:21 | ...::dealloc | invalid |
 | deallocation.rs:115:13:115:18 | my_ptr | deallocation.rs:112:3:112:12 | ...::free | deallocation.rs:115:13:115:18 | my_ptr | This operation dereferences a pointer that may be $@. | deallocation.rs:112:3:112:12 | ...::free | invalid |
 | deallocation.rs:130:14:130:15 | p1 | deallocation.rs:123:23:123:40 | ...::dangling | deallocation.rs:130:14:130:15 | p1 | This operation dereferences a pointer that may be $@. | deallocation.rs:123:23:123:40 | ...::dangling | invalid |
+| deallocation.rs:130:14:130:15 | p1 | deallocation.rs:123:23:123:40 | ...::dangling | deallocation.rs:130:14:130:15 | p1 | This operation dereferences a pointer that may be $@. | deallocation.rs:123:23:123:40 | ...::dangling | invalid |
 | deallocation.rs:131:14:131:15 | p2 | deallocation.rs:124:21:124:42 | ...::dangling_mut | deallocation.rs:131:14:131:15 | p2 | This operation dereferences a pointer that may be $@. | deallocation.rs:124:21:124:42 | ...::dangling_mut | invalid |
 | deallocation.rs:132:14:132:15 | p3 | deallocation.rs:125:23:125:36 | ...::null | deallocation.rs:132:14:132:15 | p3 | This operation dereferences a pointer that may be $@. | deallocation.rs:125:23:125:36 | ...::null | invalid |
 | deallocation.rs:180:15:180:16 | p1 | deallocation.rs:176:3:176:25 | ...::drop_in_place | deallocation.rs:180:15:180:16 | p1 | This operation dereferences a pointer that may be $@. | deallocation.rs:176:3:176:25 | ...::drop_in_place | invalid |
+| deallocation.rs:180:15:180:16 | p1 | deallocation.rs:176:3:176:25 | ...::drop_in_place | deallocation.rs:180:15:180:16 | p1 | This operation dereferences a pointer that may be $@. | deallocation.rs:176:3:176:25 | ...::drop_in_place | invalid |
+| deallocation.rs:248:18:248:20 | ptr | deallocation.rs:242:3:242:25 | ...::drop_in_place | deallocation.rs:248:18:248:20 | ptr | This operation dereferences a pointer that may be $@. | deallocation.rs:242:3:242:25 | ...::drop_in_place | invalid |
 | deallocation.rs:248:18:248:20 | ptr | deallocation.rs:242:3:242:25 | ...::drop_in_place | deallocation.rs:248:18:248:20 | ptr | This operation dereferences a pointer that may be $@. | deallocation.rs:242:3:242:25 | ...::drop_in_place | invalid |
 edges
 | deallocation.rs:20:3:20:21 | ...::dealloc | deallocation.rs:20:23:20:24 | [post] m1 | provenance | Src:MaD:3 MaD:3 |
@@ -33,6 +36,7 @@ edges
 | deallocation.rs:112:14:112:40 | [post] my_ptr as ... | deallocation.rs:115:13:115:18 | my_ptr | provenance |  |
 | deallocation.rs:123:6:123:7 | p1 | deallocation.rs:130:14:130:15 | p1 | provenance |  |
 | deallocation.rs:123:23:123:40 | ...::dangling | deallocation.rs:123:23:123:42 | ...::dangling(...) | provenance | Src:MaD:4 MaD:4 |
+| deallocation.rs:123:23:123:40 | ...::dangling | deallocation.rs:123:23:123:42 | ...::dangling(...) | provenance | Src:MaD:4 MaD:4 |
 | deallocation.rs:123:23:123:42 | ...::dangling(...) | deallocation.rs:123:6:123:7 | p1 | provenance |  |
 | deallocation.rs:124:6:124:7 | p2 | deallocation.rs:131:14:131:15 | p2 | provenance |  |
 | deallocation.rs:124:21:124:42 | ...::dangling_mut | deallocation.rs:124:21:124:44 | ...::dangling_mut(...) | provenance | Src:MaD:5 MaD:5 |
@@ -41,8 +45,10 @@ edges
 | deallocation.rs:125:23:125:36 | ...::null | deallocation.rs:125:23:125:38 | ...::null(...) | provenance | Src:MaD:7 MaD:7 |
 | deallocation.rs:125:23:125:38 | ...::null(...) | deallocation.rs:125:6:125:7 | p3 | provenance |  |
 | deallocation.rs:176:3:176:25 | ...::drop_in_place | deallocation.rs:176:27:176:28 | [post] p1 | provenance | Src:MaD:6 MaD:6 |
+| deallocation.rs:176:3:176:25 | ...::drop_in_place | deallocation.rs:176:27:176:28 | [post] p1 | provenance | Src:MaD:6 MaD:6 |
 | deallocation.rs:176:27:176:28 | [post] p1 | deallocation.rs:180:15:180:16 | p1 | provenance |  |
 | deallocation.rs:242:3:242:25 | ...::drop_in_place | deallocation.rs:242:27:242:29 | [post] ptr | provenance | Src:MaD:6 MaD:6 |
+| deallocation.rs:242:3:242:25 | ...::drop_in_place | deallocation.rs:242:27:242:29 | [post] ptr | provenance | Src:MaD:6 MaD:6 |
 | deallocation.rs:242:27:242:29 | [post] ptr | deallocation.rs:248:18:248:20 | ptr | provenance |  |
 models
 | 1 | Sink: lang:core; crate::ptr::read; pointer-access; Argument[0] |
@@ -75,6 +81,7 @@ nodes
 | deallocation.rs:115:13:115:18 | my_ptr | semmle.label | my_ptr |
 | deallocation.rs:123:6:123:7 | p1 | semmle.label | p1 |
 | deallocation.rs:123:23:123:40 | ...::dangling | semmle.label | ...::dangling |
+| deallocation.rs:123:23:123:40 | ...::dangling | semmle.label | ...::dangling |
 | deallocation.rs:123:23:123:42 | ...::dangling(...) | semmle.label | ...::dangling(...) |
 | deallocation.rs:124:6:124:7 | p2 | semmle.label | p2 |
 | deallocation.rs:124:21:124:42 | ...::dangling_mut | semmle.label | ...::dangling_mut |
@@ -86,9 +93,11 @@ nodes
 | deallocation.rs:131:14:131:15 | p2 | semmle.label | p2 |
 | deallocation.rs:132:14:132:15 | p3 | semmle.label | p3 |
 | deallocation.rs:176:3:176:25 | ...::drop_in_place | semmle.label | ...::drop_in_place |
+| deallocation.rs:176:3:176:25 | ...::drop_in_place | semmle.label | ...::drop_in_place |
 | deallocation.rs:176:27:176:28 | [post] p1 | semmle.label | [post] p1 |
 | deallocation.rs:180:15:180:16 | p1 | semmle.label | p1 |
 | deallocation.rs:242:3:242:25 | ...::drop_in_place | semmle.label | ...::drop_in_place |
+| deallocation.rs:242:3:242:25 | ...::drop_in_place | semmle.label | ...::drop_in_place |
 | deallocation.rs:242:27:242:29 | [post] ptr | semmle.label | [post] ptr |
 | deallocation.rs:248:18:248:20 | ptr | semmle.label | ptr |
 subpaths
diff --git a/rust/ql/test/query-tests/security/CWE-825/CONSISTENCY/PathResolutionConsistency.expected b/rust/ql/test/query-tests/security/CWE-825/CONSISTENCY/PathResolutionConsistency.expected
index 804c13f6434..7345aedbab9 100644
--- a/rust/ql/test/query-tests/security/CWE-825/CONSISTENCY/PathResolutionConsistency.expected
+++ b/rust/ql/test/query-tests/security/CWE-825/CONSISTENCY/PathResolutionConsistency.expected
@@ -9,3 +9,17 @@ multiplePathResolutions
 | deallocation.rs:112:3:112:12 | ...::free | file://:0:0:0:0 | fn free |
 | deallocation.rs:112:29:112:32 | libc | file://:0:0:0:0 | Crate(libc@0.2.171) |
 | deallocation.rs:112:29:112:32 | libc | file://:0:0:0:0 | Crate(libc@0.2.172) |
+| deallocation.rs:260:11:260:22 | ...::from | file://:0:0:0:0 | fn from |
+| deallocation.rs:260:11:260:22 | ...::from | file://:0:0:0:0 | fn from |
+| deallocation.rs:260:11:260:22 | ...::from | file://:0:0:0:0 | fn from |
+| deallocation.rs:260:11:260:22 | ...::from | file://:0:0:0:0 | fn from |
+| deallocation.rs:260:11:260:22 | ...::from | file://:0:0:0:0 | fn from |
+| deallocation.rs:260:11:260:22 | ...::from | file://:0:0:0:0 | fn from |
+| deallocation.rs:261:11:261:22 | ...::from | file://:0:0:0:0 | fn from |
+| deallocation.rs:261:11:261:22 | ...::from | file://:0:0:0:0 | fn from |
+| deallocation.rs:261:11:261:22 | ...::from | file://:0:0:0:0 | fn from |
+| deallocation.rs:261:11:261:22 | ...::from | file://:0:0:0:0 | fn from |
+| deallocation.rs:261:11:261:22 | ...::from | file://:0:0:0:0 | fn from |
+| deallocation.rs:261:11:261:22 | ...::from | file://:0:0:0:0 | fn from |
+| lifetime.rs:415:32:415:49 | ...::clone | file://:0:0:0:0 | fn clone |
+| lifetime.rs:415:32:415:49 | ...::clone | file://:0:0:0:0 | fn clone |
diff --git a/rust/ql/test/query-tests/unusedentities/CONSISTENCY/PathResolutionConsistency.expected b/rust/ql/test/query-tests/unusedentities/CONSISTENCY/PathResolutionConsistency.expected
new file mode 100644
index 00000000000..8563020471c
--- /dev/null
+++ b/rust/ql/test/query-tests/unusedentities/CONSISTENCY/PathResolutionConsistency.expected
@@ -0,0 +1,31 @@
+multiplePathResolutions
+| main.rs:13:13:13:24 | ...::from | file://:0:0:0:0 | fn from |
+| main.rs:13:13:13:24 | ...::from | file://:0:0:0:0 | fn from |
+| main.rs:13:13:13:24 | ...::from | file://:0:0:0:0 | fn from |
+| main.rs:13:13:13:24 | ...::from | file://:0:0:0:0 | fn from |
+| main.rs:13:13:13:24 | ...::from | file://:0:0:0:0 | fn from |
+| main.rs:13:13:13:24 | ...::from | file://:0:0:0:0 | fn from |
+| main.rs:14:13:14:24 | ...::from | file://:0:0:0:0 | fn from |
+| main.rs:14:13:14:24 | ...::from | file://:0:0:0:0 | fn from |
+| main.rs:14:13:14:24 | ...::from | file://:0:0:0:0 | fn from |
+| main.rs:14:13:14:24 | ...::from | file://:0:0:0:0 | fn from |
+| main.rs:14:13:14:24 | ...::from | file://:0:0:0:0 | fn from |
+| main.rs:14:13:14:24 | ...::from | file://:0:0:0:0 | fn from |
+| unreachable.rs:165:20:165:31 | ...::from | file://:0:0:0:0 | fn from |
+| unreachable.rs:165:20:165:31 | ...::from | file://:0:0:0:0 | fn from |
+| unreachable.rs:165:20:165:31 | ...::from | file://:0:0:0:0 | fn from |
+| unreachable.rs:165:20:165:31 | ...::from | file://:0:0:0:0 | fn from |
+| unreachable.rs:165:20:165:31 | ...::from | file://:0:0:0:0 | fn from |
+| unreachable.rs:165:20:165:31 | ...::from | file://:0:0:0:0 | fn from |
+| unreachable.rs:171:9:171:17 | ...::from | file://:0:0:0:0 | fn from |
+| unreachable.rs:171:9:171:17 | ...::from | file://:0:0:0:0 | fn from |
+| unreachable.rs:171:9:171:17 | ...::from | file://:0:0:0:0 | fn from |
+| unreachable.rs:171:9:171:17 | ...::from | file://:0:0:0:0 | fn from |
+| unreachable.rs:171:9:171:17 | ...::from | file://:0:0:0:0 | fn from |
+| unreachable.rs:171:9:171:17 | ...::from | file://:0:0:0:0 | fn from |
+| unreachable.rs:177:9:177:26 | ...::from | file://:0:0:0:0 | fn from |
+| unreachable.rs:177:9:177:26 | ...::from | file://:0:0:0:0 | fn from |
+| unreachable.rs:177:9:177:26 | ...::from | file://:0:0:0:0 | fn from |
+| unreachable.rs:177:9:177:26 | ...::from | file://:0:0:0:0 | fn from |
+| unreachable.rs:177:9:177:26 | ...::from | file://:0:0:0:0 | fn from |
+| unreachable.rs:177:9:177:26 | ...::from | file://:0:0:0:0 | fn from |
diff --git a/rust/schema/annotations.py b/rust/schema/annotations.py
index c6ab581d7ca..aebf9a7a410 100644
--- a/rust/schema/annotations.py
+++ b/rust/schema/annotations.py
@@ -226,6 +226,7 @@ class CallExprBase(Expr):
     """
     arg_list: optional["ArgList"] | child
     attrs: list["Attr"] | child
+    args: list["Expr"] | synth
 
 
 @annotate(CallExpr, replace_bases={Expr: CallExprBase}, cfg=True)
@@ -986,6 +987,10 @@ class _:
     const X: i32 = 42;
     ```
     """
+    has_implementation: predicate | doc("this constant has an implementation") | desc("""
+      This is the same as `hasBody` for source code, but for library code (for which we always skip
+      the body), this will hold when the body was present in the original code.
+    """) | rust.detach
 
 
 @annotate(ConstArg)
@@ -2134,6 +2139,10 @@ class _:
 class _:
     param_list: drop
     attrs: drop
+    has_implementation: predicate | doc("this function has an implementation") | desc("""
+      This is the same as `hasBody` for source code, but for library code (for which we always skip
+      the body), this will hold when the body was present in the original code.
+    """) | rust.detach
 
 
 @annotate(ClosureExpr, add_bases=[Callable])
diff --git a/rust/schema/prelude.py b/rust/schema/prelude.py
index 6d356567d22..62334b2d864 100644
--- a/rust/schema/prelude.py
+++ b/rust/schema/prelude.py
@@ -73,6 +73,7 @@ class Callable(AstNode):
     """
     param_list: optional["ParamList"] | child
     attrs: list["Attr"] | child
+    params: list["Param"] | synth
 
 
 class Addressable(AstNode):
diff --git a/rust/tools/builtins/await.rs b/rust/tools/builtins/await.rs
new file mode 100644
index 00000000000..c15af9dc529
--- /dev/null
+++ b/rust/tools/builtins/await.rs
@@ -0,0 +1,7 @@
+use std::future::Future;
+
+fn await_type_matching<T1, T2: Future<Output = T1>>(x: T2) -> T1 {
+    panic!(
+        "This function exists only in order to implement type inference for `.await` expressions."
+    );
+}
diff --git a/shared/typeinference/codeql/typeinference/internal/TypeInference.qll b/shared/typeinference/codeql/typeinference/internal/TypeInference.qll
index b0f5fc67300..f152d4a1642 100644
--- a/shared/typeinference/codeql/typeinference/internal/TypeInference.qll
+++ b/shared/typeinference/codeql/typeinference/internal/TypeInference.qll
@@ -1,12 +1,126 @@
 /**
  * Provides shared functionality for computing type inference in QL.
  *
- * The code examples in this file use C# syntax, but the concepts should
- * carry over to other languages as well.
+ * The code examples in this file use C# syntax, but the concepts should carry
+ * over to other languages as well.
  *
- * The library is initialized in two phases: `Make1`, which constructs
- * the `TypePath` type, and `Make2`, which (using `TypePath` in the input
- * signature) constructs the `Matching` module.
+ * The library is initialized in two phases: `Make1`, which constructs the
+ * `TypePath` type, and `Make2`, which (using `TypePath` in the input signature)
+ * constructs the `Matching` and `IsInstantiationOf` modules.
+ *
+ * The intended use of this library is to define a predicate
+ *
+ * ```ql
+ * Type inferType(AstNode n, TypePath path)
+ * ```
+ *
+ * for recursively inferring the type-path-indexed types of AST nodes. For example,
+ * one may have a base case for literals like
+ *
+ * ```ql
+ * Type inferType(AstNode n, TypePath path) {
+ *   ...
+ *   n instanceof IntegerLiteral and
+ *   result instanceof IntType and
+ *   path.isEmpty()
+ *   ...
+ * }
+ * ```
+ *
+ * and recursive cases for local variables like
+ *
+ * ```ql
+ * Type inferType(AstNode n, TypePath path) {
+ *   ...
+ *   exists(LocalVariable v |
+ *     // propagate type information from the initializer to any access
+ *     n = v.getAnAccess() and
+ *     result = inferType(v.getInitializer(), path)
+ *     or
+ *     // propagate type information from any access back to the initializer; note
+ *     // that this case may not be relevant for all languages, but e.g. in Rust
+ *     // it is
+ *     n = v.getInitializer() and
+ *     result = inferType(v.getAnAccess(), path)
+ *   )
+ *   ...
+ * }
+ * ```
+ *
+ * The `Matching` module is used when an AST node references a potentially generic
+ * declaration, where the type of the node depends on the type of some of its sub
+ * nodes. For example, if we have a generic method like `T Identity<T>(T t)`, then
+ * the type of `Identity(42)` should be `int`, while the type of `Identity("foo")`
+ * should be `string`; in both cases it should _not_ be `T`.
+ *
+ * In order to infer the type of method calls, one would define something like
+ *
+ * ```ql
+ * private module MethodCallMatchingInput implements MatchingInputSig {
+ *   private newtype TDeclarationPosition =
+ *     TSelfDeclarationPosition() or
+ *     TPositionalDeclarationPosition(int pos) { ... } or
+ *     TReturnDeclarationPosition()
+ *
+ *   // A position inside a method with a declared type.
+ *   class DeclarationPosition extends TDeclarationPosition {
+ *     ...
+ *   }
+ *
+ *   class Declaration extends MethodCall {
+ *     // Gets a type parameter at `tppos` belonging to this method.
+ *     //
+ *     // For example, if this method is `T Identity<T>(T t)`, then `T`
+ *     // is at position `0`.
+ *     TypeParameter getTypeParameter(TypeParameterPosition tppos) { ... }
+ *
+ *     // Gets the declared type of this method at `dpos` and `path`.
+ *     //
+ *     // For example, if this method is `T Identity<T>(T t)`, then both the
+ *     // the return type and parameter position `0` is `T` with `path.isEmpty()`.
+ *     Type getDeclaredType(DeclarationPosition dpos, TypePath path) { ... }
+ *   }
+ *
+ *   // A position inside a method call with an inferred type
+ *   class AccessPosition = DeclarationPosition;
+ *
+ *   class Access extends MethodCall {
+ *     AstNode getNodeAt(AccessPosition apos) { ... }
+ *
+ *     // Gets the inferred type of the node at `apos` and `path`.
+ *     //
+ *     // For example, if this method call is `Identity(42)`, then the type
+ *     // at argument position `0` is `int` with `path.isEmpty()"`.
+ *     Type getInferredType(AccessPosition apos, TypePath path) {
+ *       result = inferType(this.getNodeAt(apos), path)
+ *     }
+ *
+ *     // Gets the method that this method call resolves to.
+ *     //
+ *     // This will typically be defined in mutual recursion with the `inferType`
+ *     // predicate, as we need to know the type of the receiver in order to
+ *     // resolve calls to instance methods.
+ *     Declaration getTarget() { ... }
+ *   }
+ *
+ *   predicate accessDeclarationPositionMatch(AccessPosition apos, DeclarationPosition dpos) {
+ *     apos = dpos
+ *   }
+ * }
+ *
+ * private module MethodCallMatching = Matching<MethodCallMatchingInput>;
+ *
+ * Type inferType(AstNode n, TypePath path) {
+ *   ...
+ *   exists(MethodCall mc, MethodCallMatchingInput::AccessPosition apos |
+ *     // Some languages may want to restrict `apos` to be the return position, but in
+ *     // e.g. Rust type information can flow out of all positions
+ *     n = a.getNodeAt(apos) and
+ *     result = MethodCallMatching::inferAccessType(a, apos, path)
+ *   )
+ *   ...
+ * }
+ * ```
  */
 
 private import codeql.util.Location
@@ -220,6 +334,10 @@ module Make1<LocationSig Location, InputSig1<Location> Input1> {
     predicate isCons(TypeParameter tp, TypePath suffix) {
       suffix = this.stripPrefix(TypePath::singleton(tp))
     }
+
+    /** Gets the head of this path, if any. */
+    bindingset[this]
+    TypeParameter getHead() { result = this.getTypeParameter(0) }
   }
 
   /** Provides predicates for constructing `TypePath`s. */
@@ -419,27 +537,23 @@ module Make1<LocationSig Location, InputSig1<Location> Input1> {
           )
       }
 
-      /**
-       * Holds if `app` is a possible instantiation of `tm` at `path`. That is
-       * the type at `path` in `tm` is either a type parameter or equal to the
-       * type at the same path in `app`.
-       */
-      bindingset[app, abs, tm, path]
-      private predicate satisfiesConcreteTypeAt(
-        App app, TypeAbstraction abs, TypeMention tm, TypePath path
+      pragma[nomagic]
+      private Type resolveNthTypeAt(
+        App app, TypeAbstraction abs, TypeMention tm, int i, TypePath path
       ) {
-        exists(Type t |
-          tm.resolveTypeAt(path) = t and
-          if t = abs.getATypeParameter() then any() else app.getTypeAt(path) = t
-        )
+        potentialInstantiationOf(app, abs, tm) and
+        path = getNthPath(tm, i) and
+        result = tm.resolveTypeAt(path)
       }
 
       pragma[nomagic]
       private predicate satisfiesConcreteTypesFromIndex(
         App app, TypeAbstraction abs, TypeMention tm, int i
       ) {
-        potentialInstantiationOf(app, abs, tm) and
-        satisfiesConcreteTypeAt(app, abs, tm, getNthPath(tm, i)) and
+        exists(Type t, TypePath path |
+          t = resolveNthTypeAt(app, abs, tm, i, path) and
+          if t = abs.getATypeParameter() then any() else app.getTypeAt(path) = t
+        ) and
         // Recurse unless we are at the first path
         if i = 0 then any() else satisfiesConcreteTypesFromIndex(app, abs, tm, i - 1)
       }
@@ -463,24 +577,34 @@ module Make1<LocationSig Location, InputSig1<Location> Input1> {
        * Gets the path to the `i`th occurrence of `tp` within `tm` per some
        * arbitrary order, if any.
        */
+      pragma[nomagic]
       private TypePath getNthTypeParameterPath(TypeMention tm, TypeParameter tp, int i) {
         result =
           rank[i + 1](TypePath path | tp = tm.resolveTypeAt(path) and relevantTypeMention(tm) | path)
       }
 
+      pragma[nomagic]
+      private predicate typeParametersEqualFromIndexBase(
+        App app, TypeAbstraction abs, TypeMention tm, TypeParameter tp, TypePath path
+      ) {
+        path = getNthTypeParameterPath(tm, tp, 0) and
+        satisfiesConcreteTypes(app, abs, tm) and
+        // no need to compute this predicate if there is only one path
+        exists(getNthTypeParameterPath(tm, tp, 1))
+      }
+
       pragma[nomagic]
       private predicate typeParametersEqualFromIndex(
         App app, TypeAbstraction abs, TypeMention tm, TypeParameter tp, Type t, int i
       ) {
-        satisfiesConcreteTypes(app, abs, tm) and
         exists(TypePath path |
-          path = getNthTypeParameterPath(tm, tp, i) and
           t = app.getTypeAt(path) and
           if i = 0
-          then
-            // no need to compute this predicate if there is only one path
-            exists(getNthTypeParameterPath(tm, tp, 1))
-          else typeParametersEqualFromIndex(app, abs, tm, tp, t, i - 1)
+          then typeParametersEqualFromIndexBase(app, abs, tm, tp, path)
+          else (
+            typeParametersEqualFromIndex(app, abs, tm, tp, t, i - 1) and
+            path = getNthTypeParameterPath(tm, tp, i)
+          )
         )
       }
 
@@ -975,17 +1099,18 @@ module Make1<LocationSig Location, InputSig1<Location> Input1> {
 
       private module AccessConstraint {
         predicate relevantAccessConstraint(
-          Access a, AccessPosition apos, TypePath path, Type constraint
+          Access a, Declaration target, AccessPosition apos, TypePath path, Type constraint
         ) {
           exists(DeclarationPosition dpos |
             accessDeclarationPositionMatch(apos, dpos) and
-            typeParameterConstraintHasTypeParameter(a.getTarget(), dpos, path, _, constraint, _, _)
+            target = a.getTarget() and
+            typeParameterConstraintHasTypeParameter(target, dpos, path, _, constraint, _, _)
           )
         }
 
         private newtype TRelevantAccess =
-          MkRelevantAccess(Access a, AccessPosition apos, TypePath path) {
-            relevantAccessConstraint(a, apos, path, _)
+          MkRelevantAccess(Access a, Declaration target, AccessPosition apos, TypePath path) {
+            relevantAccessConstraint(a, target, apos, path, _)
           }
 
         /**
@@ -994,19 +1119,20 @@ module Make1<LocationSig Location, InputSig1<Location> Input1> {
          */
         private class RelevantAccess extends MkRelevantAccess {
           Access a;
+          Declaration target;
           AccessPosition apos;
           TypePath path;
 
-          RelevantAccess() { this = MkRelevantAccess(a, apos, path) }
+          RelevantAccess() { this = MkRelevantAccess(a, target, apos, path) }
 
           Type getTypeAt(TypePath suffix) {
-            a.getInferredType(apos, path.appendInverse(suffix)) = result
+            adjustedAccessType(a, apos, target, path.appendInverse(suffix), result)
           }
 
           /** Holds if this relevant access has the type `type` and should satisfy `constraint`. */
           predicate hasTypeConstraint(Type type, Type constraint) {
-            type = a.getInferredType(apos, path) and
-            relevantAccessConstraint(a, apos, path, constraint)
+            adjustedAccessType(a, apos, target, path, type) and
+            relevantAccessConstraint(a, target, apos, path, constraint)
           }
 
           string toString() {
@@ -1036,6 +1162,7 @@ module Make1<LocationSig Location, InputSig1<Location> Input1> {
         /**
          * Holds if `at` satisfies `constraint` through `abs`, `sub`, and `constraintMention`.
          */
+        pragma[nomagic]
         private predicate hasConstraintMention(
           RelevantAccess at, TypeAbstraction abs, TypeMention sub, Type constraint,
           TypeMention constraintMention
@@ -1059,6 +1186,30 @@ module Make1<LocationSig Location, InputSig1<Location> Input1> {
           )
         }
 
+        pragma[nomagic]
+        predicate satisfiesConstraintTypeMention0(
+          RelevantAccess at, Access a, AccessPosition apos, TypePath prefix, Type constraint,
+          TypeAbstraction abs, TypeMention sub, TypePath path, Type t
+        ) {
+          exists(TypeMention constraintMention |
+            at = MkRelevantAccess(a, _, apos, prefix) and
+            hasConstraintMention(at, abs, sub, constraint, constraintMention) and
+            conditionSatisfiesConstraintTypeAt(abs, sub, constraintMention, path, t)
+          )
+        }
+
+        pragma[nomagic]
+        predicate satisfiesConstraintTypeMention1(
+          RelevantAccess at, Access a, AccessPosition apos, TypePath prefix, Type constraint,
+          TypePath path, TypePath pathToTypeParamInSub
+        ) {
+          exists(TypeAbstraction abs, TypeMention sub, TypeParameter tp |
+            satisfiesConstraintTypeMention0(at, a, apos, prefix, constraint, abs, sub, path, tp) and
+            tp = abs.getATypeParameter() and
+            sub.resolveTypeAt(pathToTypeParamInSub) = tp
+          )
+        }
+
         /**
          * Holds if the type at `a`, `apos`, and `path` satisfies the constraint
          * `constraint` with the type `t` at `path`.
@@ -1067,22 +1218,18 @@ module Make1<LocationSig Location, InputSig1<Location> Input1> {
         predicate satisfiesConstraintTypeMention(
           Access a, AccessPosition apos, TypePath prefix, Type constraint, TypePath path, Type t
         ) {
+          exists(TypeAbstraction abs |
+            satisfiesConstraintTypeMention0(_, a, apos, prefix, constraint, abs, _, path, t) and
+            not t = abs.getATypeParameter()
+          )
+          or
           exists(
-            RelevantAccess at, TypeAbstraction abs, TypeMention sub, Type t0, TypePath prefix0,
-            TypeMention constraintMention
+            RelevantAccess at, TypePath prefix0, TypePath pathToTypeParamInSub, TypePath suffix
           |
-            at = MkRelevantAccess(a, apos, prefix) and
-            hasConstraintMention(at, abs, sub, constraint, constraintMention) and
-            conditionSatisfiesConstraintTypeAt(abs, sub, constraintMention, prefix0, t0)
-          |
-            not t0 = abs.getATypeParameter() and t = t0 and path = prefix0
-            or
-            t0 = abs.getATypeParameter() and
-            exists(TypePath path3, TypePath suffix |
-              sub.resolveTypeAt(path3) = t0 and
-              at.getTypeAt(path3.appendInverse(suffix)) = t and
-              path = prefix0.append(suffix)
-            )
+            satisfiesConstraintTypeMention1(at, a, apos, prefix, constraint, prefix0,
+              pathToTypeParamInSub) and
+            at.getTypeAt(pathToTypeParamInSub.appendInverse(suffix)) = t and
+            path = prefix0.append(suffix)
           )
         }
       }
@@ -1110,7 +1257,7 @@ module Make1<LocationSig Location, InputSig1<Location> Input1> {
         Declaration decl, DeclarationPosition dpos, Type base, TypePath path, TypeParameter tp
       ) {
         tp = decl.getDeclaredType(dpos, path) and
-        path.isCons(base.getATypeParameter(), _)
+        base.getATypeParameter() = path.getHead()
       }
 
       /**
@@ -1285,14 +1432,14 @@ module Make1<LocationSig Location, InputSig1<Location> Input1> {
         exists(DeclarationPosition dpos | accessDeclarationPositionMatch(apos, dpos) |
           // A suffix of `path` leads to a type parameter in the target
           exists(Declaration target, TypePath prefix, TypeParameter tp, TypePath suffix |
-            tp = target.getDeclaredType(pragma[only_bind_into](dpos), prefix) and
+            tp = target.getDeclaredType(dpos, prefix) and
             path = prefix.append(suffix) and
             typeMatch(a, target, suffix, result, tp)
           )
           or
           // `path` corresponds directly to a concrete type in the declaration
           exists(Declaration target |
-            result = target.getDeclaredType(pragma[only_bind_into](dpos), path) and
+            result = target.getDeclaredType(dpos, path) and
             target = a.getTarget() and
             not result instanceof TypeParameter
           )
diff --git a/swift/ql/src/change-notes/2025-06-06-reduce-CWE-134-for-memory-safe-languages.md b/swift/ql/src/change-notes/2025-06-06-reduce-CWE-134-for-memory-safe-languages.md
new file mode 100644
index 00000000000..43be14dc8eb
--- /dev/null
+++ b/swift/ql/src/change-notes/2025-06-06-reduce-CWE-134-for-memory-safe-languages.md
@@ -0,0 +1,4 @@
+---
+category: queryMetadata
+---
+* Adjusts the `@security-severity` from 9.3 to 7.3 for `swift/uncontrolled-format-string` to align `CWE-134` severity for memory safe languages to better reflect their impact.
\ No newline at end of file
diff --git a/swift/ql/src/queries/Security/CWE-134/UncontrolledFormatString.ql b/swift/ql/src/queries/Security/CWE-134/UncontrolledFormatString.ql
index 7f6ea32341b..4376f0f4c0f 100644
--- a/swift/ql/src/queries/Security/CWE-134/UncontrolledFormatString.ql
+++ b/swift/ql/src/queries/Security/CWE-134/UncontrolledFormatString.ql
@@ -3,7 +3,7 @@
  * @description Using external input in format strings can lead to exceptions or information leaks.
  * @kind path-problem
  * @problem.severity error
- * @security-severity 9.3
+ * @security-severity 7.3
  * @precision high
  * @id swift/uncontrolled-format-string
  * @tags security